From ad189f92755fdc3acaa76cedeb6c47d117f57eab Mon Sep 17 00:00:00 2001 From: Bm0n <92271472+Bm0n@users.noreply.github.com> Date: Fri, 13 Jan 2023 16:29:52 -0500 Subject: [PATCH] Syndie tool tweaks (#20070) * aaahh ahhh wacky ass yah yah screwdriver * don't uppercase tool names! * can no longer interact with a syndienuke * review --- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- code/game/objects/items/tools/multitool.dm | 2 +- code/game/objects/items/weapons/storage/toolbox.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 0c6a9bd56bf..c2450e16375 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -196,7 +196,7 @@ GLOBAL_VAR(bomb_set) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - if(auth || (istype(I, /obj/item/screwdriver/nuke))) + if(auth || (istype(I, /obj/item/screwdriver/nuke) && !is_syndicate)) if(!panel_open) panel_open = TRUE to_chat(user, "You unscrew the control panel of [src].") diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index 41dd70dcfae..25638acd093 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -98,7 +98,7 @@ break /obj/item/multitool/red - name = "Suspicious Multitool" + name = "suspicious multitool" desc = "A sinister-looking multitool, used for pulsing wires to test which to cut." icon_state = "multitool_syndi" belt_icon = "multitool_syndi" diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b30b222c6e9..e4403fb6329 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -104,7 +104,7 @@ throwforce = 18 /obj/item/storage/toolbox/syndicate/populate_contents() - new /obj/item/screwdriver(src, "red") + new /obj/item/screwdriver/nuke(src) new /obj/item/wrench(src) new /obj/item/weldingtool/largetank(src) new /obj/item/crowbar/red(src)