Buget cuts

code/__DEFINES/antagonists.dm

@@ -331,6 +331,10 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list(
 #define ANTAG_GROUP_SYNDICATE "Syndicate"
 #define ANTAG_GROUP_WIZARDS "Wizard Federation"
 #define ANTAG_GROUP_XENOS "Xenomorph Infestation"
+#define ANTAG_GROUP_FUGITIVES "Escaped Fugitives"
+#define ANTAG_GROUP_HUNTERS "Bounty Hunters"
+#define ANTAG_GROUP_PARADOX "Spacetime Aberrations"
+#define ANTAG_GROUP_CREW "Deviant Crew"
 
 #define HUNTER_PACK_COPS "Spacepol Officers"
 #define HUNTER_PACK_RUSSIAN "Russian Smugglers"

code/__DEFINES/colors.dm

@@ -33,6 +33,13 @@
 #define COLOR_HALF_TRANSPARENT_BLACK "#0000007A"
 
 #define COLOR_RED "#FF0000"
+#define COLOR_CHRISTMAS_RED "#D6001C"
+#define COLOR_OLD_GLORY_RED "#B22234"
+#define COLOR_FRENCH_RED "#EF4135"
+#define COLOR_ETHIOPIA_RED "#DA121A"
+#define COLOR_UNION_JACK_RED "#C8102E"
+#define COLOR_MEDIUM_DARK_RED "#CC0000"
+#define COLOR_PINK_RED "EF3340"
 #define COLOR_SYNDIE_RED "#F10303"
 #define COLOR_SYNDIE_RED_HEAD "#760500"
 #define COLOR_MOSTLY_PURE_RED "#FF3300"
@@ -50,7 +57,10 @@
 
 #define COLOR_YELLOW "#FFFF00"
 #define COLOR_VIVID_YELLOW "#FBFF23"
+#define COLOR_TANGERINE_YELLOW "#FFCC00"
 #define COLOR_VERY_SOFT_YELLOW "#FAE48E"
+#define COLOR_GOLD "#FFD700"
+#define COLOR_ETHIOPIA_YELLOW "#FCDD09"
 
 #define COLOR_OLIVE "#808000"
 #define COLOR_ASSISTANT_OLIVE "#828163"
@@ -63,6 +73,9 @@
 #define COLOR_VERY_PALE_LIME_GREEN "#DDFFD3"
 #define COLOR_VERY_DARK_LIME_GREEN "#003300"
 #define COLOR_GREEN "#008000"
+#define COLOR_CHRISTMAS_GREEN "#00873E"
+#define COLOR_IRISH_GREEN "#169B62"
+#define COLOR_ETHIOPIA_GREEN "#078930"
 #define COLOR_DARK_MODERATE_LIME_GREEN "#44964A"
 #define COLOR_PAI_GREEN "#00FF88"
 #define COLOR_PALE_GREEN "#20e28e"
@@ -72,6 +85,10 @@
 #define COLOR_DARK_CYAN "#00A2FF"
 #define COLOR_TEAL "#008080"
 #define COLOR_BLUE "#0000FF"
+#define COLOR_OLD_GLORY_BLUE "#3C3B6E"
+#define COLOR_FRENCH_BLUE "#0055A4"
+#define COLOR_UNION_JACK_BLUE "#012169"
+#define COLOR_TRUE_BLUE "#0066CC"
 #define COLOR_STRONG_BLUE "#1919c8"
 #define COLOR_CENTCOM_BLUE "#134975"
 #define COLOR_BRIGHT_BLUE "#2CB2E8"
@@ -99,6 +116,7 @@
 #define COLOR_DARK_PURPLE "#551A8B"
 
 #define COLOR_ORANGE "#FF9900"
+#define COLOR_IRISH_ORANGE "#FF883E"
 #define COLOR_ENGINEERING_ORANGE "#FFA62B"
 #define COLOR_MOSTLY_PURE_ORANGE "#ff8000"
 #define COLOR_TAN_ORANGE "#FF7B00"
@@ -248,12 +266,13 @@
 #define CIRCUIT_COLOR_ENGINEERING "#F8D700"
 #define CIRCUIT_COLOR_SUPPLY "#C47749"
 
-/// Highly Saturated Colors
-#define COLOR_BRIGHT_RED "#FF6666"
-#define COLOR_BRIGHT_YELLOW "#EAFF51"
-#define COLOR_BRIGHT_GREEN "#41FC66"
-#define COLOR_BRIGHT_TEAL "#42FFF2"
-#define COLOR_BRIGHT_PURPLE "#5D5DFC"
+/// Colors for pride week
+#define COLOR_PRIDE_RED "#FF6666"
+#define COLOR_PRIDE_ORANGE "#FC9F3C"
+#define COLOR_PRIDE_YELLOW "#EAFF51"
+#define COLOR_PRIDE_GREEN "#41FC66"
+#define COLOR_PRIDE_BLUE "#42FFF2"
+#define COLOR_PRIDE_PURPLE "#5D5DFC"
 
 /// The default color for admin say, used as a fallback when the preference is not enabled
 #define DEFAULT_ASAY_COLOR COLOR_MOSTLY_PURE_RED

code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm

@@ -28,3 +28,5 @@
 #define COMSIG_MOUSEDROPPED_ONTO "mousedropped_onto"
 ///from base of mob/MouseWheelOn(): (/atom, delta_x, delta_y, params)
 #define COMSIG_MOUSE_SCROLL_ON "mousescroll_on"
+/// From /atom/movable/screen/click(): (atom/target, atom/location, control, params, mob/user)
+#define COMSIG_SCREEN_ELEMENT_CLICK "screen_element_click"

code/__DEFINES/dcs/signals/signals_storage.dm

@@ -5,3 +5,5 @@
 /// Sent after dumping into some other storage object: (atom/dest_object, mob/user)
 #define COMSIG_STORAGE_DUMP_POST_TRANSFER "storage_dump_into_storage"
 
+/// Sent to the STORAGE when an ITEM is STORED INSIDE.
+#define COMSIG_STORAGE_STORED_ITEM "storage_storing_item"

code/__DEFINES/holiday.dm

@@ -0,0 +1 @@
+#define HOLIDAY_HAT_CHANCE 20

code/__DEFINES/interaction_flags.dm

@@ -20,6 +20,14 @@
 #define INTERACT_ATOM_ALLOW_USER_LOCATION (1<<9)
 /// ignores mobility check
 #define INTERACT_ATOM_IGNORE_MOBILITY (1<<10)
+// Bypass all adjacency checks for mouse drop
+#define INTERACT_ATOM_MOUSEDROP_IGNORE_ADJACENT (1<<11)
+/// Bypass all can_perform_action checks for mouse drop
+#define INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY (1<<12)
+/// Bypass all adjacency and other checks for mouse drop
+#define INTERACT_ATOM_MOUSEDROP_IGNORE_CHECKS (INTERACT_ATOM_MOUSEDROP_IGNORE_ADJACENT | INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY)
+/// calls try_interact() on attack_paw() and returns that.
+#define INTERACT_ATOM_ATTACK_PAW (1<<13)
 
 /// attempt pickup on attack_hand for items
 #define INTERACT_ITEM_ATTACK_HAND_PICKUP (1<<0)

code/__DEFINES/is_helpers.dm

@@ -286,7 +286,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 GLOBAL_LIST_INIT(book_types, typecacheof(list(
 	/obj/item/book,
 	/obj/item/spellbook,
-)))
+	/obj/item/infuser_book)))
 
 // Jobs
 #define is_job(job_type)  (istype(job_type, /datum/job))

code/__DEFINES/jobs.dm

@@ -204,8 +204,11 @@
 #define JOB_ASSIGN_QUIRKS (1<<7)
 /// Whether this job can be an intern.
 #define JOB_CAN_BE_INTERN (1<<8)
-/// Whether this job is enabled/disabled by the spooktober config
-#define JOB_SPOOKTOBER (1<<9)
+/// This job cannot have more slots opened by the Head of Personnel (but admins or other random events can still do this).
+#define JOB_CANNOT_OPEN_SLOTS (1<<9)
+
+/// Combination flag for jobs which are considered regular crew members of the station.
+#define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN)
 
 #define FACTION_NONE "None"
 #define FACTION_STATION "Station"

code/__DEFINES/mobs.dm

@@ -590,14 +590,15 @@
 
 ///Squash flags. For squashable element
 
-///Whether or not the squashing requires the squashed mob to be lying down
+/// Squashing will not occur if the mob is not lying down (bodyposition is LYING_DOWN)
 #define SQUASHED_SHOULD_BE_DOWN (1<<0)
-///Whether or not to gib when the squashed mob is moved over
+/// If present, outright gibs the squashed mob instead of just dealing damage
 #define SQUASHED_SHOULD_BE_GIBBED (1<<1)
-
-
+/// If squashing always passes if the mob is dead
+#define SQUASHED_ALWAYS_IF_DEAD (1<<2)
 /// Don't squash our mob if its not located in a turf
 #define SQUASHED_DONT_SQUASH_IN_CONTENTS (1<<3)
+
 /*
  * Defines for "AI emotions", allowing the AI to expression emotions
  * with status displays via emotes.

code/__DEFINES/time.dm

@@ -36,6 +36,7 @@
 #define FESTIVE_SEASON "Festive Season"
 #define GARBAGEDAY "Garbage Day"
 #define MONKEYDAY "Monkey Day"
+#define PRIDE_WEEK "Pride Week"
 #define MOTH_WEEK "Moth Week"
 #define IAN_HOLIDAY "Ian's Birthday"
 /*

code/__DEFINES/traits/declarations.dm

@@ -125,13 +125,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// This human is immune to the effects of being exploded. (ex_act)
 #define TRAIT_BOMBIMMUNE "bomb_immunity"
 /// This mob won't get gibbed by nukes going off
-/* #define TRAIT_NUKEIMMUNE "nuke_immunity" */
+#define TRAIT_NUKEIMMUNE "nuke_immunity"
 /// Can't be given viruses
 #define TRAIT_VIRUSIMMUNE "virus_immunity"
 /// Won't become a husk under any circumstances
 /* #define TRAIT_UNHUSKABLE "trait_unhuskable" */
 /// Reduces the chance viruses will spread to this mob, and if the mob has a virus, slows its advancement
-/* #define TRAIT_VIRUS_RESISTANCE "virus_resistance" */
+#define TRAIT_VIRUS_RESISTANCE "virus_resistance"
 #define TRAIT_GENELESS "geneless"
 #define TRAIT_PIERCEIMMUNE "pierce_immunity"
 #define TRAIT_NODISMEMBER "dismember_immunity"
@@ -1022,9 +1022,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Isn't attacked harmfully by blob structures
 #define TRAIT_BLOB_ALLY "blob_ally"
 /// Has the chuuni component
-/* #define TRAIT_CHUUNIBYOU "chuunibyou" */
+#define TRAIT_CHUUNIBYOU "chuunibyou"
 /// Has splattercasting
-/* #define TRAIT_SPLATTERCASTER "splattercaster" */
+#define TRAIT_SPLATTERCASTER "splattercaster"
 
 ///Traits given by station traits
 /* #define STATION_TRAIT_ASSISTANT_GIMMICKS "station_trait_assistant_gimmicks" */
@@ -1154,7 +1154,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// This atom can have spells cast from it if a mob is within it
 /// This means the "caster" of the spell is changed to the mob's loc
 /// Note this doesn't mean all spells are guaranteed to work or the mob is guaranteed to cast
-/* #define TRAIT_CASTABLE_LOC "castable_loc" */
+#define TRAIT_CASTABLE_LOC "castable_loc"
 
 /// Needs above trait to work.
 /// This trait makes it so that any cast spells will attempt to transfer to the location's location.

code/__DEFINES/turfs.dm

@@ -96,3 +96,14 @@
 #define TURF_PATHING_PASS_PROC 1
 /// Turf is never passable
 #define TURF_PATHING_PASS_NO 2
+
+/// Define the alpha for holiday/colored tile decals
+#define DECAL_ALPHA 60
+/// Generate horizontal striped color turf decals
+#define PATTERN_DEFAULT "default"
+/// Generate vertical striped color turf decals
+#define PATTERN_VERTICAL_STRIPE "vertical"
+/// Generate random color turf decals
+#define PATTERN_RANDOM "random"
+/// Generate rainbow color turf decals
+#define PATTERN_RAINBOW "rainbow"

code/__DEFINES/~monkestation/blueshift.dm

@@ -270,14 +270,6 @@ See the examinemore module for information.
 #define BOOT_UNSEAL_MESSAGE "relax their grip on your legs"
 #define BOOT_SEAL_MESSAGE "seal around your feet"
 
-/// Colors for pride week
-#define COLOR_PRIDE_RED "#FF6666"
-#define COLOR_PRIDE_ORANGE "#FC9F3C"
-#define COLOR_PRIDE_YELLOW "#EAFF51"
-#define COLOR_PRIDE_GREEN "#41FC66"
-#define COLOR_PRIDE_BLUE "#42FFF2"
-#define COLOR_PRIDE_PURPLE "#5D5DFC"
-
 /// Trait that changes the ending effects of twitch leaving your system
 #define TRAIT_TWITCH_ADAPTED "twitch_adapted"
 

code/__DEFINES/~monkestation/dcs/signals/signals_object.dm

@@ -0,0 +1,2 @@
+//flag to block the qdel that normally happens when a projectile is blocked
+#define PROJECTILE_INTERRUPT_BLOCK_QDEL (4<<0)

code/__DEFINES/~monkestation/jobs.dm

@@ -1 +1,3 @@
 #define JOB_SECURITY_ASSISTANT "Security Assistant"
+/// Whether this job is enabled/disabled by the spooktober config
+#define JOB_SPOOKTOBER (1<<16)

code/__HELPERS/matrices.dm

@@ -68,6 +68,20 @@
 		//doesn't have an object argument because this is "Stacking" with the animate call above
 		//3 billion% intentional
 
+/// Similar to shake but more spasm-y and jerk-y
+/atom/proc/spasm_animation(loops = -1)
+	var/list/transforms = list(
+		matrix(transform).Translate(-1, 0),
+		matrix(transform).Translate(0, 1),
+		matrix(transform).Translate(1, 0),
+		matrix(transform).Translate(0, -1),
+	)
+
+	animate(src, transform = transforms[1], time = 0.2, loop = loops)
+	animate(transform = transforms[2], time = 0.1)
+	animate(transform = transforms[3], time = 0.2)
+	animate(transform = transforms[4], time = 0.3)
+
 /**
  * Shear the transform on either or both axes.
  * * x - X axis shearing

code/_globalvars/lists/maintenance_loot.dm

@@ -197,9 +197,12 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 		/obj/item/pen/screwdriver = 1,
 		) = 8,
 
+//monkestation edit start
 	list(//artifacts
 		/obj/effect/artifact_spawner = 4,
+		/obj/item/a_gift/anything/wiz_name = 2,
 		) = 8,
+//monkestation edit end
 
 	list(//construction and crafting
 		/obj/item/beacon = 1,
@@ -349,14 +352,15 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
 		) = 1,
 
 	list(//misc
-		/obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime = 1,
+		/obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime = 1, //monkestation edit: added maint_gun
 		/obj/item/book/granter/crafting_recipe/trash_cannon = 1,
-		/obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime = 1,
+		/obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime = 1, //monkestation edit
 		/obj/item/book/granter/sign_language = 1,
 		/obj/item/disk/nuclear/fake = 1,
 		/obj/item/skillchip/brainwashing = 1,
 		/obj/item/tattoo_kit = 1,
 		/obj/item/folder/ancient_paperwork = 1,
+		/obj/item/seeds/tree/money = 1, //monkestation edit
 		) = 1,
 
 ))

code/_globalvars/traits/_traits.dm

@@ -33,6 +33,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_AREA_SENSITIVE" = TRAIT_AREA_SENSITIVE,
 		"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
 		"TRAIT_BLOCKING_EXPLOSIVES" = TRAIT_BLOCKING_EXPLOSIVES,
+		"TRAIT_CASTABLE_LOC" = TRAIT_CASTABLE_LOC,
 		"TRAIT_DEL_ON_SPACE_DUMP" = TRAIT_DEL_ON_SPACE_DUMP,
 		"TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE,
 		"TRAIT_FISH_SAFE_STORAGE" = TRAIT_FISH_SAFE_STORAGE,
@@ -56,7 +57,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_VOIDSTORM_IMMUNE" = TRAIT_VOIDSTORM_IMMUNE,
 		"TRAIT_WEATHER_IMMUNE" = TRAIT_WEATHER_IMMUNE,
 		/* "TRAIT_BOULDER_BREAKER" = TRAIT_BOULDER_BREAKER, */
-		/* "TRAIT_CASTABLE_LOC" = TRAIT_CASTABLE_LOC, */
 		/* "TRAIT_CHASM_STOPPER" = TRAIT_CHASM_STOPPER, */
 		/* "TRAIT_HAS_LABEL" = TRAIT_HAS_LABEL, */
 		/* "TRAIT_IMMERSED" = TRAIT_IMMERSED, */
@@ -179,6 +179,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CHEF_KISS" = TRAIT_CHEF_KISS,
 		"TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS,
 		"TRAIT_CHUNKYFINGERS_IGNORE_BATON" = TRAIT_CHUNKYFINGERS_IGNORE_BATON,
+		"TRAIT_CHUUNIBYOU" = TRAIT_CHUUNIBYOU,
 		"TRAIT_CLEANBOT_WHISPERER" = TRAIT_CLEANBOT_WHISPERER,
 		"TRAIT_CLIFF_WALKER" = TRAIT_CLIFF_WALKER,
 		"TRAIT_CLOWN_ENJOYER" = TRAIT_CLOWN_ENJOYER,
@@ -363,6 +364,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_TRANSFORM" = TRAIT_NO_TRANSFORM,
 		"TRAIT_NO_UNDERWEAR" = TRAIT_NO_UNDERWEAR,
 		"TRAIT_NO_ZOMBIFY" = TRAIT_NO_ZOMBIFY,
+		"TRAIT_NUKEIMMUNE" = TRAIT_NUKEIMMUNE,
 		"TRAIT_OCCULTIST" = TRAIT_OCCULTIST,
 		"TRAIT_OIL_FRIED" = TRAIT_OIL_FRIED,
 		"TRAIT_ON_ELEVATED_SURFACE" = TRAIT_ON_ELEVATED_SURFACE,
@@ -440,6 +442,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST,
 		"TRAIT_SPIDER_CONSUMED" = TRAIT_SPIDER_CONSUMED,
 		"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
+		"TRAIT_SPLATTERCASTER" = TRAIT_SPLATTERCASTER,
 		"TRAIT_SPRAY_PAINTABLE" = TRAIT_SPRAY_PAINTABLE,
 		"TRAIT_SPRINTING" = TRAIT_SPRINTING,
 		"TRAIT_STABLEHEART" = TRAIT_STABLEHEART,
@@ -488,6 +491,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_VENTCRAWLER_ALWAYS" = TRAIT_VENTCRAWLER_ALWAYS,
 		"TRAIT_VENTCRAWLER_NUDE" = TRAIT_VENTCRAWLER_NUDE,
 		"TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE,
+		"TRAIT_VIRUS_RESISTANCE" = TRAIT_VIRUS_RESISTANCE,
 		"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
 		"TRAIT_WAS_EVOLVED" = TRAIT_WAS_EVOLVED,
 		"TRAIT_WATER_BREATHING" = TRAIT_WATER_BREATHING,
@@ -513,7 +517,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		/* "TRAIT_BOXING_READY" = TRAIT_BOXING_READY, */
 		/* "TRAIT_BRAWLING_KNOCKDOWN_BLOCKED" = TRAIT_BRAWLING_KNOCKDOWN_BLOCKED, */
 		/* "TRAIT_CATLIKE_GRACE" = TRAIT_CATLIKE_GRACE, */
-		/* "TRAIT_CHUUNIBYOU" = TRAIT_CHUUNIBYOU, */
 		/* "TRAIT_DETECTIVES_TASTE" = TRAIT_DETECTIVES_TASTE, */
 		/* "TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, */
 		/* "TRAIT_DISPLAY_JOB_IN_BINARY" = TRAIT_DISPLAY_JOB_IN_BINARY, */
@@ -557,7 +560,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		/* "TRAIT_NO_STAGGER" = TRAIT_NO_STAGGER, */
 		/* "TRAIT_NO_THROWING" = TRAIT_NO_THROWING, */
 		/* "TRAIT_NO_TWOHANDING" = TRAIT_NO_TWOHANDING, */
-		/* "TRAIT_NUKEIMMUNE" = TRAIT_NUKEIMMUNE, */
 		/* "TRAIT_OFF_BALANCE_TACKLER" = TRAIT_OFF_BALANCE_TACKLER, */
 		/* "TRAIT_OVERDOSEIMMUNE" = TRAIT_OVERDOSEIMMUNE, */
 		/* "TRAIT_PAPER_MASTER" = TRAIT_PAPER_MASTER, */
@@ -576,7 +578,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		/* "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, */
 		/* "TRAIT_SPEECH_BOOSTER" = TRAIT_SPEECH_BOOSTER, */
 		/* "TRAIT_SPELLS_LOTTERY" = TRAIT_SPELLS_LOTTERY, */
-		/* "TRAIT_SPLATTERCASTER" = TRAIT_SPLATTERCASTER, */
 		/* "TRAIT_STIMMED" = TRAIT_STIMMED, */
 		/* "TRAIT_STIMULATED" = TRAIT_STIMULATED, */
 		/* "TRAIT_STRENGTH" = TRAIT_STRENGTH, */
@@ -593,7 +594,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		/* "TRAIT_TOSS_GUN_HARD" = TRAIT_TOSS_GUN_HARD, */
 		/* "TRAIT_UNHUSKABLE" = TRAIT_UNHUSKABLE, */
 		/* "TRAIT_USER_SCOPED" = TRAIT_USER_SCOPED, */
-		/* "TRAIT_VIRUS_RESISTANCE" = TRAIT_VIRUS_RESISTANCE, */
 		/* "TRAIT_WOUND_LICKER" = TRAIT_WOUND_LICKER, */
 		/* "TRAIT_XRAY_HEARING" = TRAIT_XRAY_HEARING, */
 	),

code/_onclick/hud/alert.dm

@@ -1059,6 +1059,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	return 1
 
 /atom/movable/screen/alert/Click(location, control, params)
+	SHOULD_CALL_PARENT(TRUE)
+
+	..()
 	if(!usr || !usr.client)
 		return FALSE
 	if(usr != owner)