plasmamen and vox will no longer suffer from a cmagged recycler

ParadiseSS13 · Feb 4, 2025 · 39b2311 · 39b2311
1 parent eb7c6ce
commit 39b2311
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm
@@ -80,9 +80,20 @@
 	Stuttering(30 SECONDS)
 	do_jitter_animation(30 SECONDS)
 
+	var/obj/item/tank/internal_tank = src.internal
+
 	drop_item_to_ground(shoes, force = TRUE)
 	drop_item_to_ground(wear_mask, force = TRUE)
 	drop_item_to_ground(w_uniform, force = TRUE)
-	equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
-	equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes, ITEM_SLOT_SHOES, TRUE, TRUE)
-	equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat, ITEM_SLOT_MASK, TRUE, TRUE)
+	if(isplasmaman(src))
+		drop_item_to_ground(head, force = TRUE)
+		equip_to_slot_if_possible(new /obj/item/clothing/head/helmet/space/plasmaman/clown/dropdel, ITEM_SLOT_HEAD, TRUE, TRUE)
+		equip_to_slot_if_possible(new /obj/item/clothing/under/plasmaman/clown/dropdel, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
+	equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/dropdel, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
+	equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/dropdel, ITEM_SLOT_SHOES, TRUE, TRUE)
+	equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/dropdel, ITEM_SLOT_MASK, TRUE, TRUE)
+
+	if(internal_tank)
+		equip_to_appropriate_slot(internal_tank)
+		src.internal = internal_tank
+
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
@@ -180,6 +180,9 @@
 /obj/item/clothing/mask/gas/clown_hat/nodrop
 	flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR | NODROP
 
+/obj/item/clothing/mask/gas/clown_hat/dropdel
+	flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR | DROPDEL
+
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
 	desc = "The traditional mime's mask. It has an eerie facial posture."

diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
@@ -134,6 +134,9 @@
 	dyeable = FALSE
 	flags = NODROP
 
+/obj/item/clothing/shoes/clown_shoes/dropdel
+	flags = DROPDEL
+
 /obj/item/clothing/shoes/clown_shoes/magical
 	name = "magical clown shoes"
 	desc = "Standard-issue shoes of the wizarding class clown. Damn they're huge! And powerful! Somehow."

diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -253,6 +253,9 @@
 	item_state = "clown_envirohelm"
 	visor_icon = "clown_envisor"
 
+/obj/item/clothing/head/helmet/space/plasmaman/clown/dropdel
+	flags = DROPDEL
+
 /obj/item/clothing/head/helmet/space/plasmaman/hop
 	name = "head of personnel's envirosuit helmet"
 	desc = "A plasmaman envirohelm that reeks of bureaucracy."

diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
@@ -109,6 +109,9 @@
 /obj/item/clothing/under/rank/civilian/clown/nodrop
 	flags = NODROP
 
+/obj/item/clothing/under/rank/civilian/clown/dropdel
+	flags = DROPDEL
+
 /obj/item/clothing/under/rank/civilian/mime
 	name = "mime's outfit"
 	desc = "It's not very colourful."

diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
@@ -77,6 +77,9 @@
 	item_state = "clown_envirosuit"
 	item_color = "clown_envirosuit"
 
+/obj/item/clothing/under/plasmaman/clown/dropdel
+	flags = DROPDEL
+
 /obj/item/clothing/under/plasmaman/assistant
 	name = "assistant's envirosuit"
 	desc = "The finest from the bottom of the plasmamen clothing barrel."