From 4b3a720d96823ca5c3766e846c0535b9b4364b42 Mon Sep 17 00:00:00 2001
From: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:33:25 -0300
Subject: [PATCH] Removes boxes from the uplink PART 1 (#23189)
* removes boxes part 1
* shorter desc for nano injector
* yeahsure1
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* yeahsure2
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* yeahsure3
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* ok no more kit
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
---
_maps/map_files/generic/centcomm.dmm | 2 +-
code/datums/uplink_items/uplink_general.dm | 6 +--
code/datums/uplink_items/uplink_traitor.dm | 6 +--
.../effects/spawners/random_spawners.dm | 6 +--
code/game/objects/items/weapons/dice.dm | 4 +-
.../items/weapons/storage/uplink_kits.dm | 44 +++----------------
code/modules/mod/mod_types.dm | 10 +++++
.../reagents/reagent_containers/hypospray.dm | 2 +-
8 files changed, 28 insertions(+), 52 deletions(-)
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index e73b4f24693..c84704cc8b0 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -5978,7 +5978,7 @@
/obj/item/gun/syringe/syndicate,
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/adv,
-/obj/item/storage/box/syndie_kit/bonerepair,
+/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"up" = (
diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm
index 48d8cece58a..9da4ac87005 100644
--- a/code/datums/uplink_items/uplink_general.dm
+++ b/code/datums/uplink_items/uplink_general.dm
@@ -579,10 +579,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 10
/datum/uplink_item/device_tools/bonerepair
- name = "Prototype Nanite Autoinjector Kit"
- desc = "Stolen prototype full body repair nanites. Contains one prototype nanite autoinjector and guide."
+ name = "Prototype Nanite Autoinjector"
+ desc = "Stolen prototype full body repair nanites. On injection it will shut down body systems as it revitilizes limbs and organs."
reference = "NCAI"
- item = /obj/item/storage/box/syndie_kit/bonerepair
+ item = /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium
cost = 10
/datum/uplink_item/device_tools/syndicate_teleporter
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index ba668a0ce64..da108abc6c5 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -477,10 +477,10 @@
desc = "The feared MODsuit of a syndicate nuclear agent. Features armor and a eva mode \
for faster movement on station. Toggling the suit in and out of \
combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
- Comes packaged with internals. \
+ Comes containing internals. \
Nanotrasen crew who spot these suits are known to panic."
reference = "BRHS"
- item = /obj/item/storage/box/syndie_kit/modsuit
+ item = /obj/item/mod/control/pre_equipped/traitor
cost = 30
surplus = 60 //I have upped the chance of modsuits from 40, as I do feel they are much more worthwhile with the base modsuit no longer being 8 tc, and the high armor values of the elite.
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
@@ -490,7 +490,7 @@
desc = "An advanced MODsuit with superior armor to the standard Syndicate MODsuit. \
Nanotrasen crew who spot these suits are known to *really* panic."
reference = "MSE"
- item = /obj/item/storage/box/syndie_kit/modsuit/elite
+ item = /obj/item/mod/control/pre_equipped/traitor_elite
cost = 45 //45 to start, no holopara / ebow.
surplus = 60
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index e109701cc94..850e12c3ef5 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -275,7 +275,7 @@
// Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
result = list(/datum/nothing = 27,
/obj/item/storage/box/syndie_kit/space = 1,
- /obj/item/storage/box/syndie_kit/modsuit = 1,
+ /obj/item/mod/control/pre_equipped/traitor = 1,
/obj/item/clothing/shoes/magboots/syndie = 1,
/obj/item/clothing/suit/armor/vest/combat = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
@@ -309,7 +309,7 @@
result = list(/datum/nothing = 25,
/obj/item/jammer = 1,
/obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/box/syndie_kit/bonerepair = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/stock_parts/cell/bluespace = 1,
/obj/item/card/emag = 1,
@@ -353,7 +353,7 @@
/obj/item/chameleon = 1,
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
/obj/item/grenade/plastic/c4/x4 = 1,
- /obj/item/storage/box/syndie_kit/modsuit/elite = 1)// Adding this as it is something an explorer can use to explore space better, that isn't a high powered murder weapon.
+ /obj/item/mod/control/pre_equipped/traitor_elite = 1)// Adding this as it is something an explorer can use to explore space better, that isn't a high powered murder weapon.
// Layout-affecting spawns
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 043a11d59f9..8ee1908cd78 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -250,7 +250,7 @@
/obj/item/chameleon_counterfeiter,
/obj/item/clothing/shoes/chameleon/noslip,
/obj/item/pinpointer/advpinpointer,
- /obj/item/storage/box/syndie_kit/bonerepair,
+ /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
/obj/item/storage/backpack/duffel/syndie/med/surgery,
/obj/item/storage/toolbox/syndicate,
/obj/item/storage/backpack/clown/syndie,
@@ -260,7 +260,7 @@
/obj/item/clothing/glasses/chameleon/thermal,
/obj/item/borg/upgrade/modkit/indoors,
/obj/item/storage/box/syndie_kit/chameleon,
- /obj/item/storage/box/syndie_kit/modsuit,
+ /obj/item/mod/control/pre_equipped/traitor,
/obj/item/implanter/storage,
/obj/item/toy/syndicateballoon)
var/selected_item = pick(traitor_items)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 6562a14ea26..4b81c4ad818 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -132,14 +132,14 @@
/obj/item/gun/projectile/automatic/pistol, // 4TC
/obj/item/ammo_box/magazine/m10mm/fire, // 2TC
/obj/item/ammo_box/magazine/m10mm/fire, // 2TC
- /obj/item/storage/box/syndie_kit/modsuit, // 6TC
+ /obj/item/mod/control/pre_equipped/traitor, // 6TC
/obj/item/clothing/gloves/combat, // 0TC
/obj/item/card/id/syndicate, // 2TC
/obj/item/clothing/shoes/chameleon/noslip, // 2TC
/obj/item/encryptionkey/syndicate) // 2TC
var/static/list/metroid = list( // 21 + modules + laser gun
- /obj/item/storage/box/syndie_kit/modsuit/elite, // 9TC
+ /obj/item/mod/control/pre_equipped/traitor_elite, // 9TC
/obj/item/mod/module/visor/thermal, // 3 TC
/obj/item/mod/module/stealth, //0 TC but strong
/obj/item/mod/module/power_kick, //0 TC but funny
@@ -169,24 +169,6 @@
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
-/obj/item/storage/box/syndie_kit/modsuit
- name = "Boxed Blood Red MODsuit"
- can_hold = list(/obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate)
- max_w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/storage/box/syndie_kit/modsuit/populate_contents()
- new /obj/item/mod/control/pre_equipped/traitor(src)
- new /obj/item/clothing/mask/gas/syndicate(src)
- new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
-
-/obj/item/storage/box/syndie_kit/modsuit/elite //I have been informed this is a good idea.
- name = "Boxed Elite MODsuit"
-
-/obj/item/storage/box/syndie_kit/modsuit/elite/populate_contents()
- new /obj/item/mod/control/pre_equipped/traitor_elite(src)
- new /obj/item/clothing/mask/gas/syndicate(src)
- new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
-
/obj/item/storage/box/syndie_kit/conversion
name = "box (CK)"
@@ -282,6 +264,9 @@
new /obj/item/spellbook/oneuse/mime/greaterwall(src)
new /obj/item/spellbook/oneuse/mime/fingergun(src)
+/obj/item/storage/box/syndie_kit/combat_baking
+ name = "combat bakery kit"
+
/obj/item/storage/box/syndie_kit/combat_baking/populate_contents()
new /obj/item/reagent_containers/food/snacks/baguette/combat(src)
for(var/i in 1 to 2)
@@ -325,25 +310,6 @@
new/obj/item/cardboard_cutout/adaptive(src)
new/obj/item/toy/crayon/spraycan(src)
-/obj/item/storage/box/syndie_kit/bonerepair
- name = "emergency nanite kit"
- desc = "A box containing one prototype nanite repair system."
-
-/obj/item/storage/box/syndie_kit/bonerepair/populate_contents()
- new /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium(src)
- var/obj/item/paper/P = new /obj/item/paper(src)
- P.name = "Prototype nanite repair guide"
- P.desc = "For when you want to safely get off Mr Bones' Wild Ride."
- P.info = {"
-Prototype Emergency Repair Nanites
-
-Usage:
-
-This is a highly experimental prototype chemical designed to repair damaged bones, organs, and treat interenal bleeding of soldiers in the field, use only as a last resort. The autoinjector contains prototype nanites bearing a classifed payload. The nanites will simultaneously shut down body systems whilst aiding in repair.
Warning: Side effects can cause temporary paralysis, loss of co-ordination and sickness. Do not use with any kind of stimulant or drugs. Serious damage can occur!
-
-To apply, hold the injector a short distance away from the outer thigh before applying firmly to the skin surface. The process of repairing should begin after a short time, during which you are advised to remain still.
After use you are advised to see a doctor at the next available opportunity. Mild scarring and tissue damage may occur after use. This is a prototype. We are not liable for any bone spurs, cancers, extra limbs, or creation of new viruses from use of the product.
- "}
-
/obj/item/storage/box/syndie_kit/safecracking
name = "Safe-cracking Kit"
desc = "Everything you need to quietly open a mechanical combination safe."
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index bf9c6d79a42..58f8d241bf0 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -226,6 +226,11 @@
/obj/item/mod/module/jetpack,
)
+/obj/item/mod/control/pre_equipped/traitor/Initialize(mapload)
+ . = ..()
+ new /obj/item/clothing/mask/gas/syndicate(bag)
+ new /obj/item/tank/internals/emergency_oxygen/engi/syndi(bag)
+
/obj/item/mod/control/pre_equipped/traitor_elite
theme = /datum/mod_theme/elite
applied_cell = /obj/item/stock_parts/cell/bluespace
@@ -242,6 +247,11 @@
/obj/item/mod/module/jetpack/advanced,
)
+/obj/item/mod/control/pre_equipped/traitor_elite/Initialize(mapload)
+ . = ..()
+ new /obj/item/clothing/mask/gas/syndicate(bag)
+ new /obj/item/tank/internals/emergency_oxygen/engi/syndi(bag)
+
/obj/item/mod/control/pre_equipped/nuclear
theme = /datum/mod_theme/syndicate
applied_cell = /obj/item/stock_parts/cell/hyper
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index e45e71c20a6..72996bda5f3 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -202,7 +202,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium
name = "protoype nanite autoinjector"
- desc = "After a short period of time the nanites will slow the body's systems and assist with body repair. Nanomachines son."
+ desc = "A highly experimental prototype chemical designed to fully mend limbs and organs of soldiers in the field, shuts down body systems whilst aiding in repair.
WARNING: Side effects can cause temporary paralysis, loss of co-ordination and sickness. Do not use with any kind of stimulant or drugs. Serious damage can occur!"
icon_state = "bonepen"
amount_per_transfer_from_this = 30
volume = 30