Skip to content

Commit

Permalink
Syndicate tools and soap are no longer better. (#3556)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## 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.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored Oct 15, 2024
1 parent aa4adcc commit 231185e
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 33 deletions.
3 changes: 2 additions & 1 deletion code/game/objects/items/clown_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/items/devices/multitool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
10 changes: 4 additions & 6 deletions code/game/objects/items/storage/toolbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/theft_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/items/tools/crowbar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/items/tools/wirecutters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/items/tools/wrench.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 0 additions & 11 deletions code/modules/cargo/blackmarket/blackmarket_items/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 231185e

Please sign in to comment.