mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself * more shit * progress continues, moral stays sameish * bite of 2587 * mod_theme down, but probably broken * 385 errors, 16 warnings, zero tgui interactions * 292 19 * final strech to buggy mess, break time * it compiles. It almost fucking certainly doesnt work, but it compiles * fudhsciffubgsbgpgb actions not working as should for modules * fuck it we'll just open the pr as we work on it * icons work now * tgui stuff * more progress * JUDGEMENT * IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother. * jetpacks, gps, and go do what exo-suits yourself * almost ready * sorry to whoever has to review this * should work™️ * should be good now * pushing changes so I can do reviews next * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * lore™️ Adds illegals level to modsuit parts from syndicate. * early returns * and these illegals * no uplink reference idiot * mod inhands are a good idea * this is needed for inhands nerd * Bomb detector working, modsutis cover ears. skin things * overslotting removal, cyborg charging, ert loadout for gamma * duplicated signal * modsuit themes, removes broken mister / bad base type module, 2 cores in robotics. * tether module, orb module, holster stuff * built in no slip, cheaper 87 * removes modules already installed, engineer ert get jetpack, equip into modsuit storage * comments spaces and duplicate flags * Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor * Apply suggestions from code review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Compile TGUI, slowdown adjustment, Modsuit to MODsuit * sonar, do after, more equipment, acid handling * overlay bugs / ERT / DS suits autodeploy * middle click action buttons * traders, sec modsuit energy nerf * surplus weighting * Kinesis module. * Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis * more power / unused module removed * name, ds fix, pre equipped to cc suit * depot / grammer * ok should be good™️ * overslot, dupe gun, missing suit storage * stealth nerf, new kit * gun stuff / ds theme * bio armor is gone * let me push changes please thank you * makes shocks work right * copies over some changes TG made to module prices after porting * Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it- * sirryans changes Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/modules/telesci/gps.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/modules/telesci/gps.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Control define, ERT / DS have gloves / boots again. * Apply suggestions from code review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * More changes * god I hate tgui. Why do all the bundles live underground, instead of in my basement? * she updates my master till I testmerge * modsuits can recharge again * fixes a lot of shit * Ready for TM probably * sure fuck it whatever that makes sense I guess * the pinpointer works better™️ * Another storage module bug fix * hair and medical stuff * fuck fuck fuck * fixes sonar * Bag exploit fixes / plasma runtimes / ear nerf * dna lock improvement / cryostorage * whoops * Ball form second cooldown wasn't helping, no more infinite cores * she springs my lock till I ***SNAP*** * plasmaman no longer die * fixes modsuit emp issues * atmos no longer fucking dies * Fixes, module printing, and a restriction on newly constructed modsuits * Inventory code my hated * WOOO PREFERENCE CODE WOOOOO * icons my hated * fix for mods / spaceproof shit * holy shit whhhyyyyy * backpack first * Update mod_theme.dm * prevent infinite gun arms / infinite modsuit cores / syndicate modules * fixes tm error * scream loudly if species sprites break. They shouldn't, but, you know. * deconflicted with luck * converts to refit for species * fix pathfinder * fixes modsuits being funky power wise * lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit * nerfs the atmos modsuit * magboots for ds / CC modsuit * downside of autosave: typing in wrong window saves bad stuff * Gamma ERT have internal cameras again. * spellcheck when * ah fuck * yes delete the null that works * whoops * fixes error / description * un vulps your cannon * fixes tails disapeering on base modsuits * space to underscore * tgui fix / tajaran * springlock buff, cryopod fix * u helps * WHO PUTS A GUN IN ITEMS * tgui moment * mining modsuit nerf / hidden holster module * PAIN * UNATHI TIDE STATION WIDE * I love special code * slightly dense * shark jumpscare * fixes ghost item, fixes springlock being bad * YIPPEEEE IT WORKED * she decons my flict * pain * ebbas days are numbered :^) * hidden * r-r-r-ebuild * fixes more bugs * qwerty, you are dense * fixes gps * fix mulebot crate * level fix * adds back icon * moving storage, fix bug, modules activate / deactivate message * yeah * yeah * yeah™️ * steels requests * windoors no longer make pathfinder module explode * chat spam * oil slicks + modsuits * whoops * bag check * ofc * Update code/modules/mod/mod_control.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/uplink_items/uplink_nuclear.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mod/mod_control.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mod/modules/module_pathfinder.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
Ryan
S34N
SteelSlayer
parent
9108007709
commit
76a845d380
@@ -581,8 +581,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
||||
|
||||
//Space Suits and Hardsuits
|
||||
/datum/uplink_item/suits
|
||||
category = "Space Suits and Hardsuits"
|
||||
surplus = 40
|
||||
category = "Space Suits and MODsuits"
|
||||
surplus = 10 //I am setting this to 10 as there are a bunch of modsuit parts in here that should be weighted to 10. Suits and modsuits adjusted below.
|
||||
|
||||
/datum/uplink_item/suits/space_suit
|
||||
name = "Syndicate Space Suit"
|
||||
@@ -593,7 +593,59 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
||||
item = /obj/item/storage/box/syndie_kit/space
|
||||
cost = 4
|
||||
|
||||
/datum/uplink_item/suits/thermal
|
||||
name = "MODsuit Thermal Visor Module"
|
||||
desc = "A visor for a MODsuit. Lets you see living beings through walls. Also provides night vision."
|
||||
reference = "MSTV"
|
||||
item = /obj/item/mod/module/visor/thermal
|
||||
cost = 3 // Don't forget, you need to get a modsuit to go with this
|
||||
surplus = 10 //You don't need more than
|
||||
|
||||
/datum/uplink_item/suits/night
|
||||
name = "MODsuit Night Visor Module"
|
||||
desc = "A visor for a MODsuit. Lets you see clearer in the dark."
|
||||
reference = "MSNV"
|
||||
item = /obj/item/mod/module/visor/night
|
||||
cost = 1 // It's night vision, rnd pumps out those goggles for anyone man.
|
||||
surplus = 10 //You don't need more than one
|
||||
|
||||
/datum/uplink_item/suits/plate_compression
|
||||
name = "MODsuit Plate Compression Module"
|
||||
desc = "A MODsuit module that lets the suit compress into a smaller size. Not compatible with storage modules, \
|
||||
you will have to take that module out first."
|
||||
reference = "MSPC"
|
||||
item = /obj/item/mod/module/plate_compression
|
||||
cost = 2
|
||||
|
||||
/datum/uplink_item/suits/noslip
|
||||
name = "MODsuit Anti-Slip Module"
|
||||
desc = "A MODsuit module preventing the user from slipping on water. Already installed in the uplink modsuits."
|
||||
reference = "MSNS"
|
||||
item = /obj/item/mod/module/noslip
|
||||
cost = 1
|
||||
|
||||
/datum/uplink_item/suits/springlock_module
|
||||
name = "Heavily Modified Springlock MODsuit Module"
|
||||
desc = "A module that spans the entire size of the MOD unit, sitting under the outer shell. \
|
||||
This mechanical exoskeleton pushes out of the way when the user enters and it helps in booting \
|
||||
up, but was taken out of modern suits because of the springlock's tendency to \"snap\" back \
|
||||
into place when exposed to humidity. You know what it's like to have an entire exoskeleton enter you? \
|
||||
This version of the module has been modified to allow for near instant activation of the MODsuit. \
|
||||
Useful for quickly getting your MODsuit on/off, or for taking care of a target via a tragic accident. \
|
||||
It is hidden as a DNA lock module. It will block retraction for 10 seconds by default to allow you to follow \
|
||||
up with smoke, but you can multitool the module to disable that."
|
||||
reference = "FNAF"
|
||||
item = /obj/item/mod/module/springlock/bite_of_87
|
||||
cost = 1
|
||||
surplus = 10
|
||||
|
||||
/datum/uplink_item/suits/hidden_holster
|
||||
name = "Hidden Holster Module"
|
||||
desc = "A holster module disguised to look like a tether module. Requires a modsuit to put it in of course. Gun not included."
|
||||
reference = "HHM"
|
||||
item = /obj/item/mod/module/holster/hidden
|
||||
cost = 1
|
||||
surplus = 10
|
||||
|
||||
/datum/uplink_item/device_tools/binary
|
||||
name = "Binary Translator Key"
|
||||
|
||||
@@ -64,10 +64,10 @@
|
||||
surplus = 40
|
||||
|
||||
/datum/uplink_item/dangerous/combat_defib
|
||||
name = "Combat defibrillator"
|
||||
desc = "A lifesaving device turned dangerous weapon. Click on someone with the paddles on harm intent to instantly stop their heart. Can be used as a regular defib as well."
|
||||
name = "Combat Defibrillator Module"
|
||||
desc = "A lifesaving device turned dangerous weapon. Click on someone with the paddles on harm intent to instantly stop their heart. Can be used as a regular defib as well. Installs in a modsuit."
|
||||
reference = "CD"
|
||||
item = /obj/item/defibrillator/compact/combat/loaded
|
||||
item = /obj/item/mod/module/defibrillator/combat
|
||||
cost = 12
|
||||
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
|
||||
@@ -498,9 +498,9 @@
|
||||
// SPACE SUITS
|
||||
|
||||
/datum/uplink_item/suits/hardsuit/elite
|
||||
name = "Elite Syndicate Hardsuit"
|
||||
desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit."
|
||||
item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
|
||||
name = "Elite Syndicate MODsuit"
|
||||
desc = "An advanced MODsuit with superior armor and mobility to the standard Syndicate MODsuit."
|
||||
item = /obj/item/mod/control/pre_equipped/elite
|
||||
cost = 8
|
||||
reference = "ESHS"
|
||||
excludefrom = list()
|
||||
|
||||
@@ -439,16 +439,27 @@
|
||||
cost = 1
|
||||
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
|
||||
/datum/uplink_item/suits/hardsuit // Nukies get elite/shielded hardsuit instead
|
||||
name = "Syndicate Hardsuit"
|
||||
desc = "The feared suit of a syndicate nuclear agent. Features armor and a combat mode \
|
||||
/datum/uplink_item/suits/modsuit
|
||||
name = "Syndicate MODsuit"
|
||||
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. \
|
||||
Additionally the suit is collapsible, making it small enough to fit within a backpack. Comes packaged with internals. \
|
||||
Comes packaged with internals. \
|
||||
Nanotrasen crew who spot these suits are known to panic."
|
||||
reference = "BRHS"
|
||||
item = /obj/item/storage/box/syndie_kit/hardsuit
|
||||
item = /obj/item/storage/box/syndie_kit/modsuit
|
||||
cost = 6
|
||||
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)
|
||||
|
||||
/datum/uplink_item/suits/modsuit_elite
|
||||
name = "Syndicate Elite MODsuit"
|
||||
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
|
||||
cost = 9 //9 to start, no holopara / ebow.
|
||||
surplus = 60
|
||||
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
|
||||
/datum/uplink_item/implants/uplink // Nukies get Nuclear Uplink Bio-chip instead
|
||||
|
||||
Reference in New Issue
Block a user