From 8a5b815813aadee56bc9a5f36acbbd8a192a51d0 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:28:36 -0500
Subject: [PATCH] Fixes being able to put the core in when closed, makes the
metal drop
---
code/game/gamemodes/nuclear/nuclearbomb.dm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 036124fb10f..ce2a834ecc6 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -84,9 +84,9 @@ GLOBAL_VAR(bomb_set)
if(istype(O, /obj/item/stack/sheet/mineral/titanium) && removal_stage == NUKE_CORE_FULLY_EXPOSED)
if(do_after(user, 20, target = src))
var/obj/item/stack/S = O
- if(!loc || !S || S.get_amount() < 10)
+ if(!loc || !S || S.get_amount() < 5)
return
- S.use(10)
+ S.use(5)
user.visible_message("[user] repairs [src]'s inner core plate.", "You repair [src]'s inner core plate. The radiation is contained.")
removal_stage = NUKE_CORE_PANEL_UNWELDED
if(core)
@@ -97,11 +97,11 @@ GLOBAL_VAR(bomb_set)
if(do_after(user, 20, target = src))
if(!loc || !S || S.get_amount() < 5)
return
- S.use(10)
+ S.use(5)
user.visible_message("[user] repairs [src]'s outer core plate.", "You repair [src]'s outer core plate.")
removal_stage = NUKE_CORE_EVERYTHING_FINE
return
- if(istype(O, /obj/item/nuke_core/plutonium))
+ if(istype(O, /obj/item/nuke_core/plutonium) && removal_stage == NUKE_CORE_FULLY_EXPOSED)
if(do_after(user, 20, target = src))
if(!user.unEquip(O))
to_chat(user, "The [O] is stuck to your hand!")
@@ -129,7 +129,8 @@ GLOBAL_VAR(bomb_set)
user.visible_message("[user] starts removing [src]'s outer core plate...", "You start removing [src]'s outer plate...")
if(!I.use_tool(src, user, 40, volume = I.tool_volume) || removal_stage != NUKE_CORE_EVERYTHING_FINE)
return
- user.visible_message("[user] finishes removing [src]'s outer core plate.", "You finish removing [src]'s inner core plate.")
+ user.visible_message("[user] finishes removing [src]'s outer core plate.", "You finish removing [src]'s outer core plate.")
+ new /obj/item/stack/sheet/metal(loc, 5)
removal_stage = NUKE_CORE_PANEL_EXPOSED
if(removal_stage == NUKE_CORE_PANEL_UNWELDED)
user.visible_message("[user] starts removing [src]'s inner core plate...", "You start removing [src]'s inner plate...")
@@ -137,6 +138,7 @@ GLOBAL_VAR(bomb_set)
return
user.visible_message("[user] finishes removing [src]'s inner core plate.", "You remove [src]'s inner core plate. You can see the core's green glow!")
removal_stage = NUKE_CORE_FULLY_EXPOSED
+ new /obj/item/stack/sheet/mineral/titanium(loc, 5)
if(core)
START_PROCESSING(SSobj, core)
if(removal_stage == NUKE_UNWRENCHED)