TGS Test Merge (#16725)

tgstation · Jan 11, 2025 · 28f2cd3 · 28f2cd3
2 parents 8de9c7a + a56a6c6
commit 28f2cd3
Show file tree

Hide file tree

Showing 37 changed files with 888 additions and 38 deletions.
diff --git a/code/__DEFINES/dcs/signals/signals_keybindings.dm b/code/__DEFINES/dcs/signals/signals_keybindings.dm
@@ -77,6 +77,7 @@
 #define COMSIG_KB_GIVE "keybind_give"
 #define COMSIG_KB_HELMETMODULE "keybinding_helmetmodule"
 #define COMSIG_KB_ROBOT_AUTOREPAIR "keybinding_robot_autorepair"
+#define COMSIG_KB_STIMS "keybinding_stims_menu"
 #define COMSIG_KB_SUITLIGHT "keybinding_suitlight"
 #define COMSIG_KB_MOVEORDER "keybind_moveorder"
 #define COMSIG_KB_HOLDORDER "keybind_holdorder"

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -246,7 +246,7 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur")))
 
 #define isAPC(A) (istype(A, /obj/machinery/power/apc))
 
-#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable
+#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/decal/cleanable/rune)) //if something is cleanable
 
 #define isvehicle(A) (istype(A, /obj/vehicle))
 

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -376,21 +376,20 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define NO_OVERDOSE (1<<4)
 #define NO_POISON (1<<5)
 #define NO_CHEM_METABOLIZATION (1<<6)
-#define HAS_SKIN_TONE (1<<7)
-#define HAS_SKIN_COLOR (1<<8)
-#define HAS_LIPS (1<<9)
-#define HAS_UNDERWEAR (1<<10)
-#define HAS_NO_HAIR (1<<11)
-#define IS_SYNTHETIC (1<<12)
-#define NO_STAMINA (1<<13)
-#define DETACHABLE_HEAD (1<<14)
-#define USES_ALIEN_WEAPONS (1<<15)
-#define NO_DAMAGE_OVERLAY (1<<16)
-#define HEALTH_HUD_ALWAYS_DEAD (1<<17)
-#define PARALYSE_RESISTANT (1<<18)
-#define ROBOTIC_LIMBS (1<<19)
-#define GREYSCALE_BLOOD (1<<20)
-#define IS_INSULATED (1<<21)
+#define HAS_SKIN_COLOR (1<<7)
+#define HAS_LIPS (1<<8)
+#define HAS_UNDERWEAR (1<<9)
+#define HAS_NO_HAIR (1<<10)
+#define IS_SYNTHETIC (1<<11)
+#define NO_STAMINA (1<<12)
+#define DETACHABLE_HEAD (1<<13)
+#define USES_ALIEN_WEAPONS (1<<14)
+#define NO_DAMAGE_OVERLAY (1<<15)
+#define HEALTH_HUD_ALWAYS_DEAD (1<<16)
+#define PARALYSE_RESISTANT (1<<17)
+#define ROBOTIC_LIMBS (1<<18)
+#define GREYSCALE_BLOOD (1<<19)
+#define IS_INSULATED (1<<20)
 
 //=================================================
 

diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm
@@ -40,6 +40,8 @@
 
 #define MOVESPEED_ID_SPECIES "SPECIES_SPEED_MOD"
 
+#define MOVESPEED_ID_STIM_INCREASE "STIM_SPEED_MOD"
+
 #define MOVESPEED_ID_BULKY_DRAGGING "BULKY_DRAG"
 #define MOVESPEED_ID_HUMAN_CARRYING "HUMAN_CARRY"
 #define MOVESPEED_ID_COLD "COLD"

diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm
@@ -0,0 +1,11 @@
+#define SPECIES_LIMB_GENERIC 0
+#define SPECIES_LIMB_HUMAN 1
+#define SPECIES_LIMB_CLONE 2
+
+
+#define STIM_DURATION_DEFAULT 10 MINUTES
+#define MAX_ACTIVE_STIMS 5
+#define MAX_STIM_SEQUENCES 10
+
+#define STIM_ALLOW_DUPE (1<<0)
+#define STIM_ABSTRACT (1<<1)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -80,6 +80,7 @@
 #define SPECIES_TRAIT "species" // /datum/species innate trait
 #define CRYOPOD_TRAIT "cryopod"
 #define XENO_TRAIT "xeno"
+#define SUPERSOLDIER_TRAIT "supersoldier"
 #define ARMOR_TRAIT "armor"
 #define STAT_TRAIT "stat"
 #define NECKGRAB_TRAIT "neckgrab"
@@ -124,6 +125,8 @@
 #define TRAIT_DWARF "dwarf"
 /// Makes you way too tall. Like just too much, dude, it's kind of creepy. Humanoid only.
 #define TRAIT_TOO_TALL "too_tall"
+///massively decreases human MANUAL get up time
+#define TRAIT_QUICK_GETUP "quick_getup"
 
 #define ABSTRACT_ITEM_TRAIT "abstract_item"
 /// A trait given by any status effect
@@ -208,6 +211,7 @@
 #define TRAIT_STAGGERIMMUNE	"stagger_immunity" //Immunity to stagger
 #define TRAIT_STAGGER_RESISTANT	"stagger_resistant" //Resistance to certain sources of stagger
 #define TRAIT_SLOWDOWNIMMUNE "slowdown_immunity" //Immunity to slowdown
+#define TRAIT_EARDAMAGE_IMMUNE "eardmgimmune" //immune to getting deaf through ear dmg
 #define TRAIT_SEE_IN_DARK "see_in_dark" //Able to see in dark
 #define TRAIT_MUTED "muted" //target is mute and can't speak
 #define TRAIT_TURRET_HIDDEN "turret_hidden" //target gets passed over by turrets choosing a victim

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -407,7 +407,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NO_OVERDOSE" = NO_OVERDOSE,
 		"NO_POISON" = NO_POISON,
 		"NO_CHEM_METABOLIZATION" = NO_CHEM_METABOLIZATION,
-		"HAS_SKIN_TONE" = HAS_SKIN_TONE,
 		"HAS_SKIN_COLOR" = HAS_SKIN_COLOR,
 		"HAS_LIPS" = HAS_LIPS,
 		"HAS_UNDERWEAR" = HAS_UNDERWEAR,