fix plushies

it works as intended now
SPLURT-Station · Apr 22, 2024 · 87e3393 · 87e3393
1 parent cfbd546
commit 87e3393
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/modular_splurt/code/modules/power/reactor/rbmk.dm b/modular_splurt/code/modules/power/reactor/rbmk.dm
@@ -9,11 +9,13 @@
 	priority_announce("RBMK privileges revoked. Current crew is deemed unsuitable to handle a highly radioactive steam engine. More training is required.", "SIMULATION TERMINATED")
 	var/skill_issue_sound = pick('modular_splurt/sound/voice/boowomp.ogg', 'modular_splurt/sound/effects/fart_reverb.ogg')
 	sound_to_playing_players(skill_issue_sound)
-	var/obj/item/toy/plush/random/plushe = new(get_turf(src))
-	plushe.name = "Consolation plushie"
-	plushe.desc = "It has \"You tried\" poorly written in its tag."
-	plushe.squeak_override = list(skill_issue_sound = 1)
-	plushe.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
+	var/turf/plush_turf = get_turf(src)
+	var/obj/item/toy/plush/random/plushe = new(plush_turf)
+	plushe = locate(/obj/item/toy/plush) in plush_turf
+	plushe?.name = "Consolation plushie"
+	plushe?.desc = "It says \"You tried\" poorly written in its tag."
+	plushe?.squeak_override = list(skill_issue_sound = 1)
+	plushe?.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
 	qdel(src)
 
 /obj/machinery/atmospherics/components/trinary/nuclear_reactor/blowout()
@@ -27,9 +29,11 @@
 	priority_announce("RBMK privileges revoked. Current crew is deemed unsuitable to handle a highly radioactive steam engine. More training is required.", "SIMULATION TERMINATED")
 	var/skill_issue_sound = pick('modular_splurt/sound/voice/boowomp.ogg', 'modular_splurt/sound/effects/fart_reverb.ogg')
 	sound_to_playing_players(skill_issue_sound)
-	var/obj/item/toy/plush/random/plushe = new(get_turf(src))
-	plushe.name = "Holy fucking shit plushie"
-	plushe.desc = "You really fucked it up this time, didn't you?."
-	plushe.squeak_override = list(skill_issue_sound = 1)
-	plushe.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
+	var/turf/plush_turf = get_turf(src)
+	var/obj/item/toy/plush/random/plushe = new(plush_turf)
+	plushe = locate(/obj/item/toy/plush) in plush_turf
+	plushe?.name = "Consolation plushie"
+	plushe?.desc = "It says \"You tried\" poorly written in its tag."
+	plushe?.squeak_override = list(skill_issue_sound = 1)
+	plushe?.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
 	qdel(src)
diff --git a/modular_splurt/code/modules/power/supermatter/supermatter.dm b/modular_splurt/code/modules/power/supermatter/supermatter.dm
@@ -61,11 +61,13 @@ Custom Bombcaps:
 		priority_announce("Supermatter privileges revoked. Current crew is deemed unsuitable to handle a highly hazardous engine. More training is required.", "SIMULATION TERMINATED")
 		var/skill_issue_sound = pick('modular_splurt/sound/voice/boowomp.ogg', 'modular_splurt/sound/effects/fart_reverb.ogg')
 		sound_to_playing_players(skill_issue_sound)
-		var/obj/item/toy/plush/random/plushe = new(get_turf(src))
-		plushe.name = "Consolation plushie"
-		plushe.desc = "It has \"You tried\" poorly written in its tag."
-		plushe.squeak_override = list(skill_issue_sound = 1)
-		plushe.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
+		var/turf/plush_turf = get_turf(src)
+		var/obj/item/toy/plush/random/plushe = new(plush_turf)
+		plushe = locate(/obj/item/toy/plush) in plush_turf
+		plushe?.name = "Consolation plushie"
+		plushe?.desc = "It has \"You tried\" poorly written in its tag."
+		plushe?.squeak_override = list(skill_issue_sound = 1)
+		plushe?.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
 		qdel(src)
 		return