From a71db470d83fe6ac071bf11fcfecf4b11c83ad9f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 5 Feb 2021 23:06:05 +0100 Subject: [PATCH] [MIRROR] makes blast cannons not seem like an innocent item before a bomb is loaded (#3120) * makes blast cannons not seem like an innocent item before a bomb is loaded (#56645) * makes blast cannons not seem like an innocent item before a bomb is loaded Co-authored-by: Fikou --- code/modules/projectiles/guns/misc/blastcannon.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm index 29bf2475cdd..f5e8a7381e8 100644 --- a/code/modules/projectiles/guns/misc/blastcannon.dm +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -4,8 +4,8 @@ * It's basically an immovable rod launcher. */ /obj/item/gun/blastcannon - name = "pipe gun" - desc = "A pipe welded onto a gun stock, with a mechanical trigger. The pipe has an opening near the top, and there seems to be a spring loaded wheel in the hole. Small enough to stow in a bag." + name = "blast cannon" + desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave. Small enough to stow in a bag." icon_state = "empty_blastcannon" inhand_icon_state = "blastcannon_empty" w_class = WEIGHT_CLASS_NORMAL @@ -39,6 +39,11 @@ debug_power = 80 bombcheck = FALSE +/obj/item/gun/blastcannon/examine(mob/user) + . = ..() + if(bomb) + . += "A bomb is loaded inside." + /obj/item/gun/blastcannon/Initialize() . = ..() if(!pin) @@ -55,8 +60,6 @@ user.put_in_hands(bomb) user.visible_message("[user] detaches [bomb] from [src].") bomb = null - name = initial(name) - desc = initial(desc) update_icon() return ..() @@ -77,8 +80,6 @@ user.visible_message("[user] attaches [bomb_to_attach] to [src]!") bomb = bomb_to_attach - name = "blast cannon" - desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave." update_icon() return TRUE