From b4bf124264f3333a9d073a46f59fd98031e4be7f Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Thu, 13 Nov 2025 16:53:46 +0000 Subject: [PATCH] Moves Uplink stuff to One Folder, Makes Everyone Able to use Syndibunny Suits. (#4909) ## About The Pull Request Title. ## Why It's Good For The Game I think everyone should be able to wear a syndibunny suit, we don't get enough Ready Randies for nukies. So... ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: add: Syndibunny Suits have been unleashed. Blame Carota's Shinavists for their proliferation! code: Merged down and moved the Uplink files to one folder. /:cl: --- .../traitor/uplink/uplink_items/job.dm | 3 --- .../traitor/uplink/uplinkdatums.dm | 14 ------------- .../traitor => uplink}/one_shot_emag.dm | 0 .../modules/uplink/uplink_items/badass.dm | 6 ++++++ .../uplink/uplink_items/bundle.dm | 9 +++++++++ .../uplink/uplink_items/dangerous.dm | 0 .../uplink/uplink_items/device_tools.dm | 0 .../code/modules/uplink/uplink_items/job.dm | 6 +++++- .../uplink/uplink_items/stealth_items.dm | 0 .../uplink/uplink_items/syndicat/_syndicat.dm | 0 .../uplink_items/syndimaid/_syndimaid.dm | 0 .../uplink/uplink_items/syndimaid/clothes.dm | 0 .../uplink/uplink_items/uplinkitems.dm | 0 tgstation.dme | 20 +++++++++---------- 14 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/job.dm delete mode 100644 modular_zubbers/code/modules/antagonists/traitor/uplink/uplinkdatums.dm rename modular_zubbers/code/modules/{antagonists/traitor => uplink}/one_shot_emag.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/bundle.dm (54%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/dangerous.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/device_tools.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/stealth_items.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/syndicat/_syndicat.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/syndimaid/_syndimaid.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/syndimaid/clothes.dm (100%) rename modular_zubbers/code/modules/{antagonists/traitor => }/uplink/uplink_items/uplinkitems.dm (100%) diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/job.dm b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/job.dm deleted file mode 100644 index c7ae3bf4ae1..00000000000 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/job.dm +++ /dev/null @@ -1,3 +0,0 @@ -/datum/uplink_item/role_restricted/evil_seedling - desc = "A rare seed we have recovered that grows into a dangerous species that will aid you with your tasks! Note that this cannot be used with the Perennial Growth trait!" - cost = 2 diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplinkdatums.dm b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplinkdatums.dm deleted file mode 100644 index bd53dd0c928..00000000000 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplinkdatums.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/uplink_item/bundles_tc/bunny - name = "Syndicate Bunny Kit" - desc = "Straight from the dens of Carota. The Tactical Rabbit Ensemble. \ - Made for Tactical Rabbit Action, it's been adapted for use by the Syndicate, your welcome. \ - This kit contains one armor-lined rabbit costume, white combat gloves and one single carrot shiv. (Carrot shiv may be eaten in transit.)" - item = /obj/item/storage/box/syndibunny - cost = 8 - purchasable_from = UPLINK_NUKE_OPS - -/datum/uplink_item/badass/henchmen_traitor_outfits - name = "Henchmen Bundle" - desc = "A set of five armored henchmen outfits! Each set comes with a cap, coat, uniform, gloves, shoes, and a switchblade!" - item = /obj/item/storage/backpack/duffelbag/henchmen_traitor_outfits - cost = 4 diff --git a/modular_zubbers/code/modules/antagonists/traitor/one_shot_emag.dm b/modular_zubbers/code/modules/uplink/one_shot_emag.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/one_shot_emag.dm rename to modular_zubbers/code/modules/uplink/one_shot_emag.dm diff --git a/modular_zubbers/code/modules/uplink/uplink_items/badass.dm b/modular_zubbers/code/modules/uplink/uplink_items/badass.dm index ead70a4d61b..8662a8c60b5 100644 --- a/modular_zubbers/code/modules/uplink/uplink_items/badass.dm +++ b/modular_zubbers/code/modules/uplink/uplink_items/badass.dm @@ -10,3 +10,9 @@ desc = "For Nuclear Leaders wanting to reward their Crew. Or helping collaborators. Access not included." item = /obj/item/storage/lockbox/medal/bubber/synd cost = 1 + +/datum/uplink_item/badass/henchmen_traitor_outfits + name = "Henchmen Bundle" + desc = "A set of five armored henchmen outfits! Each set comes with a cap, coat, uniform, gloves, shoes, and a switchblade!" + item = /obj/item/storage/backpack/duffelbag/henchmen_traitor_outfits + cost = 4 diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm b/modular_zubbers/code/modules/uplink/uplink_items/bundle.dm similarity index 54% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm rename to modular_zubbers/code/modules/uplink/uplink_items/bundle.dm index dab7b6add28..436347ab12a 100644 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm +++ b/modular_zubbers/code/modules/uplink/uplink_items/bundle.dm @@ -6,3 +6,12 @@ Basic knowledge of communication systems not included. Requires power in area deployed." item = /obj/item/survivalcapsule/plap cost = 10 + +/datum/uplink_item/bundles_tc/bunny + name = "Syndicate Bunny Kit" + desc = "Straight from the dens of Carota. The Tactical Rabbit Ensemble. \ + Made for Tactical Rabbit Action, it's been adapted for use by the Syndicate, your welcome. \ + This kit contains one armor-lined rabbit costume, white combat gloves and one single carrot shiv. (Carrot shiv may be eaten in transit.)" + item = /obj/item/storage/box/syndibunny + cost = 8 + diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/dangerous.dm b/modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/dangerous.dm rename to modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm b/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm rename to modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm diff --git a/modular_zubbers/code/modules/uplink/uplink_items/job.dm b/modular_zubbers/code/modules/uplink/uplink_items/job.dm index ad3adc5e362..7c95042a4d4 100644 --- a/modular_zubbers/code/modules/uplink/uplink_items/job.dm +++ b/modular_zubbers/code/modules/uplink/uplink_items/job.dm @@ -1,4 +1,3 @@ - /datum/uplink_item/role_restricted/combat_clown_shoes name = "Combat Clown Shoes" desc = "Advanced clown shoes that protect the wearer and render them nearly immune to slipping on their own peels. They also squeak at 100% capacity." @@ -16,3 +15,8 @@ category = /datum/uplink_category/role_restricted restricted_roles = list(JOB_CLOWN) purchasable_from = UPLINK_TRAITORS + +/datum/uplink_item/role_restricted/evil_seedling + desc = "A rare seed we have recovered that grows into a dangerous species that will aid you with your tasks! Note that this cannot be used with the Perennial Growth trait!" + cost = 2 + diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/stealth_items.dm b/modular_zubbers/code/modules/uplink/uplink_items/stealth_items.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/stealth_items.dm rename to modular_zubbers/code/modules/uplink/uplink_items/stealth_items.dm diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndicat/_syndicat.dm b/modular_zubbers/code/modules/uplink/uplink_items/syndicat/_syndicat.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndicat/_syndicat.dm rename to modular_zubbers/code/modules/uplink/uplink_items/syndicat/_syndicat.dm diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/_syndimaid.dm b/modular_zubbers/code/modules/uplink/uplink_items/syndimaid/_syndimaid.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/_syndimaid.dm rename to modular_zubbers/code/modules/uplink/uplink_items/syndimaid/_syndimaid.dm diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm b/modular_zubbers/code/modules/uplink/uplink_items/syndimaid/clothes.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm rename to modular_zubbers/code/modules/uplink/uplink_items/syndimaid/clothes.dm diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/uplinkitems.dm b/modular_zubbers/code/modules/uplink/uplink_items/uplinkitems.dm similarity index 100% rename from modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/uplinkitems.dm rename to modular_zubbers/code/modules/uplink/uplink_items/uplinkitems.dm diff --git a/tgstation.dme b/tgstation.dme index a7598363fb3..23b743e76c0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9162,17 +9162,6 @@ #include "modular_zubbers\code\modules\antagonists\malf\remove_malf.dm" #include "modular_zubbers\code\modules\antagonists\nightmare\nightmare_species.dm" #include "modular_zubbers\code\modules\antagonists\nukeop\equipment\nuclear_authentication_disk.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\one_shot_emag.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplinkdatums.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\bundle.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\dangerous.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\device_tools.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\job.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\stealth_items.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\uplinkitems.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\syndicat\_syndicat.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\syndimaid\_syndimaid.dm" -#include "modular_zubbers\code\modules\antagonists\traitor\uplink\uplink_items\syndimaid\clothes.dm" #include "modular_zubbers\code\modules\antagonists\wizard\events_removal.dm" #include "modular_zubbers\code\modules\antagonists\wizard\events_rework.dm" #include "modular_zubbers\code\modules\antagonists\wizard\grand_finale_removal.dm" @@ -9779,9 +9768,18 @@ #include "modular_zubbers\code\modules\taur_mechanics\serpentine_taur.dm" #include "modular_zubbers\code\modules\tgui_input\color.dm" #include "modular_zubbers\code\modules\title_screen\code\title_screen_subsystem.dm" +#include "modular_zubbers\code\modules\uplink\one_shot_emag.dm" #include "modular_zubbers\code\modules\uplink\uplink_devices.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\badass.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\bundle.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\stealth_items.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\uplinkitems.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\syndicat\_syndicat.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\syndimaid\_syndimaid.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items\syndimaid\clothes.dm" #include "modular_zubbers\code\modules\vehicles\mech_fabricator.dm" #include "modular_zubbers\code\modules\vehicles\mecha\ripley.dm" #include "modular_zubbers\code\modules\vehicles\mecha\equipment\weapons.dm"