Merge Upstream 02.02.2025

_maps/RandomRuins/SpaceRuins/anomaly_research.dmm

@@ -71,7 +71,7 @@
 /turf/open/floor/grass,
 /area/misc/anomaly_research)
 "dr" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
 "ds" = (
@@ -90,7 +90,7 @@
 /area/misc/anomaly_research)
 "dD" = (
 /obj/structure/lattice/catwalk,
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
 "eq" = (
@@ -602,7 +602,7 @@
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "qM" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /obj/effect/turf_decal/trimline/purple,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -683,7 +683,7 @@
 /area/misc/anomaly_research)
 "sX" = (
 /obj/machinery/light/small/built/directional/north,
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /obj/item/reagent_containers/cup/bottle/wittel,
 /obj/effect/spawner/random/trash/grime,
 /obj/effect/decal/cleanable/dirt,
@@ -1855,7 +1855,7 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
 "ZL" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,

code/__DEFINES/traits/sources.dm

@@ -40,8 +40,6 @@
 ///A trait given by a held item
 #define HELD_ITEM_TRAIT "held-item-trait"
 #define ABSTRACT_ITEM_TRAIT "abstract-item"
-/// A trait given by any status effect
-#define STATUS_EFFECT_TRAIT "status-effect"
 
 /// Trait from light debugging
 #define LIGHT_DEBUG_TRAIT "light-debug"
@@ -124,7 +122,6 @@
 #define MEGAFAUNA_TRAIT "megafauna"
 #define CLOWN_NUKE_TRAIT "clown-nuke"
 #define STICKY_MOUSTACHE_TRAIT "sticky-moustache"
-#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy"
 #define CHRONO_GUN_TRAIT "chrono-gun"
 #define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap"
 #define CURSED_MASK_TRAIT "cursed-mask"
@@ -211,8 +208,6 @@
 #define BEAUTY_ELEMENT_TRAIT "beauty_element"
 #define MOOD_DATUM_TRAIT "mood_datum"
 #define DRONE_SHY_TRAIT "drone_shy"
-/// Trait given by stabilized light pink extracts
-#define STABILIZED_LIGHT_PINK_EXTRACT_TRAIT "stabilized_light_pink"
 /// Trait given by adamantine extracts
 #define ADAMANTINE_EXTRACT_TRAIT "adamantine_extract"
 /// Given by the multiple_lives component to the previous body of the mob upon death.

code/_globalvars/phobias.dm

@@ -400,6 +400,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
 		/obj/item/storage/toolbox/fishing,
 		/obj/item/stack/sheet/animalhide/carp,
 		/obj/item/toy/plush/carpplushie,
+		/obj/item/storage/bag/fishing,
 	)),
 	"greytide" = (typecacheof(list(
 		/obj/item/clothing/under/color/grey,

code/datums/elements/organ_set_bonus.dm

@@ -86,7 +86,7 @@
 	bonus_active = TRUE
 	// Add traits
 	if(length(bonus_traits))
-		owner.add_traits(bonus_traits, REF(src))
+		owner.add_traits(bonus_traits, TRAIT_STATUS_EFFECT(id))
 
 	// Add biotype
 	if(owner.mob_biotypes & bonus_biotype)
@@ -113,7 +113,7 @@
 
 	// Remove traits
 	if(length(bonus_traits))
-		owner.remove_traits(bonus_traits, REF(src))
+		owner.remove_traits(bonus_traits, TRAIT_STATUS_EFFECT(id))
 	// Remove biotype (if added)
 	if(biotype_added)
 		owner.mob_biotypes &= ~bonus_biotype

code/datums/status_effects/buffs.dm

@@ -428,7 +428,7 @@
 
 	if(iscarbon(owner))
 		chainsaw = new(get_turf(owner))
-		ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT)
+		ADD_TRAIT(chainsaw, TRAIT_NODROP, TRAIT_STATUS_EFFECT(id))
 		owner.put_in_hands(chainsaw, forced = TRUE)
 		chainsaw.attack_self(owner)
 		owner.reagents.add_reagent(/datum/reagent/medicine/adminordrazine, 25)
@@ -559,7 +559,7 @@
 	owner.AddElement(/datum/element/simple_flying)
 	owner.add_stun_absorption(source = id, priority = 4)
 	owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
-	ADD_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, id)
+	ADD_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_STATUS_EFFECT(id))
 	owner.playsound_local(get_turf(owner), 'sound/effects/chemistry/ahaha.ogg', vol = 100, vary = TRUE, use_reverb = TRUE)
 	return TRUE
 
@@ -577,7 +577,7 @@
 	owner.RemoveElement(/datum/element/simple_flying)
 	owner.remove_stun_absorption(id)
 	owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
-	REMOVE_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, id)
+	REMOVE_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_STATUS_EFFECT(id))
 
 /// Gives you a brief period of anti-gravity
 /datum/status_effect/jump_jet
@@ -600,11 +600,11 @@
 	alert_type = null
 
 /datum/status_effect/radiation_immunity/on_apply()
-	ADD_TRAIT(owner, TRAIT_RADIMMUNE, type)
+	ADD_TRAIT(owner, TRAIT_RADIMMUNE, TRAIT_STATUS_EFFECT(id))
 	return TRUE
 
 /datum/status_effect/radiation_immunity/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_RADIMMUNE, type)
+	REMOVE_TRAIT(owner, TRAIT_RADIMMUNE, TRAIT_STATUS_EFFECT(id))
 
 /datum/status_effect/radiation_immunity/radnebula
 	alert_type = /atom/movable/screen/alert/status_effect/radiation_immunity

code/datums/status_effects/buffs/food/grant_trait.dm

@@ -3,16 +3,16 @@
 	var/trait = TRAIT_DUMB // You need to override this
 
 /datum/status_effect/food/trait/on_apply()
-	if(!HAS_TRAIT_FROM(owner, trait, type)) // Check if trait was already applied
-		ADD_TRAIT(owner, trait, type)
+	if(!HAS_TRAIT_FROM(owner, trait, TRAIT_STATUS_EFFECT(id))) // Check if trait was already applied
+		ADD_TRAIT(owner, trait, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 /datum/status_effect/food/trait/be_replaced()
-	REMOVE_TRAIT(owner, trait, type)
+	REMOVE_TRAIT(owner, trait, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 /datum/status_effect/food/trait/on_remove()
-	REMOVE_TRAIT(owner, trait, type)
+	REMOVE_TRAIT(owner, trait, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 /datum/status_effect/food/trait/shockimmune

code/datums/status_effects/buffs/stop_drop_roll.dm

@@ -15,7 +15,7 @@
 
 	RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(stop_rolling))
 	RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(body_position_changed))
-	ADD_TRAIT(owner, TRAIT_HANDS_BLOCKED, id) // they're kinda busy!
+	ADD_TRAIT(owner, TRAIT_HANDS_BLOCKED, TRAIT_STATUS_EFFECT(id)) // they're kinda busy!
 
 	owner.visible_message(
 		span_danger("[owner] rolls on the floor, trying to put [owner.p_them()]self out!"),
@@ -31,7 +31,7 @@
 
 /datum/status_effect/stop_drop_roll/on_remove()
 	UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_SET_BODY_POSITION))
-	REMOVE_TRAIT(owner, TRAIT_HANDS_BLOCKED, id)
+	REMOVE_TRAIT(owner, TRAIT_HANDS_BLOCKED, TRAIT_STATUS_EFFECT(id))
 
 /datum/status_effect/stop_drop_roll/tick(seconds_between_ticks)
 	if(HAS_TRAIT(owner, TRAIT_IMMOBILIZED) || HAS_TRAIT(owner, TRAIT_INCAPACITATED))

code/datums/status_effects/debuffs/debuffs.dm

@@ -550,13 +550,13 @@
 
 /datum/status_effect/gonbola_pacify/on_apply()
 	. = ..()
-	owner.add_traits(list(TRAIT_PACIFISM, TRAIT_MUTE), CLOTHING_TRAIT)
-	owner.add_mood_event(type, /datum/mood_event/gondola)
+	owner.add_traits(list(TRAIT_PACIFISM, TRAIT_MUTE), REF(src))
+	owner.add_mood_event(REF(src), /datum/mood_event/gondola)
 	to_chat(owner, span_notice("You suddenly feel at peace and feel no need to make any sudden or rash actions..."))
 
 /datum/status_effect/gonbola_pacify/on_remove()
-	owner.remove_traits(list(TRAIT_PACIFISM, TRAIT_MUTE), CLOTHING_TRAIT)
-	owner.clear_mood_event(type)
+	owner.remove_traits(list(TRAIT_PACIFISM, TRAIT_MUTE), REF(src))
+	owner.clear_mood_event(REF(src))
 	return ..()
 
 /datum/status_effect/trance
@@ -581,7 +581,7 @@
 	if(!iscarbon(owner))
 		return FALSE
 	RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(hypnotize))
-	ADD_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT)
+	ADD_TRAIT(owner, TRAIT_MUTE, TRAIT_STATUS_EFFECT(id))
 	owner.add_client_colour(/datum/client_colour/monochrome/trance)
 	owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \
 	span_warning(pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")))
@@ -594,7 +594,7 @@
 
 /datum/status_effect/trance/on_remove()
 	UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
-	REMOVE_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_MUTE, TRAIT_STATUS_EFFECT(id))
 	owner.remove_status_effect(/datum/status_effect/dizziness)
 	owner.remove_client_colour(/datum/client_colour/monochrome/trance)
 	to_chat(owner, span_warning("You snap out of your trance!"))
@@ -978,11 +978,11 @@
 	icon_state = "convulsing"
 
 /datum/status_effect/discoordinated/on_apply()
-	ADD_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, "[type]")
+	ADD_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 /datum/status_effect/discoordinated/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, "[type]")
+	REMOVE_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 ///Maddly teleports the victim around all of space for 10 seconds

code/datums/status_effects/debuffs/pacifism.dm

@@ -7,8 +7,8 @@
 	return ..()
 
 /datum/status_effect/pacify/on_apply()
-	ADD_TRAIT(owner, TRAIT_PACIFISM, id)
+	ADD_TRAIT(owner, TRAIT_PACIFISM, TRAIT_STATUS_EFFECT(id))
 	return TRUE
 
 /datum/status_effect/pacify/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_PACIFISM, id)
+	REMOVE_TRAIT(owner, TRAIT_PACIFISM, TRAIT_STATUS_EFFECT(id))

code/datums/status_effects/debuffs/silenced.dm

@@ -9,12 +9,12 @@
 
 /datum/status_effect/silenced/on_apply()
 	RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(clear_silence))
-	ADD_TRAIT(owner, TRAIT_MUTE, id)
+	ADD_TRAIT(owner, TRAIT_MUTE, TRAIT_STATUS_EFFECT(id))
 	return TRUE
 
 /datum/status_effect/silenced/on_remove()
 	UnregisterSignal(owner, COMSIG_LIVING_DEATH)
-	REMOVE_TRAIT(owner, TRAIT_MUTE, id)
+	REMOVE_TRAIT(owner, TRAIT_MUTE, TRAIT_STATUS_EFFECT(id))
 
 /// Signal proc that clears any silence we have (self-deletes).
 /datum/status_effect/silenced/proc/clear_silence(mob/living/source)

code/datums/status_effects/debuffs/staggered.dm

@@ -71,7 +71,7 @@
 		COMSIG_LIVING_STATUS_STUN,
 		COMSIG_LIVING_STATUS_IMMOBILIZE), PROC_REF(clear_stun_vulnverability)
 	)
-	ADD_TRAIT(owner, TRAIT_STUN_ON_NEXT_SHOVE, STATUS_EFFECT_TRAIT)
+	ADD_TRAIT(owner, TRAIT_STUN_ON_NEXT_SHOVE, TRAIT_STATUS_EFFECT(id))
 	vulnverability_overlay = mutable_appearance(icon = 'icons/effects/effects.dmi', icon_state = "dazed")
 	owner.add_overlay(vulnverability_overlay)
 	return TRUE
@@ -83,7 +83,7 @@
 		COMSIG_LIVING_STATUS_IMMOBILIZE,
 		COMSIG_LIVING_DEATH,
 	))
-	REMOVE_TRAIT(owner, TRAIT_STUN_ON_NEXT_SHOVE, STATUS_EFFECT_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_STUN_ON_NEXT_SHOVE, TRAIT_STATUS_EFFECT(id))
 	if(vulnverability_overlay)
 		clear_stun_vulnverability_overlay()
 
@@ -123,12 +123,12 @@
 	if(owner.stat == DEAD)
 		return FALSE
 	RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(clear_on_death))
-	ADD_TRAIT(owner, TRAIT_NO_SIDE_KICK, STATUS_EFFECT_TRAIT)
+	ADD_TRAIT(owner, TRAIT_NO_SIDE_KICK, TRAIT_STATUS_EFFECT(id))
 	return TRUE
 
 /datum/status_effect/no_side_kick/on_remove()
 	UnregisterSignal(owner, list(COMSIG_LIVING_DEATH))
-	REMOVE_TRAIT(owner, TRAIT_NO_SIDE_KICK, STATUS_EFFECT_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_NO_SIDE_KICK, TRAIT_STATUS_EFFECT(id))
 
 /datum/status_effect/no_side_kick/proc/clear_on_death(mob/living/source)
 	SIGNAL_HANDLER

code/datums/status_effects/debuffs/tower_of_babel.dm

@@ -2,10 +2,12 @@
 	id = "tower_of_babel"
 	status_type = STATUS_EFFECT_UNIQUE
 	alert_type = /atom/movable/screen/alert/status_effect/tower_of_babel
-	var/trait_source = STATUS_EFFECT_TRAIT
+	var/trait_source
 
 /datum/status_effect/tower_of_babel/on_creation(mob/living/new_owner, duration = 15 SECONDS)
 	src.duration = duration
+	if(isnull(trait_source))
+		trait_source = TRAIT_STATUS_EFFECT(id)
 	return ..()
 
 /datum/status_effect/tower_of_babel/on_apply()

code/datums/status_effects/drug_effects.dm

@@ -72,7 +72,7 @@
 	var/mob/living/carbon/human/human_owner = owner
 	human_owner.add_movespeed_modifier(/datum/movespeed_modifier/reagent/cannabis) //slows you down
 	human_owner.add_eye_color(BLOODCULT_EYE, EYE_COLOR_WEED_PRIORITY) //makes cult eyes less obvious
-	human_owner.add_traits(list(TRAIT_CLUMSY, TRAIT_BLOODSHOT_EYES), type) // impairs motor coordination and dilates blood vessels in eyes
+	human_owner.add_traits(list(TRAIT_CLUMSY, TRAIT_BLOODSHOT_EYES), TRAIT_STATUS_EFFECT(id)) // impairs motor coordination and dilates blood vessels in eyes
 	human_owner.add_mood_event("stoned", /datum/mood_event/stoned) //improves mood
 	human_owner.sound_environment_override = SOUND_ENVIRONMENT_DRUGGED //not realistic but very immersive
 	return TRUE
@@ -83,7 +83,7 @@
 	var/mob/living/carbon/human/human_owner = owner
 	human_owner.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/cannabis)
 	human_owner.remove_eye_color(EYE_COLOR_WEED_PRIORITY)
-	human_owner.remove_traits(list(TRAIT_CLUMSY, TRAIT_BLOODSHOT_EYES), type)
+	human_owner.remove_traits(list(TRAIT_CLUMSY, TRAIT_BLOODSHOT_EYES), TRAIT_STATUS_EFFECT(id))
 	human_owner.clear_mood_event("stoned")
 	human_owner.sound_environment_override = SOUND_ENVIRONMENT_NONE
 

code/datums/status_effects/gas.dm

@@ -76,12 +76,12 @@
 		CRASH("[type] status effect added to non-human owner: [owner ? owner.type : "null owner"]")
 	var/mob/living/carbon/human/human_owner = owner
 	human_owner.add_movespeed_modifier(/datum/movespeed_modifier/reagent/hypernoblium) //small slowdown as a tradeoff
-	ADD_TRAIT(human_owner, TRAIT_NOFIRE, type)
+	ADD_TRAIT(human_owner, TRAIT_NOFIRE, TRAIT_STATUS_EFFECT(id))
 	return TRUE
 
 /datum/status_effect/hypernob_protection/on_remove()
 	if(!ishuman(owner))
 		stack_trace("[type] status effect being removed from non-human owner: [owner ? owner.type : "null owner"]")
 	var/mob/living/carbon/human/human_owner = owner
 	human_owner.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/hypernoblium)
-	REMOVE_TRAIT(human_owner, TRAIT_NOFIRE, type)
+	REMOVE_TRAIT(human_owner, TRAIT_NOFIRE, TRAIT_STATUS_EFFECT(id))

code/datums/status_effects/neutral.dm

@@ -101,11 +101,11 @@
 
 /datum/status_effect/throat_soothed/on_apply()
 	. = ..()
-	ADD_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+	ADD_TRAIT(owner, TRAIT_SOOTHED_THROAT, TRAIT_STATUS_EFFECT(id))
 
 /datum/status_effect/throat_soothed/on_remove()
 	. = ..()
-	REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+	REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, TRAIT_STATUS_EFFECT(id))
 
 /datum/status_effect/bounty
 	id = "bounty"

code/datums/status_effects/song_effects.dm

@@ -24,12 +24,12 @@
 	aura_desc = "dull"
 
 /datum/status_effect/song/antimagic/on_apply()
-	ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+	ADD_TRAIT(owner, TRAIT_ANTIMAGIC, TRAIT_STATUS_EFFECT(id))
 	playsound(owner, 'sound/items/weapons/fwoosh.ogg', 75, FALSE)
 	return ..()
 
 /datum/status_effect/song/antimagic/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, TRAIT_STATUS_EFFECT(id))
 	return ..()
 
 /datum/status_effect/song/antimagic/get_examine_text()

code/datums/storage/storage.dm

@@ -919,14 +919,14 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		if(!to_remove)
 			return TRUE
 
-		remove_single(to_show, to_remove)
-		INVOKE_ASYNC(src, PROC_REF(put_in_hands_async), to_show, to_remove)
-		if(!silent)
-			to_show.visible_message(
-				span_warning("[to_show] draws [to_remove] from [parent]!"),
-				span_notice("You draw [to_remove] from [parent]."),
-			)
-		return TRUE
+		if (remove_single(to_show, to_remove))
+			INVOKE_ASYNC(src, PROC_REF(put_in_hands_async), to_show, to_remove)
+			if(!silent)
+				to_show.visible_message(
+					span_warning("[to_show] draws [to_remove] from [parent]!"),
+					span_notice("You draw [to_remove] from [parent]."),
+				)
+			return TRUE
 
 	// If nothing else, then we want to open the thing, so do that
 	if(!show_contents(to_show))