Merge branch 'shiptest-ss13:master' into More-Layers

shiptest-ss13 · May 14, 2024 · 1771c2a · 1771c2a
2 parents 3be8910 + 2234386
commit 1771c2a
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 102 deletions.
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -773,3 +773,6 @@
 
 ///called in /obj/item/gun/process_chamber (src)
 #define COMSIG_GUN_CHAMBER_PROCESSED "gun_chamber_processed"
+
+///called when an elzu should unroot
+#define COMSIG_DIGOUT "dig_out"
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
@@ -239,3 +239,8 @@
 	description = "Fishing is relaxing"
 	mood_change = 5
 	timeout = 3 MINUTES
+
+/datum/mood_event/root
+	description = span_nicegreen("I rooted recently, it feels good to charge naturally.\n")
+	mood_change = 5
+	timeout = 5 MINUTES
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
@@ -275,3 +275,29 @@
 /atom/movable/screen/alert/status_effect/surrender/Click(location, control, params)
 	. = ..()
 	owner.emote("surrender")
+
+/datum/status_effect/rooted
+	id = "rooted"
+	alert_type = /atom/movable/screen/alert/status_effect/rooted
+
+/datum/status_effect/rooted/on_apply()
+	. = ..()
+	ADD_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
+	ADD_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))
+	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "root", /datum/mood_event/root)
+
+/datum/status_effect/rooted/on_remove()
+	. = ..()
+	REMOVE_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
+	REMOVE_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))
+
+/atom/movable/screen/alert/status_effect/rooted
+	name = "Rooted"
+	desc = "You're currently rooted into the ground and can't move. Click here to start digging yourself out."
+	icon_state = "dig_out"
+
+/atom/movable/screen/alert/status_effect/rooted/Click(location, control, params)
+	. = ..()
+	to_chat(owner, span_notice("You begin digging yourself free."))
+	SEND_SIGNAL(owner,COMSIG_DIGOUT)
+
diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm
@@ -39,19 +39,19 @@
 		playsound(src, 'sound/effects/walkietalkie.ogg', 75)
 		if(stored_mob && looking.stat != DEAD && prob(25))
 			say_fucky_things()
-		if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD || !looking.research_scanner && looking.stat != DEAD || !HAS_TRAIT(looking, TRAIT_DEAF))
-			looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200)
-			playsound(src, 'sound/effects/stall.ogg', 50)
-			if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD)
-				if(prob(20))
-					var/mob/living/carbon/victim = looking
-					var/obj/effect/anomaly/tvstatic/planetary/expansion
-					expansion = new(get_turf(victim))
-					visible_message(span_warning("The static overtakes [victim], taking their place!"))
-					victim.death()
-					expansion.stored_mob = victim
-					victim.forceMove(expansion)
-	return
+		if(HAS_TRAIT(looking, TRAIT_MINDSHIELD) || looking.stat == DEAD || looking.research_scanner || HAS_TRAIT(looking, TRAIT_DEAF))
+			continue
+		looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200)
+		playsound(src, 'sound/effects/stall.ogg', 50)
+		if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD)
+			if(prob(20))
+				var/mob/living/carbon/victim = looking
+				var/obj/effect/anomaly/tvstatic/planetary/expansion
+				expansion = new(get_turf(victim))
+				visible_message(span_warning("The static overtakes [victim], [expansion] taking their place!"))
+				victim.death()
+				expansion.stored_mob = victim
+				victim.forceMove(expansion)
 
 
 /obj/effect/anomaly/tvstatic/Bumped(atom/movable/AM)

diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
@@ -56,11 +56,9 @@
 
 /datum/supply_pack/sec_supply/riotshields
 	name = "Riot Shields Crate"
-	desc = "For when the greytide gets really uppity. Contains three riot shields."
-	cost = 2000
-	contains = list(/obj/item/shield/riot,
-					/obj/item/shield/riot,
-					/obj/item/shield/riot)
+	desc = "Contains a riot shield, effective at holding back hostile fauna, xenofauna, or large crowds."
+	cost = 600
+	contains = list(/obj/item/shield/riot)
 	crate_name = "riot shields crate"
 
 /datum/supply_pack/sec_supply/survknives

diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
@@ -111,3 +111,7 @@
 	display_name = "worn shirt"
 	path = /obj/item/clothing/suit/ianshirt
 
+/datum/gear/suit/hawaiian
+	display_name = "floral shirt"
+	description = "From grills to guns, this shirt's seen it all."
+	path = /obj/item/clothing/suit/hawaiian
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
@@ -661,8 +661,8 @@
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
 
 /obj/item/clothing/suit/hawaiian
-	name = "hawaiian overshirt"
-	desc = "A cool shirt for chilling on the beach."
+	name = "floral shirt"
+	desc = "From grills to guns, this shirt's seen it all."
 	icon_state = "hawaiian_blue"
 	item_state = "hawaiian_blue"