From a1e222c8671c600e16aea36ccf9bc2d1931c3c8a Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Wed, 20 Mar 2019 10:43:11 -0700 Subject: [PATCH] RIGs module re-haul and re-balance (#6032) --- aurorastation.dme | 1 + .../clothing/spacesuits/rig/_defines.dm | 7 +++ .../clothing/spacesuits/rig/modules/combat.dm | 20 +++++++++ .../spacesuits/rig/modules/computer.dm | 8 ++++ .../spacesuits/rig/modules/modules.dm | 1 + .../clothing/spacesuits/rig/modules/ninja.dm | 14 ++++++ .../spacesuits/rig/modules/utility.dm | 45 +++++++++++++++++++ .../clothing/spacesuits/rig/modules/vision.dm | 19 +++++++- code/modules/clothing/spacesuits/rig/rig.dm | 2 + .../clothing/spacesuits/rig/rig_attackby.dm | 26 +++++++++++ .../clothing/spacesuits/rig/suits/alien.dm | 5 +++ .../clothing/spacesuits/rig/suits/combat.dm | 8 ++++ .../clothing/spacesuits/rig/suits/ert.dm | 32 ++++++++++--- .../clothing/spacesuits/rig/suits/light.dm | 7 ++- .../clothing/spacesuits/rig/suits/merc.dm | 2 + .../clothing/spacesuits/rig/suits/station.dm | 26 ++++++++--- .../spacesuits/rig/suits/terminator.dm | 2 + html/changelogs/Sindorman-rigs.yml | 42 +++++++++++++++++ 18 files changed, 252 insertions(+), 15 deletions(-) create mode 100644 code/modules/clothing/spacesuits/rig/_defines.dm create mode 100644 html/changelogs/Sindorman-rigs.yml diff --git a/aurorastation.dme b/aurorastation.dme index df5dfd95a01..ef5c1a8ceb8 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1297,6 +1297,7 @@ #include "code\modules\clothing\spacesuits\miscellaneous.dm" #include "code\modules\clothing\spacesuits\spacesuits.dm" #include "code\modules\clothing\spacesuits\syndi.dm" +#include "code\modules\clothing\spacesuits\rig\_defines.dm" #include "code\modules\clothing\spacesuits\rig\rig.dm" #include "code\modules\clothing\spacesuits\rig\rig_attackby.dm" #include "code\modules\clothing\spacesuits\rig\rig_construction.dm" diff --git a/code/modules/clothing/spacesuits/rig/_defines.dm b/code/modules/clothing/spacesuits/rig/_defines.dm new file mode 100644 index 00000000000..e164269267f --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/_defines.dm @@ -0,0 +1,7 @@ +#define MODULE_GENERAL 1 +#define MODULE_LIGHT_COMBAT 2 +#define MODULE_HEAVY_COMBAT 4 +#define MODULE_UTILITY 8 +#define MODULE_MEDICAL 16 +#define MODULE_SPECIAL 32 +#define MODULE_VAURCA 64 \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 64503278e1a..cd66fd5461c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -15,6 +15,7 @@ interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." device_type = /obj/item/device/flash + category = MODULE_LIGHT_COMBAT /obj/item/rig_module/grenade_launcher @@ -29,6 +30,8 @@ var/fire_force = 30 var/fire_distance = 10 + category = MODULE_HEAVY_COMBAT + charges = list( list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3), list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 3), @@ -106,6 +109,8 @@ name = "mounted cleaning grenade launcher" desc = "A specialty shoulder-mounted micro-explosive dispenser." + category = MODULE_GENERAL + charges = list( list("cleaning grenade", "cleaning grenade", /obj/item/weapon/grenade/chem_grenade/cleaner, 9) ) @@ -121,6 +126,8 @@ engage_string = "Configure" + category = MODULE_HEAVY_COMBAT + interface_name = "mounted laser cannon" interface_desc = "A shoulder-mounted cell-powered laser cannon." @@ -156,6 +163,8 @@ gun_type = /obj/item/weapon/gun/energy/gun/mounted + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/mounted/taser name = "mounted taser" @@ -174,6 +183,8 @@ gun_type = /obj/item/weapon/gun/energy/taser/mounted + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/mounted/pulse name = "mounted pulse rifle" @@ -229,6 +240,8 @@ construction_cost = list("glass" = 5250, DEFAULT_WALL_MATERIAL = 30000, "silver" = 5250, "phoron" = 7250) construction_time = 300 + category = MODULE_UTILITY + gun_type = /obj/item/weapon/gun/energy/plasmacutter/mounted /obj/item/rig_module/mounted/thermalldrill @@ -240,6 +253,7 @@ gun_type = /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill + category = MODULE_UTILITY /obj/item/rig_module/mounted/energy_blade @@ -262,6 +276,8 @@ gun_type = /obj/item/weapon/gun/energy/crossbow/ninja + category = MODULE_SPECIAL + /obj/item/rig_module/mounted/energy_blade/process() if(holder && holder.wearer) @@ -316,6 +332,8 @@ var/fire_force = 30 var/fire_distance = 10 + category = MODULE_SPECIAL + /obj/item/rig_module/fabricator/engage(atom/target) if(!..()) @@ -347,3 +365,5 @@ interface_desc = "An integrated microfactory that produces wet floor signs from thin air and electricity." fabrication_type = /obj/item/weapon/caution + + category = MODULE_GENERAL diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 18222bd2b84..8fcd71f1899 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -50,6 +50,8 @@ var/obj/item/ai_card // Reference to the MMI, posibrain, intellicard or pAI card previously holding the AI. var/obj/item/ai_verbs/verb_holder + category = MODULE_GENERAL + /mob var/get_rig_stats = 0 @@ -245,6 +247,8 @@ interface_desc = "An induction-powered high-throughput datalink suitable for hacking encrypted networks." var/list/stored_research + category = MODULE_SPECIAL + /obj/item/rig_module/datajack/New() ..() stored_research = list() @@ -335,6 +339,8 @@ interface_name = "electrowarfare system" interface_desc = "An active counter-electronic warfare suite that disrupts AI tracking." + category = MODULE_SPECIAL + /obj/item/rig_module/electrowarfare_suite/activate() if(!..()) @@ -374,6 +380,8 @@ var/total_power_drained = 0 var/drain_loc + category = MODULE_SPECIAL + /obj/item/rig_module/power_sink/deactivate() if(interfaced_with) diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 1a2561ff974..92f0921be2a 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -57,6 +57,7 @@ var/deactivate_string = "Deactivate" var/list/stat_rig_module/stat_modules = new() + var/category // Use for restricting modules for specific suits, to specialize /obj/item/rig_module/examine() ..() diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 533031ebd45..65392114a70 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -34,6 +34,8 @@ suit_overlay_active = "stealth_active" suit_overlay_inactive = "stealth_inactive" + category = MODULE_SPECIAL + /obj/item/rig_module/stealth_field/activate() if(!..()) @@ -81,6 +83,8 @@ interface_name = "VOID-shift bluespace phase projector" interface_desc = "An advanced teleportation system. It is capable of pinpoint precision or random leaps forward." + category = MODULE_SPECIAL + /obj/item/rig_module/teleporter/proc/phase_in(var/mob/M,var/turf/T) if(!M || !T) @@ -160,6 +164,8 @@ fabrication_type = /obj/item/weapon/energy_net use_power_cost = 60 + category = MODULE_SPECIAL + /obj/item/rig_module/fabricator/energy_net/engage(atom/target) if(holder && holder.wearer) @@ -183,6 +189,8 @@ interface_desc = "An integrated self-destruct module. When the wearer dies, so does the surrounding area. Do not press this button." var/list/explosion_values = list(3,4,5,6) + category = MODULE_SPECIAL + /obj/item/rig_module/self_destruct/small explosion_values = list(1,2,3,4) @@ -228,6 +236,8 @@ interface_desc = "A highly experimental system that augments the hardsuit's existing EM shielding." var/protection_amount = 30 + category = MODULE_SPECIAL + /obj/item/rig_module/emp_shielding/activate() if(!..()) return @@ -255,6 +265,8 @@ interface_desc = "A high yield power generating device that takes a long time to recharge." var/generation_ammount = 1500 + category = MODULE_SPECIAL + /obj/item/rig_module/emergency_powergenerator/engage() if(!..()) return @@ -282,3 +294,5 @@ interface_desc = "A complex uprade that allows the user to apply an EMAG effect to certain objects. High power cost." device_type = /obj/item/weapon/robot_emag + + category = MODULE_SPECIAL diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 3eafc3a77b6..b8f1fc0650b 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -41,6 +41,8 @@ device_type = /obj/item/device/healthanalyzer + category = MODULE_MEDICAL + /obj/item/rig_module/device/drill name = "hardsuit diamond drill mount" desc = "A very heavy diamond-tipped drill." @@ -55,6 +57,8 @@ device_type = /obj/item/weapon/pickaxe/diamonddrill + category = MODULE_UTILITY + /obj/item/rig_module/device/basicdrill name = "hardsuit drill mount" desc = "A very heavy basic drill." @@ -67,6 +71,8 @@ device_type = /obj/item/weapon/pickaxe/drill + category = MODULE_UTILITY + /obj/item/rig_module/device/anomaly_scanner name = "hardsuit anomaly scanner" desc = "You think it's called an Elder Sarsparilla or something." @@ -78,6 +84,8 @@ selectable = 0 device_type = /obj/item/device/ano_scanner + category = MODULE_UTILITY + /obj/item/rig_module/device/orescanner name = "ore scanner module" desc = "A clunky old ore scanner." @@ -89,6 +97,8 @@ selectable = 0 device_type = /obj/item/weapon/mining_scanner + category = MODULE_UTILITY + /obj/item/rig_module/device/rcd name = "RCD mount" desc = "A cell-powered rapid construction device for a hardsuit." @@ -102,6 +112,8 @@ device_type = /obj/item/weapon/rcd/mounted + category = MODULE_UTILITY + /obj/item/rig_module/device/New() ..() if(device_type) device = new device_type(src) @@ -160,6 +172,8 @@ var/max_reagent_volume = 80 //Used when refilling. + category = MODULE_HEAVY_COMBAT + /obj/item/rig_module/chem_dispenser/ninja interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream. This variant is made to be extremely light and flexible." @@ -175,6 +189,8 @@ list("hyronalin", "hyronalin", 0, 20), list("radium", "radium", 0, 20) ) + + category = MODULE_UTILITY /obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user) @@ -275,6 +291,8 @@ interface_name = "combat chem dispenser" interface_desc = "Dispenses loaded chemicals directly into the bloodstream." + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/chem_dispenser/vaurca name = "vaurca combat chemical injector" @@ -292,6 +310,9 @@ interface_name = "vaurca combat chem dispenser" interface_desc = "Dispenses loaded chemicals directly into the bloodstream." + + category = MODULE_VAURCA + /obj/item/rig_module/chem_dispenser/offworlder name = "chemical injector" @@ -305,6 +326,7 @@ interface_name = "chem dispenser" interface_desc = "Dispenses loaded chemicals directly into the bloodstream." + /obj/item/rig_module/chem_dispenser/injector name = "mounted chemical injector" @@ -318,6 +340,8 @@ interface_name = "mounted chem injector" interface_desc = "Dispenses loaded chemicals via an arm-mounted injector." + category = MODULE_MEDICAL + /obj/item/rig_module/chem_dispenser/injector/paramedic //downgraded version charges = list( @@ -345,6 +369,8 @@ var/obj/item/voice_changer/voice_holder + category = MODULE_SPECIAL + /obj/item/rig_module/voice/New() ..() voice_holder = new(src) @@ -405,6 +431,8 @@ var/obj/item/weapon/tank/jetpack/rig/jets + category = MODULE_GENERAL + /obj/item/rig_module/maneuvering_jets/engage() if(!..()) return 0 @@ -463,6 +491,8 @@ selectable = 0 device_type = /obj/item/weapon/paper_bin + category = MODULE_GENERAL + /obj/item/rig_module/device/paperdispenser/engage(atom/target) if(!..() || !device) @@ -482,6 +512,8 @@ usable = 1 device_type = /obj/item/weapon/pen/multi + category = MODULE_GENERAL + /obj/item/rig_module/device/stamp name = "mounted internal affairs stamp" desc = "DENIED." @@ -493,6 +525,8 @@ var/iastamp var/deniedstamp + category = MODULE_GENERAL + /obj/item/rig_module/device/stamp/New() ..() iastamp = new /obj/item/weapon/stamp/internalaffairs(src) @@ -521,6 +555,8 @@ device_type = /obj/item/weapon/matter_decompiler + category = MODULE_GENERAL + /obj/item/rig_module/actuators name = "leg actuators" desc = "A set of electromechanical actuators, for safe traversal of multilevelled areas." @@ -552,6 +588,8 @@ // Such as leaping faster, or grappling targets. var/leapDistance = 4 // Determines how far the actuators allow you to leap (radius, inclusive). + category = MODULE_GENERAL + /obj/item/rig_module/actuators/combat name = "military grade leg actuators" desc = "A set of high-powered hydraulic actuators, for improved traversal of multilevelled areas." @@ -562,6 +600,8 @@ use_power_cost = 10 + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/actuators/engage(var/atom/target) if (!..()) return 0 @@ -680,6 +720,8 @@ var/max_cooling = 12 var/thermostat = T20C + category = MODULE_GENERAL + /obj/item/rig_module/cooling_unit/process() if(!active) return passive_power_cost @@ -709,6 +751,8 @@ usable = 1 + category = MODULE_VAURCA + /obj/item/rig_module/boring/engage() if (!..()) return 0 @@ -737,6 +781,7 @@ var/global/list/lattice_users = list() toggleable = 1 confined_use = 1 + category = MODULE_VAURCA /obj/item/rig_module/lattice/activate() if (!..()) diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index 1cb0c94a2fa..ffa325b3e1d 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -15,31 +15,37 @@ /datum/rig_vision/nvg mode = "night vision" + /datum/rig_vision/nvg/New() glasses = new /obj/item/clothing/glasses/night /datum/rig_vision/thermal mode = "thermal scanner" + /datum/rig_vision/thermal/New() glasses = new /obj/item/clothing/glasses/thermal /datum/rig_vision/meson mode = "meson scanner" + /datum/rig_vision/meson/New() glasses = new /obj/item/clothing/glasses/meson /datum/rig_vision/material mode = "meson scanner" + /datum/rig_vision/material/New() glasses = new /obj/item/clothing/glasses/material /datum/rig_vision/sechud mode = "security HUD" + /datum/rig_vision/sechud/New() glasses = new /obj/item/clothing/glasses/hud/security /datum/rig_vision/medhud mode = "medical HUD" + /datum/rig_vision/medhud/New() glasses = new /obj/item/clothing/glasses/hud/health @@ -70,6 +76,8 @@ var/vision_index + category = MODULE_GENERAL + /obj/item/rig_module/vision/multi name = "hardsuit optical package" @@ -85,6 +93,8 @@ /datum/rig_vision/thermal, /datum/rig_vision/sechud, /datum/rig_vision/medhud) + + category = MODULE_SPECIAL /obj/item/rig_module/vision/meson @@ -102,7 +112,7 @@ vision_modes = list(/datum/rig_vision/meson, /datum/rig_vision/material) - + /obj/item/rig_module/vision/thermal name = "hardsuit thermal scanner" @@ -116,6 +126,8 @@ vision_modes = list(/datum/rig_vision/thermal) + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/vision/nvg name = "hardsuit night vision interface" @@ -132,6 +144,8 @@ vision_modes = list(/datum/rig_vision/nvg) + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/vision/sechud name = "hardsuit security hud" @@ -148,6 +162,8 @@ vision_modes = list(/datum/rig_vision/sechud) + category = MODULE_LIGHT_COMBAT + /obj/item/rig_module/vision/medhud name = "hardsuit medical hud" @@ -164,6 +180,7 @@ vision_modes = list(/datum/rig_vision/medhud) + category = MODULE_MEDICAL // There should only ever be one vision module installed in a suit. /obj/item/rig_module/vision/installed() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 9504739a524..d3c140b32c5 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -84,6 +84,8 @@ var/datum/wires/rig/wires var/datum/effect_system/sparks/spark_system + var/allowed_module_types = MODULE_GENERAL // All rigs by default should have access to general + /obj/item/weapon/rig/examine() to_chat(usr, "This is \icon[src][src.name].") to_chat(usr, "[src.desc]") diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index fb380882727..a71252e568f 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -44,10 +44,12 @@ // Hacking. if(W.iswirecutter() || W.ismultitool()) + if(open) wires.Interact(user) else to_chat(user, "You can't reach the wiring.") + return // Air tank. if(istype(W,/obj/item/weapon/tank)) //Todo, some kind of check for suits without integrated air supplies. @@ -65,6 +67,7 @@ // Check if this is a hardsuit upgrade or a modification. else if(istype(W,/obj/item/rig_module)) + var/obj/item/rig_module/module = W if(istype(src.loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = src.loc if(H.back == src) @@ -72,6 +75,12 @@ return 1 if(!installed_modules) installed_modules = list() + + if(!(module.category & allowed_module_types)) + var/mod_name = get_module_category(module.category) + to_chat(user, span("warning", "\The [src] does not support [mod_name] modules!")) + return 0 + if(installed_modules.len) for(var/obj/item/rig_module/installed_mod in installed_modules) if(!installed_mod.redundant && istype(installed_mod,W)) @@ -204,3 +213,20 @@ subverted = 1 to_chat(user, "You short out the access protocol for the suit.") return 1 + +/obj/item/weapon/rig/proc/get_module_category(var/category) + switch(category) + if(MODULE_GENERAL) + return "general" + if(MODULE_LIGHT_COMBAT) + return "light combat" + if(MODULE_HEAVY_COMBAT) + return "heavy combat" + if(MODULE_UTILITY) + return "utility" + if(MODULE_MEDICAL) + return "medical" + if(MODULE_SPECIAL) + return "special" + if(MODULE_VAURCA) + return "vaurca" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index fa2da1f3d88..56591655e02 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -16,6 +16,8 @@ allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT + /obj/item/weapon/rig/unathi/fancy name = "breacher chassis control module" desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank." @@ -26,6 +28,7 @@ slowdown = 4 vision_restriction = TINT_NONE + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL /obj/item/clothing/head/helmet/space/rig/unathi species_restricted = list("Unathi") @@ -65,6 +68,8 @@ /obj/item/rig_module/maneuvering_jets ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_VAURCA /obj/item/weapon/rig/vaurca/minimal initial_modules = list(/obj/item/rig_module/chem_dispenser/vaurca) diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index ce22103814e..63195e16390 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -10,6 +10,9 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/combat allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT + /obj/item/clothing/head/helmet/space/rig/combat light_overlay = "helmet_light_dual_cyan" species_restricted = list("Human") @@ -24,6 +27,7 @@ species_restricted = list("Human") + /obj/item/weapon/rig/combat/equipped @@ -52,6 +56,8 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/military glove_type = /obj/item/clothing/gloves/rig/military + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY + /obj/item/clothing/head/helmet/space/rig/military light_overlay = "helmet_light_dual_green" light_color = "#3e7c3e" @@ -105,6 +111,8 @@ chest_type = /obj/item/clothing/suit/space/rig/retro helm_type = /obj/item/clothing/head/helmet/space/rig/retro + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY + /obj/item/weapon/rig/retro/equipped req_access = list(access_legion) initial_modules = list( diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index e57d7a24f2d..26a6f0c979e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -4,7 +4,7 @@ /obj/item/weapon/rig/ert name = "ERT-C hardsuit control module" - desc = "A suit worn by the commander of an Emergency Response Team. Has blue highlights. Armoured and space ready." + desc = "A suit worn by the commander of an Emergency Response Team. Has blue highlights." suit_type = "ERT commander" icon_state = "ert_commander_rig" emp_protection = 35 @@ -13,7 +13,8 @@ req_access = list(access_cent_specops) - armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100) + allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \ /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \ /obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \ @@ -26,14 +27,18 @@ /obj/item/rig_module/datajack, /obj/item/rig_module/actuators/combat ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA /obj/item/weapon/rig/ert/engineer name = "ERT-E suit control module" - desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Armoured and space ready." + desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Less armoured than the security variant, but offers full radiation protection." suit_type = "ERT engineer" icon_state = "ert_engineer_rig" emp_protection = 30 + armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100) + glove_type = /obj/item/clothing/gloves/rig/eva initial_modules = list( @@ -44,14 +49,17 @@ /obj/item/rig_module/device/rcd, /obj/item/rig_module/actuators ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_UTILITY /obj/item/weapon/rig/ert/medical name = "ERT-M suit control module" - desc = "A suit worn by the medical division of an Emergency Response Team. Has white highlights. Armoured and space ready." + desc = "A suit worn by the medical division of an Emergency Response Team. Has white highlights. Less armoured than the security variant, but offers full radiation protection." suit_type = "ERT medic" icon_state = "ert_medical_rig" emp_protection = 30 + armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100) + initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/vision/medhud, @@ -60,14 +68,18 @@ /obj/item/rig_module/chem_dispenser/injector, /obj/item/rig_module/actuators ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL /obj/item/weapon/rig/ert/security name = "ERT-S suit control module" - desc = "A suit worn by the security division of an Emergency Response Team. Has red highlights. Armoured and space ready." + desc = "A suit worn by the security division of an Emergency Response Team. Has red highlights. Trades full radiation protection for a slightly better armour." suit_type = "ERT security" icon_state = "ert_security_rig" emp_protection = 30 + armor = list(melee = 65, bullet = 55, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 80) + initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/vision/sechud, @@ -76,10 +88,11 @@ /obj/item/rig_module/mounted/egun, /obj/item/rig_module/actuators ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL /obj/item/weapon/rig/ert/janitor name = "ERT-J suit control module" - desc = "A suit worn by the janitoral division of an Emergency Response Team. Has purple highlights. Armoured and space ready." + desc = "A suit worn by the janitoral division of an Emergency Response Team. Has purple highlights. Less armoured than security the variant, but offers full radiation protection." suit_type = "ERT janitor" icon_state = "ert_janitor_rig" @@ -91,6 +104,9 @@ /obj/item/rig_module/device/decompiler, /obj/item/rig_module/actuators ) + armor = list(melee = 55, bullet = 45, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL /obj/item/weapon/rig/ert/assetprotection name = "heavy asset protection suit control module" @@ -115,6 +131,8 @@ /obj/item/rig_module/datajack, /obj/item/rig_module/actuators/combat ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA // all modules /obj/item/weapon/rig/ert/assetprotection/empty - initial_modules = list() \ No newline at end of file + initial_modules = list() diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 6d6deaa3f2f..a44e8190d1a 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -54,6 +54,8 @@ /obj/item/rig_module/voice, /obj/item/rig_module/vision ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_SPECIAL //The cybersuit is not space-proof. It does however, have good siemens_coefficient values /obj/item/clothing/head/lightrig/hacker @@ -96,6 +98,8 @@ /obj/item/rig_module/actuators ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + /obj/item/weapon/rig/light/ninja/equipped initial_modules = list( /obj/item/rig_module/teleporter, @@ -142,6 +146,8 @@ /obj/item/rig_module/vision ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_SPECIAL + /obj/item/weapon/rig/light/offworlder name = "exo-stellar skeleton module" suit_type = "exo-stellar skeleton" @@ -174,4 +180,3 @@ cold_protection = UPPER_TORSO flags_inv = 0 species_restricted = list("Human") - diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 9dbcbb93ec0..24aea7467f5 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -30,6 +30,8 @@ /obj/item/rig_module/actuators/combat ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + //Has most of the modules removed /obj/item/weapon/rig/merc/empty initial_modules = list( diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index dd767ea7001..59916bfcb29 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -39,6 +39,8 @@ helm_type = null boot_type = null + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + /obj/item/weapon/rig/internalaffairs/equipped req_access = list(access_lawyer) @@ -61,8 +63,8 @@ desc = "A heavy, powerful rig used by construction crews and mining corporations." icon_state = "industrial_rig" armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) - slowdown = 3 - offline_slowdown = 10 + slowdown = 2 + offline_slowdown = 7 offline_vision_restriction = TINT_HEAVY emp_protection = -20 @@ -73,6 +75,7 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_UTILITY /obj/item/weapon/rig/industrial/equipped @@ -96,7 +99,7 @@ icon_state = "eva_rig" armor = list(melee = 30, bullet = 10, laser = 20, energy = 25, bomb = 20, bio = 100, rad = 100) slowdown = 0 - offline_slowdown = 1 + offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/eva @@ -107,6 +110,8 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_UTILITY + /obj/item/weapon/rig/eva/equipped req_access = list(access_engine_equip) @@ -129,7 +134,7 @@ icon_state = "ce_rig" armor = list(melee = 40, bullet = 10, laser = 30,energy = 25, bomb = 40, bio = 100, rad = 100) slowdown = 0 - offline_slowdown = 0 + offline_slowdown = 3 offline_vision_restriction = 0 max_heat_protection_temperature = 7500 @@ -141,6 +146,8 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_UTILITY + /obj/item/weapon/rig/ce/equipped req_access = list(access_ce) @@ -174,6 +181,8 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_UTILITY + /obj/item/weapon/rig/hazmat/equipped req_access = list(access_rd) @@ -190,6 +199,8 @@ desc = "A durable suit designed for medical rescue in high risk areas." icon_state = "medical_rig" armor = list(melee = 30, bullet = 15, laser = 20, energy = 60, bomb = 30, bio = 100, rad = 100) + slowdown = 0 + offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/medical @@ -199,6 +210,8 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_MEDICAL + /obj/item/weapon/rig/medical/equipped req_access = list(access_paramedic) @@ -227,6 +240,7 @@ req_access = list() req_one_access = list() + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT /obj/item/weapon/rig/hazard/equipped @@ -245,8 +259,8 @@ desc = "A heavy rig designated for operations under the water, you are not sure what it is doing here however." icon_state = "diving_rig" armor = list(melee = 30, bullet = 10, laser = 20, energy = 25, bomb = 20, bio = 100, rad = 100) - slowdown = 4 - offline_slowdown = 2 + slowdown = 3 + offline_slowdown = 4 offline_vision_restriction = TINT_HEAVY chest_type = /obj/item/clothing/suit/space/rig/diving diff --git a/code/modules/clothing/spacesuits/rig/suits/terminator.dm b/code/modules/clothing/spacesuits/rig/suits/terminator.dm index f710e224ce0..5c071efb14d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/terminator.dm +++ b/code/modules/clothing/spacesuits/rig/suits/terminator.dm @@ -40,6 +40,8 @@ /obj/item/rig_module/actuators/combat ) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + /obj/item/clothing/head/helmet/space/rig/terminator species_restricted = list("Heavy Machine") light_overlay = "helmet_light_terminator" diff --git a/html/changelogs/Sindorman-rigs.yml b/html/changelogs/Sindorman-rigs.yml new file mode 100644 index 00000000000..4aeea259539 --- /dev/null +++ b/html/changelogs/Sindorman-rigs.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Rig modules now have categories. Each rig now has a list of allowed categories, so for example medical rig cannot have engineering or combat modules installed unless they were pre-installed. Antag rigs have no restrictions, same goes for HAPT." + - tweak: "ERT suits are now more specialized. Command suit is the only suit that can have any category installed. ERT security RIGs can only have general, combat, special modules. ERT engineering RIGs can only have general, combat, engineering, mining. ERT medical rigs can only have general, combat, medical modules. ERT janitor can obly have general, combat, jantor modules."