From 231185e763a5819049880ebb5ddcfbe74ed681f4 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:43:12 +0200 Subject: [PATCH] Syndicate tools and soap are no longer better. (#3556) ## About The Pull Request - syndicate soap clean speed swapped from 5 to 27 (1 better than NT soap, because I find that funny). Also it's uses are tripled. - "suspicious toolbox" renamed to "black and red toolbox", lost it's damage buff. - syndicate tools have lost the "suspicious" names, their descriptions, and their toolspeed buff. ## Why It's Good For The Game Cruft. Syndi items were better on stations because of rarity. On shiptest, it feels kinda weird to map those in knowing they are just upgrades. Soap is especially awkward in that regard. ## Changelog :cl: tweak: Syndicate soap is now in-line with NT soap. del: Syndicate tools are no longer faster. They are just reskinned normal tools now. del: Syndicate toolbox lost it's damage buff. /:cl: --- code/game/objects/items/clown_items.dm | 3 ++- code/game/objects/items/devices/multitool.dm | 2 -- code/game/objects/items/storage/toolbox.dm | 10 ++++------ code/game/objects/items/theft_tools.dm | 4 ---- code/game/objects/items/tools/crowbar.dm | 3 --- code/game/objects/items/tools/wirecutters.dm | 3 --- code/game/objects/items/tools/wrench.dm | 3 --- .../cargo/blackmarket/blackmarket_items/tools.dm | 11 ----------- 8 files changed, 6 insertions(+), 33 deletions(-) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 631eb7d2fc8f..62c33aa9665a 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -71,7 +71,8 @@ /obj/item/soap/syndie desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster." icon_state = "soapsyndie" - cleanspeed = 5 //faster than mop so it is useful for traitors who want to clean crime scenes + cleanspeed = 27 // ever so slightly better than NT + uses = 300 /obj/item/soap/omega name = "omega soap" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 204371ca0e51..50b8e3958043 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -170,10 +170,8 @@ toolspeed = 0.5 /obj/item/multitool/syndie - name = "suspicious-looking multitool" desc = "A darkened multitool with a matte finish and an ominous glowing screen." icon_state = "multitool_syndie" - toolspeed = 0.5 /obj/item/multitool/old desc = "Used for pulsing wires to test which to cut. This one looks... 'retro'. It wasn't recommended by doctors then and won't be recommended by doctors now." diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 0ee29e08e052..6a47c8544bb9 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -158,11 +158,9 @@ new /obj/item/stack/cable_coil(src,MAXCOIL,pickedcolor) /obj/item/storage/toolbox/syndicate - name = "suspicious looking toolbox" + name = "black and red toolbox" icon_state = "syndicate" item_state = "toolbox_syndi" - force = 15 - throwforce = 18 material_flags = NONE /obj/item/storage/toolbox/syndicate/ComponentInitialize() @@ -172,11 +170,11 @@ /obj/item/storage/toolbox/syndicate/PopulateContents() new /obj/item/screwdriver/nuke(src) - new /obj/item/wrench/syndie(src) //WS Edit - Cool Syndie Tools + new /obj/item/wrench/syndie(src) new /obj/item/weldingtool/largetank(src) - new /obj/item/crowbar/syndie(src) //WS Begin - Cool Syndie Tools + new /obj/item/crowbar/syndie(src) new /obj/item/wirecutters/syndie(src) - new /obj/item/multitool/syndie(src) //WS End + new /obj/item/multitool/syndie(src) new /obj/item/clothing/gloves/color/yellow(src) /obj/item/storage/toolbox/syndicate/empty diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index fd9b3859cd3b..5b9da6611bd9 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -80,12 +80,8 @@ //snowflake screwdriver, works as a key to start nuke theft, traitor only /obj/item/screwdriver/nuke - name = "screwdriver" - desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed." -// icon = 'icons/obj/nuke_tools.dmi' WS edit - better tool sprites icon_state = "screwdriver_nuke" item_state = "screwdriver_nuke" - toolspeed = 0.5 random_color = FALSE /obj/item/paper/guides/antag/nuke_instructions diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 26509776dd16..c53fb57a8bd3 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -117,10 +117,7 @@ toolspeed = 0.5 /obj/item/crowbar/syndie - name = "suspicious-looking crowbar" - desc = "It has special counterweights that adjust to the amount of pressure put on it by using a complex array of springs and screws." icon_state = "crowbar_syndie" - toolspeed = 0.5 force = 8 /obj/item/crowbar/old diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index e2dfc9a81dc3..383cbd027395 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -85,10 +85,7 @@ random_color = FALSE /obj/item/wirecutters/syndie - name = "suspicious-looking wirecutters" - desc = "The blades of these wirecutters have suspiciously fine serrated teeth." icon_state = "cutters_syndie" - toolspeed = 0.5 random_color = FALSE /obj/item/wirecutters/old diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 3e9898d87508..b6b99c7c8282 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -95,10 +95,7 @@ return ..() /obj/item/wrench/syndie - name = "suspicious-looking wrench" - desc = "It's one of those fancy wrenches that you turn backward without twisting the bolt for faster action." icon_state = "wrench_syndie" - toolspeed = 0.5 /obj/item/wrench/crescent name = "crescent wrench" diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm index 412ba303b977..f361f4e758ff 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm @@ -11,17 +11,6 @@ stock = 1 availability_prob = 20 -/datum/blackmarket_item/tool/syndi_toolbox - name = "Syndicate Toolbox" - desc = "A set of specialized tools, built to precision perfection and certified by the GEC." - item = /obj/item/storage/toolbox/syndicate - - price_min = 500 - price_max = 2000 - stock_min = 1 - stock_max = 3 - availability_prob = 40 - /datum/blackmarket_item/tool/surgery_duffel name = "Cybersun Advanced Surgical Kit" desc = "You might say it's morally wrong to steal. I say it's justified when it's Cybersun."