From 6efe3990d17a8c864289f0a036b2983bafb7d744 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Tue, 1 Aug 2023 01:58:30 -0400 Subject: [PATCH] Remove the "Syndicate" prefix from some items (#451) * syndiaudit * Update code/game/objects/items/tools/crowbar.dm Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com> * Update code/game/objects/structures/bedsheet_bin.dm Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com> --------- Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com> --- code/game/machinery/syndicatebomb.dm | 2 +- code/game/objects/items/defib.dm | 3 +-- code/game/objects/items/grenades/syndieminibomb.dm | 4 ++-- code/game/objects/items/storage/holsters.dm | 2 +- code/game/objects/items/tools/crowbar.dm | 1 - code/game/objects/structures/bedsheet_bin.dm | 1 - code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/mod/mod_theme.dm | 2 +- code/modules/paperwork/stamps.dm | 2 +- code/modules/reagents/reagent_containers/bottle.dm | 3 --- code/modules/uplink/uplink_items/suits.dm | 4 ++-- 11 files changed, 10 insertions(+), 16 deletions(-) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index b3f2a3ecffc5..6c21706527ea 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -3,7 +3,7 @@ /obj/machinery/syndicatebomb icon = 'icons/obj/assemblies.dmi' - name = "syndicate bomb" + name = "bomb" icon_state = "syndicate-bomb" desc = "A large and menacing device. Can be bolted down with a wrench." diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 6fb0a5e516b4..c2edbcf405ab 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -691,7 +691,6 @@ . = ..() /obj/item/shockpaddles/syndicate - name = "syndicate defibrillator paddles" desc = "A pair of paddles used to revive deceased operatives. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively." combat = TRUE icon = 'icons/obj/defib.dmi' @@ -700,7 +699,7 @@ base_icon_state = "syndiepaddles" /obj/item/shockpaddles/syndicate/nanotrasen - name = "elite nanotrasen defibrillator paddles" + name = "advanced defibrillator paddles" desc = "A pair of paddles used to revive deceased ERT members. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively." icon_state = "ntpaddles0" inhand_icon_state = "ntpaddles0" diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm index 54351a78e703..f76256cf2f55 100644 --- a/code/game/objects/items/grenades/syndieminibomb.dm +++ b/code/game/objects/items/grenades/syndieminibomb.dm @@ -1,6 +1,6 @@ /obj/item/grenade/syndieminibomb + name = "grenade" desc = "A syndicate manufactured explosive used to sow destruction and chaos." - name = "syndicate minibomb" icon = 'icons/obj/grenade.dmi' icon_state = "syndicate" inhand_icon_state = "flashbang" @@ -19,7 +19,7 @@ qdel(src) /obj/item/grenade/syndieminibomb/concussion - name = "HE Grenade" + name = "HE grenade" desc = "A compact shrapnel grenade meant to devastate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction." icon_state = "concussion" ex_heavy = 2 diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 650a32801db6..2e96a06ec6ef 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -99,7 +99,7 @@ ),src) /obj/item/storage/belt/holster/chameleon - name = "syndicate holster" + name = "chameleon holster" desc = "A hip holster that uses chameleon technology to disguise itself, due to the added chameleon tech, it cannot be mounted onto armor." icon_state = "syndicate_holster" inhand_icon_state = "syndicate_holster" diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 666cd21854c1..754622b873e5 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -120,7 +120,6 @@ return COMPONENT_NO_DEFAULT_MESSAGE /obj/item/crowbar/power/syndicate - name = "Syndicate jaws of life" desc = "A re-engineered copy of Daedalus' standard jaws of life. Can be used to force open airlocks in its crowbar configuration." icon_state = "jaws_syndie" toolspeed = 0.5 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 2df1e718d8c2..8861a47f9940 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -222,7 +222,6 @@ LINEN BINS dream_messages = list("a unique ID", "authority", "artillery", "an ending") /obj/item/bedsheet/syndie - name = "syndicate bedsheet" desc = "It has a syndicate emblem and it has an aura of evil." icon_state = "sheetsyndie" inhand_icon_state = "sheetsyndie" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 231a30f28f54..a123a222e124 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -152,7 +152,7 @@ flags_cover = MASKCOVERSEYES /obj/item/clothing/mask/gas/syndicate - name = "syndicate mask" + name = "red gasmask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "syndicate" resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index e4a038e4ce05..47b4c179a4cc 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -798,7 +798,7 @@ ) /datum/mod_theme/syndicate - name = "syndicate" + name = "crimson" desc = "A suit designed by Gorlex Marauders, offering armor ruled illegal in most of Spinward Stellar." extended_desc = "An advanced combat suit adorned in a sinister crimson red color scheme, produced and manufactured \ for special mercenary operations. The build is a streamlined layering consisting of shaped Plasteel, \ diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 12812a013c12..837eb0e72424 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -83,7 +83,7 @@ dye_color = DYE_CENTCOM /obj/item/stamp/syndicate - name = "Syndicate rubber stamp" + name = "red rubber stamp" icon_state = "stamp-syndicate" dye_color = DYE_SYNDICATE diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 0cca5b225f59..7dfbf6536e9d 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -117,9 +117,6 @@ list_reagents = list(/datum/reagent/consumable/frostoil = 30) /obj/item/reagent_containers/glass/bottle/traitor - name = "syndicate bottle" - desc = "A small bottle. Contains a random nasty chemical." - icon = 'icons/obj/chemical.dmi' var/extra_reagent = null /obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload) diff --git a/code/modules/uplink/uplink_items/suits.dm b/code/modules/uplink/uplink_items/suits.dm index 6290da8b5e23..a0e6bc6d72a1 100644 --- a/code/modules/uplink/uplink_items/suits.dm +++ b/code/modules/uplink/uplink_items/suits.dm @@ -19,7 +19,7 @@ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) /datum/uplink_item/suits/space_suit - name = "Syndicate Space Suit" + name = "Crimson Space Suit" desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \ fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \ sightings, however." @@ -29,7 +29,7 @@ // Low progression cost /datum/uplink_item/suits/modsuit - name = "Syndicate MODsuit" + name = "Crimson MODsuit" desc = "The feared MODsuit of a Syndicate agent. Features armoring and a set of inbuilt modules." item = /obj/item/mod/control/pre_equipped/traitor cost = 8