From 76d64ecc4bdcd86545c3008306e635e32279187e Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri, 23 Jul 2021 13:50:23 -0400
Subject: [PATCH] Apply the second third of suggestions
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
---
code/game/objects/items/theft_items.dm | 39 +++++++++++++-------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm
index 047573d607e..57074926ced 100644
--- a/code/game/objects/items/theft_items.dm
+++ b/code/game/objects/items/theft_items.dm
@@ -66,7 +66,7 @@
return TRUE
/obj/item/nuke_core_container/proc/seal()
- if(istype(core))
+ if(!QDELETED(core))
STOP_PROCESSING(SSobj, core)
icon_state = "core_container_sealed"
playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE)
@@ -74,15 +74,15 @@
to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.")
/obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user)
- if(istype(core))
- if(!user.drop_item())
- to_chat(user, "The [core] is stuck to your hand!")
- return
- else
- load(core, user)
- else
+ if(!istype(core))
return ..()
+ if(!user.drop_item())
+ to_chat(user, "[core] is stuck to your hand!")
+ return
+ else
+ load(core, user)
+
//snowflake screwdriver, works as a key to start nuke theft, traitor only
/obj/item/screwdriver/nuke
name = "screwdriver"
@@ -125,11 +125,9 @@
icon_state = "supermatter_sliver"
pulseicon = "supermatter_sliver_pulse"
-
/obj/item/nuke_core/supermatter_sliver/attack_tk(mob/user) // no TK dusting memes
return
-
/obj/item/nuke_core/supermatter_sliver/can_be_pulled(user) // no drag memes
return FALSE
@@ -137,7 +135,7 @@
if(istype(W, /obj/item/retractor/supermatter))
var/obj/item/retractor/supermatter/tongs = W
if(tongs.sliver)
- to_chat(user, "[tongs] is already holding a supermatter sliver!")
+ to_chat(user, "[tongs] are already holding a supermatter sliver!")
return FALSE
forceMove(tongs)
tongs.sliver = src
@@ -147,7 +145,7 @@
else if(istype(W, /obj/item/scalpel/supermatter) || istype(W, /obj/item/nuke_core_container/supermatter)) // we don't want it to dust
return
else
- to_chat(user, "As it touches [src], both [src] and [W] burst into dust!")
+ to_chat(user, "As it touches [src], both [src] and [W] burst into dust!")
radiation_pulse(user, 100)
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
qdel(W)
@@ -167,8 +165,8 @@
else
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)] via throw impact.")
investigate_log("has consumed [key_name(victim)] via throw impact.", "supermatter")
- victim.visible_message("As [victim] is hit by [src], both flash into dust and silence fills the room...",\
- "You're hit by [src] and everything suddenly goes silent.\n[src] flashes into dust, and soon as you can register this, you do as well.",\
+ victim.visible_message("As [victim] is hit by [src], both flash into dust and silence fills the room...",
+ "You're hit by [src] and everything suddenly goes silent.\n[src] flashes into dust, and soon as you can register this, you do as well.",
"Everything suddenly goes silent.")
victim.dust()
radiation_pulse(src, 500, 2)
@@ -179,8 +177,8 @@
..()
if(!isliving(user) || user.status_flags & GODMODE) //try to keep this in sync with supermatter's consume fail conditions
return FALSE
- user.visible_message("[user] reaches out and tries to pick up [src]. [user.p_their()] body starts to glow and bursts into flames before flashing into dust!",\
- "You reach for [src] with your hands. That was dumb.",\
+ user.visible_message("[user] reaches out and tries to pick up [src]. [user.p_their()] body starts to glow and bursts into flames before flashing into dust!",
+ "You reach for [src] with your hands. That was dumb.",
"Everything suddenly goes silent.")
radiation_pulse(user, 500, 2)
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
@@ -212,7 +210,7 @@
if(!QDELETED(sliver))
STOP_PROCESSING(SSobj, sliver)
icon_state = "supermatter_container_sealed"
- playsound(src, 'sound/items/Deconstruct.ogg', 60, TRUE)
+ playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE)
if(ismob(loc))
to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.")
@@ -284,10 +282,11 @@
else
investigate_log("has consumed [AM].", "supermatter")
qdel(AM)
- if (user)
+
+ if(user)
add_attack_logs(user, AM, "[AM] and [user] consumed by melee attack with [src] by [user]")
- user.visible_message("As [user] touches [AM] with [src], both flash into dust and silence fills the room...",\
- "You touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [sliver] flash into dust, and soon as you can register this, you do as well.",\
+ user.visible_message("As [user] touches [AM] with [src], both flash into dust and silence fills the room...",
+ "You touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [sliver] flash into dust, and soon as you can register this, you do as well.",
"Everything suddenly goes silent.")
user.dust()
radiation_pulse(src, 500, 2)