Skip to content

Commit

Permalink
TGS Test Merge (#16711)
Browse files Browse the repository at this point in the history
  • Loading branch information
comfyorange committed Nov 11, 2024
2 parents 561ef14 + e8a7ad6 commit 8d22122
Show file tree
Hide file tree
Showing 22 changed files with 1,094 additions and 5 deletions.
5 changes: 5 additions & 0 deletions code/__DEFINES/dcs/signals/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,11 @@

#define COMSIG_XENOMORPH_LEAP_BUMP "xenomorph_leap_bump" //from /mob/living/carbon/xenomorph/bump

// Xeno upgrade chambers
#define COMSIG_UPGRADE_CHAMBER_SURVIVAL "upgrade_chamber_survival"
#define COMSIG_UPGRADE_CHAMBER_ATTACK "upgrade_chamber_attack"
#define COMSIG_UPGRADE_CHAMBER_UTILITY "upgrade_chamber_utility"

//human signals
#define COMSIG_CLICK_QUICKEQUIP "click_quickequip"

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#define MOVESPEED_ID_WARLOCK_CHANNELING "WARLOCK_CHANNELING"
#define MOVESPEED_ID_XENO_DREAD "DREADXENO"
#define MOVESPEED_ID_BEHEMOTH_PRIMAL_WRATH "BEHEMOTH_PRIMAL_WRATH"
#define MOVESPEED_ID_CELERITY_BUFF "UPGRADE_CHAMBER_CELERITY_BUFF"
#define MOVESPEED_ID_PRAETORIAN_DANCER_DODGE_SPEED "PRAETORIAN_DANCER_DODGE_SPEED"

#define MOVESPEED_ID_SIMPLEMOB_VARSPEED "SIMPLEMOB_VARSPEED_MODIFIER"
Expand Down
18 changes: 18 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@

#define STATUS_EFFECT_DRAIN_SURGE /datum/status_effect/drain_surge

#define STATUS_EFFECT_UPGRADE_CARAPACE /datum/status_effect/mutation_upgrade/carapace

#define STATUS_EFFECT_UPGRADE_REGENERATION /datum/status_effect/mutation_upgrade/regeneration

#define STATUS_EFFECT_UPGRADE_VAMPIRISM /datum/status_effect/mutation_upgrade/vampirism

#define STATUS_EFFECT_UPGRADE_CELERITY /datum/status_effect/mutation_upgrade/celerity

#define STATUS_EFFECT_UPGRADE_ADRENALINE /datum/status_effect/mutation_upgrade/adrenaline

#define STATUS_EFFECT_UPGRADE_CRUSH /datum/status_effect/mutation_upgrade/crush

#define STATUS_EFFECT_UPGRADE_TOXIN /datum/status_effect/mutation_upgrade/toxin

#define STATUS_EFFECT_UPGRADE_PHERO /datum/status_effect/mutation_upgrade/pheromones

#define STATUS_EFFECT_UPGRADE_TRAIL /datum/status_effect/mutation_upgrade/trail

#define STATUS_EFFECT_MINDMEND /datum/status_effect/mindmeld

#define STATUS_EFFECT_REKNIT_FORM /datum/status_effect/reknit_form
Expand Down
36 changes: 36 additions & 0 deletions code/__DEFINES/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ GLOBAL_LIST_INIT(defiler_toxin_type_list, list(
/datum/reagent/toxin/xeno_ozelomelyn,
))

//List of Defiler toxin images
GLOBAL_LIST_INIT(defiler_toxin_images_list, list(
DEFILER_OZELOMELYN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_OZELOMELYN),
DEFILER_HEMODILE = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_HEMODILE),
DEFILER_TRANSVITOX = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_TRANSVITOX),
DEFILER_NEUROTOXIN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_NEUROTOXIN)
))

//List of toxins improving defile's damage
GLOBAL_LIST_INIT(defiler_toxins_typecache_list, typecacheof(list(
/datum/reagent/toxin/xeno_ozelomelyn,
Expand Down Expand Up @@ -210,3 +218,31 @@ GLOBAL_LIST_INIT(xeno_ai_spawnable, list(

/// Life runs every 2 seconds, but we don't want to multiply all healing by 2 due to seconds_per_tick
#define XENO_PER_SECOND_LIFE_MOD 0.5

// Mutations
GLOBAL_DATUM_INIT(mutation_selector, /datum/mutation_datum, new)

GLOBAL_LIST_INIT(mutation_upgrades_buyable, list(
/datum/mutation_upgrade/survival/carapace,
/datum/mutation_upgrade/survival/regeneration,
/datum/mutation_upgrade/survival/vampirism,
/datum/mutation_upgrade/attack/celerity,
/datum/mutation_upgrade/attack/adrenaline,
/datum/mutation_upgrade/attack/crush,
/datum/mutation_upgrade/utility/toxin,
/datum/mutation_upgrade/utility/pheromones,
/datum/mutation_upgrade/utility/trail
))

#define MUTATION_CATEGORY_SURVIVAL "Survival"
#define MUTATION_CATEGORY_ATTACK "Attack"
#define MUTATION_CATEGORY_UTILITY "Utility"

#define MUTATION_STRUCTURE_CHAMBER "shell"
#define MUTATION_STRUCTURE_SPUR "spur"
#define MUTATION_STRUCTURE_VEIL "veil"

#define XENO_UPGRADE_BIOMASS_COST_T1 15
#define XENO_UPGRADE_BIOMASS_COST_T2 20
#define XENO_UPGRADE_BIOMASS_COST_T3 25
#define XENO_UPGRADE_BIOMASS_COST_T4 30
Loading

0 comments on commit 8d22122

Please sign in to comment.