From f86760e75ae7452d92a40210c239686df22d314b Mon Sep 17 00:00:00 2001
From: blackwolf602 <54816502+blackwolf602@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:17:06 -0700
Subject: [PATCH] Revert "Revert "Revert "shit"""
---
baystation12.dme | 7 +
code/datums/craft/recipes/rig.dm | 22 -
code/datums/craft/recipes/weapon.dm | 11 -
code/datums/supplypacks/security.dm | 4 +-
code/datums/uplink/medical.dm | 2 +-
code/game/jobs/job/cargo.dm | 4 +-
code/game/jobs/job/civilian.dm | 12 +-
code/game/jobs/job/ishimura/medical.dm | 4 +-
code/game/jobs/job/ishimura/mining.dm | 2 +-
code/game/jobs/job/ishimura/security.dm | 8 +-
code/game/jobs/job/medical.dm | 8 +-
code/game/jobs/job/science.dm | 4 +-
code/game/machinery/vending_miner.dm | 4 -
code/game/objects/items/stacks/power_node.dm | 70 +-
.../objects/items/weapons/grenades/light.dm | 11 +-
.../objects/items/weapons/tools/pickaxe.dm | 2 +-
code/game/objects/random/misc.dm | 6 +-
code/game/objects/random/rig.dm | 27 +-
code/game/objects/random/weapons.dm | 2 -
.../closets/secure/engineering.dm | 2 +-
.../crates_lockers/closets/utility_closets.dm | 6 +-
.../spacesuits/rig/modules/utility.dm | 2 +
.../clothing/spacesuits/rig/suits/advanced.dm | 149 ++--
.../clothing/spacesuits/rig/suits/arctic.dm | 23 +-
.../clothing/spacesuits/rig/suits/civilian.dm | 32 +-
.../clothing/spacesuits/rig/suits/cseco.dm | 86 +--
.../spacesuits/rig/suits/engineering.dm | 84 +-
.../spacesuits/rig/suits/excavation.dm | 31 +
.../clothing/spacesuits/rig/suits/flesh.dm | 19 +
.../clothing/spacesuits/rig/suits/marksman.dm | 7 +-
.../clothing/spacesuits/rig/suits/mining.dm | 57 +-
.../clothing/spacesuits/rig/suits/patrol.dm | 41 +
.../clothing/spacesuits/rig/suits/riot.dm | 37 +
.../clothing/spacesuits/rig/suits/scaf.dm | 49 +-
.../clothing/spacesuits/rig/suits/sea.dm | 83 ++
.../clothing/spacesuits/rig/suits/security.dm | 254 +++---
.../spacesuits/rig/suits/tarnished.dm | 19 +
.../spacesuits/rig/suits/unitologist.dm | 66 +-
.../clothing/spacesuits/rig/suits/vintage.dm | 114 +--
.../clothing/spacesuits/rig/suits/wasp.dm | 38 +
code/modules/clothing/suits/armor.dm | 8 +-
.../clothing/under/accessories/armor.dm | 8 +-
code/modules/customitems/custom_item_types.dm | 729 ++++++++----------
code/modules/projectiles/guns/ds13/divet.dm | 3 +-
.../projectiles/guns/ds13/plasma_cutter.dm | 3 +-
.../projectiles/guns/ds13/rivet_gun.dm | 8 +-
code/modules/projectiles/guns/ds13/seeker.dm | 9 +-
.../reagent_containers/food/drinks/bottle.dm | 7 +-
code/modules/research/designs/design_rig.dm | 74 +-
.../research/designs/design_weapons.dm | 14 +
icons/mob/light_overlays.dmi | Bin 3458 -> 3278 bytes
icons/mob/onmob/feet.dmi | Bin 38076 -> 36106 bytes
icons/mob/onmob/hands.dmi | Bin 26492 -> 27094 bytes
icons/mob/onmob/head.dmi | Bin 188353 -> 181669 bytes
icons/mob/onmob/items/lefthand.dmi | Bin 111144 -> 119414 bytes
icons/mob/onmob/items/righthand.dmi | Bin 111863 -> 119761 bytes
icons/mob/onmob/modular_armor.dmi | Bin 30263 -> 13189 bytes
icons/mob/onmob/rig_back.dmi | Bin 22510 -> 21233 bytes
icons/mob/onmob/suit.dmi | Bin 325851 -> 314477 bytes
icons/obj/clothing/gloves.dmi | Bin 53247 -> 46067 bytes
icons/obj/clothing/hats.dmi | Bin 85401 -> 77146 bytes
icons/obj/clothing/modular_armor.dmi | Bin 13771 -> 6490 bytes
icons/obj/clothing/shoes.dmi | Bin 47971 -> 40455 bytes
icons/obj/clothing/suits.dmi | Bin 119928 -> 117627 bytes
icons/obj/light_overlays.dmi | Bin 1982 -> 1711 bytes
icons/obj/rig_frames.dmi | Bin 29904 -> 23675 bytes
icons/obj/weapons.dmi | Bin 33951 -> 35059 bytes
maps/CentCom.dmm | 4 +-
maps/TheColony/M.02_Mining_Colony.dmm | 10 +-
maps/USGIshimura/M.04 Ishimura (M).dmm | 6 +-
70 files changed, 1227 insertions(+), 1065 deletions(-)
create mode 100644 code/modules/clothing/spacesuits/rig/suits/excavation.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/flesh.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/patrol.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/riot.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/sea.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/tarnished.dm
create mode 100644 code/modules/clothing/spacesuits/rig/suits/wasp.dm
diff --git a/baystation12.dme b/baystation12.dme
index 7ce223f3167..151558b2d64 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1663,19 +1663,26 @@
#include "code\modules\clothing\spacesuits\rig\suits\cseco.dm"
#include "code\modules\clothing\spacesuits\rig\suits\engineering.dm"
#include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\excavation.dm"
#include "code\modules\clothing\spacesuits\rig\suits\firesuit.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\flesh.dm"
#include "code\modules\clothing\spacesuits\rig\suits\hacker.dm"
#include "code\modules\clothing\spacesuits\rig\suits\light.dm"
#include "code\modules\clothing\spacesuits\rig\suits\marine.dm"
#include "code\modules\clothing\spacesuits\rig\suits\marksman.dm"
#include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
#include "code\modules\clothing\spacesuits\rig\suits\mining.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\patrol.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\riot.dm"
#include "code\modules\clothing\spacesuits\rig\suits\scaf.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\sea.dm"
#include "code\modules\clothing\spacesuits\rig\suits\security.dm"
#include "code\modules\clothing\spacesuits\rig\suits\specialforces.dm"
#include "code\modules\clothing\spacesuits\rig\suits\station.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\tarnished.dm"
#include "code\modules\clothing\spacesuits\rig\suits\unitologist.dm"
#include "code\modules\clothing\spacesuits\rig\suits\vintage.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\wasp.dm"
#include "code\modules\clothing\spacesuits\void\merc.dm"
#include "code\modules\clothing\spacesuits\void\misc.dm"
#include "code\modules\clothing\spacesuits\void\station.dm"
diff --git a/code/datums/craft/recipes/rig.dm b/code/datums/craft/recipes/rig.dm
index c307c89dab2..5b054dff9f7 100644
--- a/code/datums/craft/recipes/rig.dm
+++ b/code/datums/craft/recipes/rig.dm
@@ -14,28 +14,6 @@
list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
)
-/datum/craft_recipe/rig/intermediate
- name = "Intermediate Engineering RIG"
- desc = "Upgrade a Standard Engineering RIG into a Intermediate Engineering RIG"
- time = 50
- result = /obj/item/rig/intermediate
- steps = list(
- list(CRAFT_OBJECT, /obj/item/rig/engineering),
- list(CRAFT_STACK, /obj/item/stack/power_node, 3),
- list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
- )
-
-/datum/craft_recipe/rig/excavation
- name = "Intermediate Mining RIG"
- desc = "Upgrade a Standard Mining RIG into a Intermediate Mining RIG"
- time = 50
- result = /obj/item/rig/excavation
- steps = list(
- list(CRAFT_OBJECT, /obj/item/rig/mining),
- list(CRAFT_STACK, /obj/item/stack/power_node, 3),
- list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL)
- )
-
/datum/craft_recipe/rig/flesh
name = "Odd RIG"
desc = "Upgrade a zealot rig into a odd rig"
diff --git a/code/datums/craft/recipes/weapon.dm b/code/datums/craft/recipes/weapon.dm
index b1ae865ec37..ed0ca6199b9 100644
--- a/code/datums/craft/recipes/weapon.dm
+++ b/code/datums/craft/recipes/weapon.dm
@@ -4,15 +4,6 @@
icon_state = "gun"
-/datum/craft_recipe/weapon/unitologist
- name = "unitology ritual blade"
- result = /obj/item/material/knife/unitologist
- steps = list(
- list(CRAFT_OBJECT, /obj/item/material/knife)
- )
-
-
-
/datum/craft_recipe/weapon/baseballbat
name = "baseball bat"
result = /obj/item/material/twohanded/baseballbat
@@ -198,7 +189,6 @@
/datum/craft_recipe/weapon/rendingcutter
name = "Rending Cutter"
result = /obj/item/gun/energy/cutter/rending
- flags = CRAFT_ON_WORKBENCH
time = 200
steps = list(
list(CRAFT_OBJECT, /obj/item/gun/energy/cutter/plasma, WORKTIME_NORMAL, FALSE, /obj/item/gun/energy/cutter/rending),
@@ -208,7 +198,6 @@
/datum/craft_recipe/weapon/rendingdivet
name = "Rending Divet"
result = /obj/item/gun/projectile/divet/rending
- flags = CRAFT_ON_WORKBENCH
time = 200
steps = list(
list(CRAFT_OBJECT, /obj/item/gun/projectile/divet, WORKTIME_NORMAL, FALSE, /obj/item/gun/projectile/divet/rending),
diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
index e272bfac28e..23e87615400 100644
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -167,7 +167,7 @@
/decl/hierarchy/supply_pack/security/rig_security
name = "T2 RIG - Security"
- contains = list(/obj/item/rig/pcsi/security = 1)
+ contains = list(/obj/item/rig/security = 1)
cost = 150
containertype = /obj/structure/closet/crate/secure/large
containername = "\improper security RIG crate"
@@ -176,7 +176,7 @@
/decl/hierarchy/supply_pack/security/rig_patrol
name = "T2 RIG - Patrol"
- contains = list(/obj/item/rig/riot/patrol = 1)
+ contains = list(/obj/item/rig/patrol = 1)
cost = 150
containertype = /obj/structure/closet/crate/secure/large
containername = "\improper patrol RIG crate"
diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm
index 6796c624145..c1a0eb3df29 100644
--- a/code/datums/uplink/medical.dm
+++ b/code/datums/uplink/medical.dm
@@ -23,7 +23,7 @@
/datum/uplink_item/item/medical/medigel_small
name = "small medical gel injector"
- item_cost = 6
+ item_cost = 8
path = /obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/small
is_special = TRUE
antag_roles = list(MODE_EARTHGOV_AGENT, MODE_UNITOLOGIST, MODE_UNITOLOGIST_SHARD)
diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm
index 109e575b4ae..163ea4acd9e 100644
--- a/code/game/jobs/job/cargo.dm
+++ b/code/game/jobs/job/cargo.dm
@@ -67,8 +67,8 @@
department = "Supply"
abbreviation = "ST"
department_flag = SUP
- total_positions = 3
- spawn_positions = 3
+ total_positions = 15
+ spawn_positions = 15
supervisors = "the Supply Officer"
selection_color = "#3b3b3b"
minimal_player_age = 18
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index c546ef6ba3c..5e6ce751554 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -31,8 +31,8 @@
title = "Line Cook"
abbreviation = "LC"
department_flag = SRV
- total_positions = 2
- spawn_positions = 2
+ total_positions = 7
+ spawn_positions = 7
supervisors = "the First Lieutenant"
selection_color = "#006200"
minimal_player_age = 18
@@ -60,8 +60,8 @@
title = "Botanist"
abbreviation = "BOT"
department_flag = SRV
- total_positions = 2
- spawn_positions = 2
+ total_positions = 6
+ spawn_positions = 6
supervisors = "the First Lieutenant"
selection_color = "#006200"
minimal_player_age = 18
@@ -88,8 +88,8 @@
title = "Janitor"
abbreviation = "JTR"
department_flag = SRV
- total_positions = 3
- spawn_positions = 3
+ total_positions = 20
+ spawn_positions = 20
supervisors = "the First Lieutenant"
selection_color = "#6c0864"
minimal_player_age = 18
diff --git a/code/game/jobs/job/ishimura/medical.dm b/code/game/jobs/job/ishimura/medical.dm
index 7fb9aecbcbc..e6227c8e10d 100644
--- a/code/game/jobs/job/ishimura/medical.dm
+++ b/code/game/jobs/job/ishimura/medical.dm
@@ -41,8 +41,8 @@
department = "Medical"
abbreviation = "MD"
department_flag = MED
- total_positions = 5
- spawn_positions = 5
+ total_positions = 6
+ spawn_positions = 6
supervisors = "the Senior Medical Officer"
selection_color = "#013d3b"
minimal_player_age = 18
diff --git a/code/game/jobs/job/ishimura/mining.dm b/code/game/jobs/job/ishimura/mining.dm
index 64fa873f259..9b1ef739ff3 100644
--- a/code/game/jobs/job/ishimura/mining.dm
+++ b/code/game/jobs/job/ishimura/mining.dm
@@ -77,7 +77,7 @@
abbreviation = "PC"
department = "Mining"
department_flag = MIN
- total_positions = 100
+ total_positions = 25
spawn_positions = 25
supervisors = "the Mining Foreman"
selection_color = "#5e4215"
diff --git a/code/game/jobs/job/ishimura/security.dm b/code/game/jobs/job/ishimura/security.dm
index 8a031e1dd27..cbc295a8978 100644
--- a/code/game/jobs/job/ishimura/security.dm
+++ b/code/game/jobs/job/ishimura/security.dm
@@ -41,8 +41,8 @@
department = "Security"
abbreviation = "SSO"
department_flag = SEC
- total_positions = 2
- spawn_positions = 2
+ total_positions = 1
+ spawn_positions = 1
supervisors = "the Chief Security Officer"
selection_color = "#601c1c"
minimal_player_age = 18
@@ -72,8 +72,8 @@
department = "Security"
abbreviation = "SEC"
department_flag = SEC
- total_positions = 15
- spawn_positions = 15
+ total_positions = 4
+ spawn_positions = 4
supervisors = "the Chief Security Officer and Senior Security Officer"
selection_color = "#601c1c"
minimal_player_age = 18
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 1d59965faa2..e659c7564cc 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -42,8 +42,8 @@
department = "Medical"
abbreviation = "MD"
department_flag = MED
- total_positions = 5
- spawn_positions = 5
+ total_positions = 15
+ spawn_positions = 15
supervisors = "the Senior Medical Officer"
selection_color = "#013d3b"
minimal_player_age = 18
@@ -74,8 +74,8 @@
department = "Medical"
abbreviation = "SRG"
department_flag = MED
- total_positions = 2
- spawn_positions = 2
+ total_positions = 5
+ spawn_positions = 5
supervisors = "the Senior Medical Officer"
selection_color = "#013d3b"
minimal_player_age = 18
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index 8bfad35a616..2e0f9895bf6 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -45,8 +45,8 @@
department = "Science"
abbreviation = "RA"
department_flag = SCI
- total_positions = 4
- spawn_positions = 4
+ total_positions = 10
+ spawn_positions = 10
supervisors = "the Chief Science Officer"
selection_color = "#633d63"
minimal_player_age = 18
diff --git a/code/game/machinery/vending_miner.dm b/code/game/machinery/vending_miner.dm
index c583b9712f7..757c654888e 100644
--- a/code/game/machinery/vending_miner.dm
+++ b/code/game/machinery/vending_miner.dm
@@ -47,8 +47,6 @@
/obj/item/gun/spray/hydrazine_torch = 10,
/obj/item/reagent_containers/glass/fuel_tank/fuel = 25,
/obj/item/reagent_containers/glass/fuel_tank/hydrazine = 10,
- /obj/item/rig/excavation = 10,
- /obj/item/rig/advanced/mining = 5,
)
prices = list(
/obj/item/stack/power_node = 5000,
@@ -92,8 +90,6 @@
/obj/item/gun/spray/hydrazine_torch = 8000,
/obj/item/reagent_containers/glass/fuel_tank/fuel = 2000,
/obj/item/reagent_containers/glass/fuel_tank/hydrazine = 4000,
- /obj/item/rig/excavation = 10000,
- /obj/item/rig/advanced/mining = 20000,
)
/obj/machinery/vending/mining/attackby(obj/item/W, mob/user)
diff --git a/code/game/objects/items/stacks/power_node.dm b/code/game/objects/items/stacks/power_node.dm
index 9cee98caff3..9cf0a508cf3 100644
--- a/code/game/objects/items/stacks/power_node.dm
+++ b/code/game/objects/items/stacks/power_node.dm
@@ -1,36 +1,36 @@
-/obj/item/stack/power_node
- name = "power nodes"
- desc = "It seems to be radiating a lot of energy."
- singular_name = "power node"
- icon = 'icons/obj/tools.dmi'
- icon_state = "powernode"
- w_class = ITEM_SIZE_SMALL
- max_amount = 20
- item_flags = ITEM_FLAG_NO_BLUDGEON
- origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
-
-/obj/item/stack/special_node
- name = "cutter nodes"
- desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner."
- singular_name = "cutter node"
- icon = 'icons/obj/tools.dmi'
- color = "#e97f83"
- icon_state = "powernode"
- w_class = ITEM_SIZE_SMALL
- max_amount = 20
- item_flags = ITEM_FLAG_NO_BLUDGEON
- origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
-
-obj/item/stack/special_node/cutter
-
-obj/item/stack/special_node/divet
- desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner."
- name = "divet nodes"
- singular_name = "divet node"
- color = "#6e6ec1"
-
-obj/item/stack/special_node/evil
- desc = "A strange power note emanating with an evil aura."
- name = "evil nodes"
- singular_name = "evil node"
+/obj/item/stack/power_node
+ name = "power nodes"
+ desc = "It seems to be radiating a lot of energy."
+ singular_name = "power node"
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "powernode"
+ w_class = ITEM_SIZE_SMALL
+ max_amount = 20
+ item_flags = ITEM_FLAG_NO_BLUDGEON
+ origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
+
+/obj/item/stack/special_node
+ name = "cutter nodes"
+ desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner."
+ singular_name = "cutter node"
+ icon = 'icons/obj/tools.dmi'
+ color = "#e97f83"
+ icon_state = "powernode"
+ w_class = ITEM_SIZE_SMALL
+ max_amount = 20
+ item_flags = ITEM_FLAG_NO_BLUDGEON
+ origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
+
+obj/item/stack/special_node/cutter
+
+obj/item/stack/special_node/divet
+ desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner."
+ name = "divet nodes"
+ singular_name = "divet node"
+ color = "#6e6ec1"
+
+obj/item/stack/special_node/evil
+ desc = "A strange power note emanating with an evil aura."
+ name = "divet nodes"
+ singular_name = "divet node"
color = "#740909"
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/light.dm b/code/game/objects/items/weapons/grenades/light.dm
index bb448d443d8..fe0250e327a 100644
--- a/code/game/objects/items/weapons/grenades/light.dm
+++ b/code/game/objects/items/weapons/grenades/light.dm
@@ -4,21 +4,16 @@
icon_state = "lightgrenade"
item_state = "flashbang"
det_time = 20
- light_range = 6
+ light_range = 12
light_power = 1
light_on = FALSE
/obj/item/grenade/light/detonate()
..()
var/lifetime = rand(2 MINUTES, 4 MINUTES)
- var/color = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923")
+ var/colour = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923")
playsound(src, 'sound/effects/snap.ogg', 80, 1)
audible_message("\The [src] detonates with a sharp crack!")
- set_light_color(color)
+ set_light_color(colour)
QDEL_IN(src, lifetime)
-
- if (active)
- set_light_on(TRUE)
- else
- set_light_on(FALSE)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/tools/pickaxe.dm b/code/game/objects/items/weapons/tools/pickaxe.dm
index a0b5aedf8f6..46c804ea335 100644
--- a/code/game/objects/items/weapons/tools/pickaxe.dm
+++ b/code/game/objects/items/weapons/tools/pickaxe.dm
@@ -87,7 +87,7 @@
force = WEAPON_FORCE_NORMAL
throwforce = WEAPON_FORCE_NORMAL
item_state = "ds_rocksaw0"
- w_class = ITEM_SIZE_NORMAL
+ w_class = ITEM_SIZE_HUGE
matter = list(MATERIAL_STEEL = 1200, MATERIAL_PLASTIC = 800)
tool_qualities = list()
switched_on_qualities = list(QUALITY_DIGGING = 50, QUALITY_DRILLING = 20, QUALITY_EXCAVATION = 15, QUALITY_SAWING = 60, QUALITY_CUTTING = 50)
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 17d840d88c7..e6fe564db23 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -94,9 +94,9 @@ something, make sure it's not in one of the other lists.*/
/obj/random/scaf/item_to_spawn() //total weight = 100
return pickweight(list(
- /obj/item/rig/advanced/arctic = 4,
- /obj/item/rig/pcsi/elite = 4,
- /obj/item/rig/pcsi/legionnaire = 4,
+ /obj/item/rig/arctic = 4,
+ /obj/item/rig/scaf/elite = 4,
+ /obj/item/rig/scaf/legionnaire = 4,
/obj/item/gun/projectile/automatic/bullpup = 10,
/obj/item/ammo_magazine/bullpup = 18,
/obj/random/medical = 15,
diff --git a/code/game/objects/random/rig.dm b/code/game/objects/random/rig.dm
index f9fb99a4515..96e06ae14f6 100644
--- a/code/game/objects/random/rig.dm
+++ b/code/game/objects/random/rig.dm
@@ -5,21 +5,21 @@
icon_state = "generic"
/obj/random/hardsuit/item_to_spawn()
- return pickweight(list(/obj/item/rig/pcsi/security,
+ return pickweight(list(/obj/item/rig/security,
/obj/item/rig/engineering,
- /obj/item/rig/hacker,
/obj/item/rig/mining,
- /obj/item/rig/excavation = 0.5,
- /obj/item/rig/intermediate = 0.5,
- /obj/item/rig/vintage = 0.1,
- /obj/item/rig/advanced = 0.1,
- /obj/item/rig/advanced/engineering = 0.1,
- /obj/item/rig/advanced/mining = 0.1,
- /obj/item/rig/riot = 0.2,
- /obj/item/rig/riot/patrol = 0.2,
- /obj/item/rig/civilian/slim,
- /obj/item/rig/civilian/inap = 0.1,
+ /obj/item/rig/excavation,
+ /obj/item/rig/vintage = 0.2,
+ /obj/item/rig/advanced = 0.1, //At 0.5, they are still very common, shouldn't even be "misplaced" anyway.
+ /obj/item/rig/patrol = 0.1,
+ /obj/item/rig/industrial,
+ /obj/item/rig/eva,
+ /obj/item/rig/civilian,
/obj/item/rig/medical = 0.8,
+ /obj/item/rig/light/internalaffairs = 0.01,
+ /obj/item/rig/ce = 0.01,
+ /obj/item/rig/hazmat = 0.01,
+ /obj/item/rig/hazard = 0.01,
/obj/item/rig/clown = 0.01))
@@ -62,13 +62,12 @@
/obj/random/rig_module/rare
possible_spawns = list(/obj/item/rig_module/kinesis/advanced = 0.5,
/obj/item/rig_module/healthbar/advanced = 1,
- /obj/item/rig_module/kinesis/advanced = 0.5,
/obj/item/rig_module/storage/heavy = 0.5,
/obj/item/rig_module/vision/thermal = 0.2,
- /obj/item/rig_module/vision/multi = 0.1,
/obj/item/rig_module/chem_dispenser/inaprovaline = 0.1,
/obj/item/rig_module/chem_dispenser/ninja = 0.2,
/obj/item/rig_module/self_destruct = 0.2,
+ /obj/item/rig_module/power_sink = 0.5,
/obj/item/rig_module/grenade_launcher = 0.2,
/obj/item/rig_module/grenade_launcher/smoke = 0.5,
/obj/item/rig_module/grenade_launcher/mfoam = 0.5,
diff --git a/code/game/objects/random/weapons.dm b/code/game/objects/random/weapons.dm
index 6c63540e9cd..960f2a4020f 100644
--- a/code/game/objects/random/weapons.dm
+++ b/code/game/objects/random/weapons.dm
@@ -41,7 +41,6 @@
return pickweight(list(
/obj/item/gun/projectile/ripper = 0.8,
/obj/item/gun/energy/forcegun = 1,
- /obj/item/gun/projectile/rivet = 0.8,,
/obj/item/gun/energy/cutter = 2,
/obj/item/gun/energy/cutter/plasma = 0.8,
/obj/item/gun/energy/cutter/rending = 0.4,
@@ -70,7 +69,6 @@
/obj/item/ammo_magazine/pulse/df = 0.3,
/obj/item/cell/plasmacutter = 3,
/obj/item/ammo_magazine/sawblades = 1.2,
- /obj/item/ammo_magazine/rivet = 1,
///obj/item/ammo_magazine/bullpup = 1,
/obj/item/cell/force = 1,
/obj/item/ammo_magazine/seeker = 0.6,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 2848d2a36eb..c711b11956e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -13,7 +13,7 @@
new/datum/atom_creator/simple(/obj/item/storage/backpack/dufflebag/eng, 50),
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/blueprints,
- /obj/item/rig/advanced/engineering,
+ /obj/item/rig/advanced,
/obj/item/clothing/under/deadspace/engineer,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/welding,
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 2b07fe73bca..9328e4a8b00 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -44,14 +44,14 @@
if ("tank")
new /obj/item/tank/emergency/oxygen/engi(src)
new /obj/item/tank/emergency/oxygen/engi(src)
- new /obj/item/rig/emergency/astro(src)
+ new /obj/item/rig/emergency(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/random/tool_upgrade(src)
if ("large")
new /obj/item/tank/emergency/oxygen/double(src)
new /obj/item/tank/emergency/oxygen/double(src)
- new /obj/item/rig/emergency/astro(src)
+ new /obj/item/rig/emergency(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/oxycandle(src)
@@ -59,7 +59,7 @@
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/tank/emergency/oxygen/engi(src)
new /obj/item/tank/emergency/oxygen/engi(src)
- new /obj/item/rig/emergency/astro(src)
+ new /obj/item/rig/emergency(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/storage/firstaid/o2(src)
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 0671e05daed..9cb0f3083e9 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -391,6 +391,8 @@
return 1
/obj/item/rig_module/maneuvering_jets/activate()
+ if(!..())
+ return
if(active)
return 0
diff --git a/code/modules/clothing/spacesuits/rig/suits/advanced.dm b/code/modules/clothing/spacesuits/rig/suits/advanced.dm
index c16dfb02e41..80cc38d3052 100644
--- a/code/modules/clothing/spacesuits/rig/suits/advanced.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/advanced.dm
@@ -1,74 +1,75 @@
-/*
- Advanced RIG
-
- High quality all around. Lightweight, good protection, no real drawbacks. The next generation of awesome
-*/
-
-/obj/item/rig/advanced
- name = "Advanced RIG"
- desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities"
- icon_state = "ds_advanced_rig"
-
- //Armor values are slightly higher than security rig in all categories
- armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95)
- offline_slowdown = RIG_VERY_HEAVY
- online_slowdown = RIG_LIGHT
- acid_resistance = 3 //Contains a fair bit of plastic
-
- chest_type = /obj/item/clothing/suit/space/rig/advanced
- helm_type = /obj/item/clothing/head/helmet/space/rig/advanced
- boot_type = /obj/item/clothing/shoes/magboots/rig/advanced
- glove_type = /obj/item/clothing/gloves/rig/advanced
-
-
- initial_modules = list(
- /obj/item/rig_module/healthbar/advanced,
- /obj/item/rig_module/storage/heavy,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/meson,
- /obj/item/rig_module/kinesis/advanced,
- /obj/item/rig_module/hotswap,
- /obj/item/rig_module/power_sink
- )
-
-/obj/item/clothing/head/helmet/space/rig/advanced
- name = "helmet"
-
-/obj/item/clothing/suit/space/rig/advanced
- name = "suit"
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/gloves/rig/advanced
- name = "insulated gloves"
- desc = "These gloves will protect the wearer from electric shocks."
- siemens_coefficient = 0
-
-/obj/item/clothing/shoes/magboots/rig/advanced
- name = "boots"
-
-/obj/item/rig/advanced/maxstone
- name = "Advanced Engineering RIG"
- desc = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights."
- icon_state = "ds_advanced_rig_stone"
-
-/obj/item/rig/advanced/banditofdoom
- name = "Evangelion RIG"
- desc = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters."
- icon_state = "banditofdoom_rig"
-
-/obj/item/rig/advanced/dad
- name = "Elite Diving RIG"
- desc = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
- icon_state = "elite_diving_rig"
-
-/obj/item/rig/advanced/sister
- name = "Strange Diving RIG"
- desc = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
- icon_state = "sister_rig"
-
-/obj/item/rig/advanced/tarnished
- name = "Tarnished RIG"
- desc = "A rig made from the reforged armor of his family that was passed from generation to generations for decades."
- icon_state = "tarnished"
+/*
+ Advanced RIG
+
+ High quality all around. Lightweight, good protection, no real drawbacks. The next generation of awesome
+*/
+
+/obj/item/rig/advanced
+ name = "Advanced RIG"
+ desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities"
+ icon_state = "ds_advanced_rig"
+
+ //Armor values are slightly higher than security rig in all categories
+ armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95)
+ offline_slowdown = RIG_VERY_HEAVY
+ online_slowdown = RIG_LIGHT
+ acid_resistance = 3 //Contains a fair bit of plastic
+
+ seal_delay = 45
+
+ chest_type = /obj/item/clothing/suit/space/rig/advanced
+ helm_type = /obj/item/clothing/head/helmet/space/rig/advanced
+ boot_type = /obj/item/clothing/shoes/magboots/rig/advanced
+ glove_type = /obj/item/clothing/gloves/rig/advanced
+
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar/advanced,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/meson,
+ /obj/item/rig_module/kinesis/advanced,
+ /obj/item/rig_module/hotswap,
+ /obj/item/rig_module/power_sink
+ )
+
+/obj/item/clothing/head/helmet/space/rig/advanced
+ name = "helmet"
+
+/obj/item/clothing/suit/space/rig/advanced
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/advanced
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/advanced
+ name = "boots"
+
+
+/obj/item/rig/advanced/maxstone
+ name = "Advanced Engineering RIG"
+ desc = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights."
+ icon_state = "ds_advanced_rig_stone"
+
+/obj/item/rig/advanced/banditofdoom
+ name = "Evangelion RIG"
+ desc = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters."
+ icon_state = "banditofdoom_rig"
+ online_slowdown = RIG_FLEXIBLE
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar/advanced,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/meson,
+ /obj/item/rig_module/kinesis/advanced,
+ /obj/item/rig_module/hotswap,
+ /obj/item/rig_module/power_sink,
+ /obj/item/rig_module/voice
+ )
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/arctic.dm b/code/modules/clothing/spacesuits/rig/suits/arctic.dm
index e85d5e115ae..6d8cefdf124 100644
--- a/code/modules/clothing/spacesuits/rig/suits/arctic.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/arctic.dm
@@ -1,13 +1,29 @@
-/obj/item/rig/advanced/arctic
+/obj/item/rig/arctic
name = "Arctic Survival RIG"
desc = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra."
icon_state = "arctic_survival_rig"
+ armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95) //cut and paste from advanced suit, no change
+ offline_slowdown = RIG_VERY_HEAVY //this thing's a winter coat and armor at the same time!
+ online_slowdown = RIG_LIGHT //but it's also purpose-built for staying mobile
+ acid_resistance = 3
+ seal_delay = 45
chest_type = /obj/item/clothing/suit/space/rig/arctic
helm_type = /obj/item/clothing/head/helmet/space/rig/arctic
boot_type = /obj/item/clothing/shoes/magboots/rig/arctic
glove_type = /obj/item/clothing/gloves/rig/arctic
+ initial_modules = list(
+ /obj/item/rig_module/healthbar/advanced,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/grenade_launcher/light,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/meson,
+ /obj/item/rig_module/kinesis/advanced,
+ /obj/item/rig_module/hotswap,
+ /obj/item/rig_module/power_sink
+ )
+
/obj/item/clothing/head/helmet/space/rig/arctic
light_overlay = "arctic_light"
@@ -21,10 +37,9 @@
siemens_coefficient = 0
/obj/item/clothing/shoes/magboots/rig/arctic
- name = "boots"
-/obj/item/rig/advanced/arctic/witness //donor variant - basically the same as the advanced suit, but looks dope
+/obj/item/rig/arctic/witness //donor variant - basically the same as the advanced suit, but looks dope
name = "witness RIG"
desc = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold."
icon_state = "witness_rig"
-
+
diff --git a/code/modules/clothing/spacesuits/rig/suits/civilian.dm b/code/modules/clothing/spacesuits/rig/suits/civilian.dm
index 0f628f8b7b6..5820ce345cd 100644
--- a/code/modules/clothing/spacesuits/rig/suits/civilian.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/civilian.dm
@@ -22,19 +22,24 @@
name = "CEC Slim Civilian RIG"
desc = "Slim variant of the Resource Integrated Gear. Standard issue for all CEC employees."
icon_state = "ds_civilian_rig_slim"
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 10, rad = 10)
+ offline_slowdown = 1
+ online_slowdown = RIG_VERY_LIGHT
-/obj/item/rig/civilian/inap
- name = "Inap RIG"
- desc = "Resource Integrated Gear, made of pure inap."
- icon_state = "inapprig"
+ max_health = 1500
+
+ chest_type = null
+ helm_type = null
+ boot_type = null
+ glove_type = null
/obj/item/rig/emergency
name = "Emergency RIG"
desc = "A light, emergency rig for use by non-qualified personnel in the case of emergency decompression."
icon_state = "eva_suit"
- armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 10, rad = 50)
- offline_slowdown = 1
- online_slowdown = RIG_LIGHT
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 50)
+ online_slowdown = 1
+ offline_slowdown = 3
chest_type = /obj/item/clothing/suit/space/rig/emergency
helm_type = /obj/item/clothing/head/helmet/space/rig/emergency
@@ -43,9 +48,7 @@
initial_modules = list(
/obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage/light,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/maneuvering_jets
)
/obj/item/clothing/suit/space/rig/emergency
@@ -60,15 +63,6 @@
/obj/item/clothing/head/helmet/space/rig/emergency
name = "helmet"
-/obj/item/rig/emergency/astro
- name = "Astronaut RIG"
- desc = "A light, emergency rig for use by non-qualified personnel in the case of emergency decompression."
- icon_state = "ds_astro_rig"
-
- helm_type = /obj/item/clothing/head/helmet/space/rig/emergency/astro
-/obj/item/clothing/head/helmet/space/rig/emergency/astro
- light_overlay = "ds_astro_rig_light"
-
/obj/item/rig/clown
name = "Clown RIG"
desc = "Honk honk."
diff --git a/code/modules/clothing/spacesuits/rig/suits/cseco.dm b/code/modules/clothing/spacesuits/rig/suits/cseco.dm
index 45c49edb9f2..4daa87fc713 100644
--- a/code/modules/clothing/spacesuits/rig/suits/cseco.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/cseco.dm
@@ -1,44 +1,42 @@
-/obj/item/rig/cseco
- name = "P-Sec Commander RIG"
- desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments. This instance was designed specially for CSECO."
- icon_state = "pcsi_riot_rig"
- armor = list(melee = 70, bullet = 67, laser = 60, energy = 30, bomb = 75, bio = 100, rad = 60)
- online_slowdown = RIG_MEDIUM
- acid_resistance = 2 //Contains a fair bit of plastic
- allowed = list(/obj/item/shield/riot)
-
- chest_type = /obj/item/clothing/suit/space/rig/cseco
- helm_type = /obj/item/clothing/head/helmet/space/rig/cseco
- boot_type = /obj/item/clothing/shoes/magboots/rig/cseco
- glove_type = /obj/item/clothing/gloves/rig/cseco
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage/heavy,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
- /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
- /obj/item/rig_module/device/pen,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/nvgsec
- )
-
-/obj/item/rig/cseco/Initialize()
- . = ..()
- if(istype(GLOB.using_map, /datum/map/ishimura))
- name = "P.C.S.I Commander RIG"
-
-/obj/item/clothing/suit/space/rig/cseco
- name = "armor"
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/gloves/rig/cseco
- name = "insulated gauntlets"
- desc = "These gloves will protect the wearer from electric shocks."
- siemens_coefficient = 0
-
-/obj/item/clothing/shoes/magboots/rig/cseco
- name = "boots"
-
-/obj/item/clothing/head/helmet/space/rig/cseco
- name = "helmet"
+/obj/item/rig/cseco
+ name = "P-Sec Commander RIG"
+ desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments. This instance was designed specially for CSECO."
+ icon_state = "pcsi_riot_rig"
+ armor = list(melee = 70, bullet = 67, laser = 60, energy = 30, bomb = 75, bio = 100, rad = 60)
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 2 //Contains a fair bit of plastic
+ allowed = list(/obj/item/shield/riot)
+
+ chest_type = /obj/item/clothing/suit/space/rig/cseco
+ helm_type = /obj/item/clothing/head/helmet/space/rig/cseco
+ boot_type = /obj/item/clothing/shoes/magboots/rig/cseco
+ glove_type = /obj/item/clothing/gloves/rig/cseco
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
+ /obj/item/rig_module/device/pen,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/rig/cseco/Initialize()
+ . = ..()
+ if(istype(GLOB.using_map, /datum/map/ishimura))
+ name = "P.C.S.I Commander RIG"
+
+/obj/item/clothing/suit/space/rig/cseco
+ name = "armor"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/cseco
+ name = "gauntlets"
+
+/obj/item/clothing/shoes/magboots/rig/cseco
+ name = "boots"
+
+/obj/item/clothing/head/helmet/space/rig/cseco
+ name = "helmet"
diff --git a/code/modules/clothing/spacesuits/rig/suits/engineering.dm b/code/modules/clothing/spacesuits/rig/suits/engineering.dm
index 43c7d390fcb..b4165dcc456 100644
--- a/code/modules/clothing/spacesuits/rig/suits/engineering.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/engineering.dm
@@ -1,10 +1,10 @@
/obj/item/rig/engineering
- name = "Standard Engineering RIG"
- desc = "the most basic form of Resource Integration Gear available for engineers throughout the course of their employment."
+ name = "Engineering RIG"
+ desc = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
icon_state = "ds_engineering_rig"
- armor = list(melee = 45, bullet = 45, laser = 45, energy = 25, bomb = 60, bio = 100, rad = 75)
+ armor = list(melee = 45, bullet = 50, laser = 50, energy = 25, bomb = 60, bio = 100, rad = 75)
offline_slowdown = 4
- online_slowdown = RIG_MEDIUM
+ online_slowdown = RIG_HEAVY
acid_resistance = 2 //Contains a fair bit of plastic
chest_type = /obj/item/clothing/suit/space/rig/engineering
@@ -38,73 +38,15 @@
name = "helmet"
/obj/item/rig/engineering/forged
- name = "Standard Forged Engineering RIG"
+ name = "Forged Engineering RIG"
icon_state = "forged_rig"
-/obj/item/rig/engineering/forged_new
- name = "Standard Forged Engineering RIG"
- icon_state = "engineer_standard_forged_rig"
+ chest_type = /obj/item/clothing/suit/space/rig/engineering/forged
+ helm_type = /obj/item/clothing/head/helmet/space/rig/engineering/forged
+ boot_type = /obj/item/clothing/shoes/magboots/rig/engineering/forged
+ glove_type = /obj/item/clothing/gloves/rig/engineering/forged
-
-/// int
-
-
-
-/obj/item/rig/intermediate
- name = "Intermediate Engineering RIG"
- desc = "A intermediate engineering suit, issued to class 2 engineers; designed for shipboard engineering."
- icon_state = "engineer_intermediate_rig"
- armor = list(melee = 53.25, bullet = 53.75, laser = 53.75, energy = 27.5, bomb = 67.5, bio = 100, rad = 85)
- online_slowdown = RIG_FLEXIBLE
- acid_resistance = 2.5
-
- chest_type = /obj/item/clothing/suit/space/rig/intermediate
- helm_type = /obj/item/clothing/head/helmet/space/rig/intermediate
- boot_type = /obj/item/clothing/shoes/magboots/rig/intermediate
- glove_type = /obj/item/clothing/gloves/rig/intermediate
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/meson,
- /obj/item/rig_module/kinesis,
- /obj/item/rig_module/hotswap,
- /obj/item/rig_module/power_sink
- )
-
-/obj/item/clothing/suit/space/rig/intermediate
- name = "suit"
-
-/obj/item/clothing/gloves/rig/intermediate
- name = "insulated gloves"
- desc = "These gloves will protect the wearer from electric shocks."
- siemens_coefficient = 0
-
-/obj/item/clothing/shoes/magboots/rig/intermediate
- name = "shoes"
-
-/obj/item/clothing/head/helmet/space/rig/intermediate
- name = "helmet"
-
-/obj/item/rig/intermediate/forged
- name = "Intermediate Forged Engineering RIG"
- icon_state = "engineer_intermediate_forged_rig"
-
-/obj/item/rig/intermediate/survivor
- name = "Intermediate Survivor Engineering RIG"
- icon_state = "intermediate_engineer_survivor_rig"
-
-// adv
-
-
-/obj/item/rig/advanced/engineering
- name = "Advanced Engineering RIG"
- desc = "Exclusive only to upper class engineers who have passed rigorous training and performed multiple repairs in hostile environments."
- icon_state = "advanced_engineer_rig"
-
-/obj/item/rig/advanced/forged
- name = "Forged Advanced Engineering RIG"
- desc = "Exclusive only to upper class engineers who have passed rigorous training and performed multiple repairs in hostile environments."
- icon_state = "engineer_advanced_forged_rig"
+/obj/item/clothing/suit/space/rig/engineering/forged
+/obj/item/clothing/gloves/rig/engineering/forged
+/obj/item/clothing/shoes/magboots/rig/engineering/forged
+/obj/item/clothing/head/helmet/space/rig/engineering/forged
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/excavation.dm b/code/modules/clothing/spacesuits/rig/suits/excavation.dm
new file mode 100644
index 00000000000..58c7d47d907
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/excavation.dm
@@ -0,0 +1,31 @@
+/obj/item/rig/excavation
+ name = "Excavation RIG"
+ desc = "A modified, lightweight version of the engineering suit. Perfect for quick operations."
+ icon_state = "excavation_rig"
+ armor = list(melee = 44, bullet = 44, laser = 40, energy = 15, bomb = 60, bio = 100, rad = 50)
+ online_slowdown = RIG_FLEXIBLE
+
+ chest_type = /obj/item/clothing/suit/space/rig/excavation
+ helm_type = /obj/item/clothing/head/helmet/space/rig/excavation
+ boot_type = /obj/item/clothing/shoes/magboots/rig/excavation
+ glove_type = /obj/item/clothing/gloves/rig/excavation
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage/light,
+ /obj/item/rig_module/device/orescanner,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/meson,
+ )
+
+/obj/item/clothing/suit/space/rig/excavation
+ name = "suit"
+
+/obj/item/clothing/gloves/rig/excavation
+ name = "gloves"
+
+/obj/item/clothing/shoes/magboots/rig/excavation
+ name = "shoes"
+
+/obj/item/clothing/head/helmet/space/rig/excavation
+ name = "hood"
diff --git a/code/modules/clothing/spacesuits/rig/suits/flesh.dm b/code/modules/clothing/spacesuits/rig/suits/flesh.dm
new file mode 100644
index 00000000000..919f7341970
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/flesh.dm
@@ -0,0 +1,19 @@
+// Patreon rig
+
+/obj/item/rig/zealot/flesh
+ name = "Bloated RIG"
+ desc = "A horrifying amalgamation of flesh and a sparse amount of mechanical components, loosely resembling a rig."
+ icon_state = "flesh"
+
+ chest_type = /obj/item/clothing/suit/space/rig/zealot/flesh
+ helm_type = /obj/item/clothing/head/helmet/space/rig/zealot/flesh
+ boot_type = /obj/item/clothing/shoes/magboots/rig/zealot/flesh
+ glove_type = /obj/item/clothing/gloves/rig/zealot/flesh
+
+/obj/item/clothing/head/helmet/space/rig/zealot/flesh
+
+/obj/item/clothing/suit/space/rig/zealot/flesh
+
+/obj/item/clothing/gloves/rig/zealot/flesh
+
+/obj/item/clothing/shoes/magboots/rig/zealot/flesh
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/marksman.dm b/code/modules/clothing/spacesuits/rig/suits/marksman.dm
index a7197305d29..78a7793fbc4 100644
--- a/code/modules/clothing/spacesuits/rig/suits/marksman.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/marksman.dm
@@ -36,9 +36,4 @@
/obj/item/clothing/head/helmet/space/rig/marksman
name = "helmet"
- light_overlay = "wasp_light"
-
-/obj/item/rig/marksman/wasp
- name = "Wasp RIG"
- desc = "A lightweight and flexible armoured rig suit."
- icon_state = "wasp_rig"
\ No newline at end of file
+ light_overlay = "wasp_light"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/mining.dm b/code/modules/clothing/spacesuits/rig/suits/mining.dm
index 04d3190fc60..ba94d8c5063 100644
--- a/code/modules/clothing/spacesuits/rig/suits/mining.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/mining.dm
@@ -1,10 +1,9 @@
/obj/item/rig/mining
- name = "Standard Mining RIG"
- desc = "A standard issued mining suit, issued to class 1 miners; Commonly used during planet cracking operations."
+ name = "Hazard Mining RIG"
+ desc = "A cheaper version of the engineering suit. Commonly used during planet cracking operations."
icon_state = "ds_mining_rig"
armor = list(melee = 43.5, bullet = 42.5, laser = 42.5, energy = 15, bomb = 70, bio = 100, rad = 50)
- online_slowdown = RIG_MEDIUM
- acid_resistance = 2
+ online_slowdown = RIG_HEAVY
chest_type = /obj/item/clothing/suit/space/rig/mining
helm_type = /obj/item/clothing/head/helmet/space/rig/mining
@@ -30,53 +29,3 @@
/obj/item/clothing/head/helmet/space/rig/mining
name = "hood"
-
-/obj/item/rig/excavation
- name = "Intermediate Mining RIG"
- desc = "Exclusive only to class 2 miners and is a standard equipment when working in hostile environments or during a hazardous mining operation."
- icon_state = "excavation_rig"
- armor = list(melee = 51.75, bullet = 51.25, laser = 51.25, energy = 22.5, bomb = 67.5, bio = 100, rad = 72.5)
- online_slowdown = RIG_FLEXIBLE
- acid_resistance = 2.5
-
- chest_type = /obj/item/clothing/suit/space/rig/excavation
- helm_type = /obj/item/clothing/head/helmet/space/rig/excavation
- boot_type = /obj/item/clothing/shoes/magboots/rig/excavation
- glove_type = /obj/item/clothing/gloves/rig/excavation
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage,
- /obj/item/rig_module/device/orescanner,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/meson,
- )
-
-/obj/item/clothing/suit/space/rig/excavation
- name = "suit"
-
-/obj/item/clothing/gloves/rig/excavation
- name = "gloves"
-
-/obj/item/clothing/shoes/magboots/rig/excavation
- name = "shoes"
-
-/obj/item/clothing/head/helmet/space/rig/excavation
- name = "hood"
-
-/obj/item/rig/advanced/mining
- name = "Advanced Mining RIG"
- desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities"
- icon_state = "advanced_miner_rig"
-
- initial_modules = list(
- /obj/item/rig_module/healthbar/advanced,
- /obj/item/rig_module/storage/heavy,
- /obj/item/rig_module/grenade_launcher/light,
- /obj/item/rig_module/device/orescanner,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/meson,
- /obj/item/rig_module/kinesis/advanced,
- /obj/item/rig_module/hotswap,
- /obj/item/rig_module/power_sink
- )
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/patrol.dm b/code/modules/clothing/spacesuits/rig/suits/patrol.dm
new file mode 100644
index 00000000000..d50ad56aec0
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/patrol.dm
@@ -0,0 +1,41 @@
+
+/obj/item/rig/patrol
+ name = "Patrol RIG"
+ desc = "A very lightweight yet reasonably armoured suit, designed for long journeys on foot."
+ icon_state = "patrol"
+ armor = list(melee = 54.5, bullet = 54.5, laser = 60, energy = 25, bomb = 50, bio = 100, rad = 60)
+ online_slowdown = RIG_FLEXIBLE
+
+ chest_type = /obj/item/clothing/suit/space/rig/patrol
+ helm_type = /obj/item/clothing/head/helmet/space/rig/patrol
+ boot_type = /obj/item/clothing/shoes/magboots/rig/patrol
+ glove_type = /obj/item/clothing/gloves/rig/patrol
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/maneuvering_jets,
+ )
+
+ /*
+ Far Future TODO
+ Give patrol rig better cold resistance, making it good for wilderness survival on tau volantis
+
+ */
+
+/obj/item/clothing/suit/space/rig/patrol
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/patrol
+ name = "gloves"
+
+/obj/item/clothing/shoes/magboots/rig/patrol
+ name = "boots"
+
+/obj/item/clothing/head/helmet/space/rig/patrol
+ name = "helmet"
+
+
+
diff --git a/code/modules/clothing/spacesuits/rig/suits/riot.dm b/code/modules/clothing/spacesuits/rig/suits/riot.dm
new file mode 100644
index 00000000000..70a11974053
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/riot.dm
@@ -0,0 +1,37 @@
+/obj/item/rig/riot
+ name = "Riot RIG"
+ desc = "A heavy duty and armoured rig suit, designed for riot control and shipboard disciplinary enforcement. This suit is commonly found among security officers on the Sprawl, and in lesser capacity on private ships and stations."
+ icon_state = "ds_riot_rig"
+ armor = list(melee = 65, bullet = 60, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60)
+ online_slowdown = RIG_VERY_HEAVY
+ acid_resistance = 2 //Contains a fair bit of plastic
+ allowed = list(/obj/item/shield/riot)
+
+ chest_type = /obj/item/clothing/suit/space/rig/riot
+ helm_type = /obj/item/clothing/head/helmet/space/rig/riot
+ boot_type = /obj/item/clothing/shoes/magboots/rig/riot
+ glove_type = /obj/item/clothing/gloves/rig/riot
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
+ /obj/item/rig_module/device/pen,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/clothing/suit/space/rig/riot
+ name = "armor"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/riot
+ name = "gauntlets"
+
+/obj/item/clothing/shoes/magboots/rig/riot
+ name = "boots"
+
+/obj/item/clothing/head/helmet/space/rig/riot
+ name = "helmet"
diff --git a/code/modules/clothing/spacesuits/rig/suits/scaf.dm b/code/modules/clothing/spacesuits/rig/suits/scaf.dm
index 9bfe1d9979f..ef2d12cad7d 100644
--- a/code/modules/clothing/spacesuits/rig/suits/scaf.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/scaf.dm
@@ -2,23 +2,64 @@
// - These are not intended to go anywhere but the store. Do not add them to random lists. - Snype
//SCAF Elite RIG
-/obj/item/rig/pcsi/scaf
+/obj/item/rig/scaf
name = "Refurbished SCAF RIG"
desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
icon_state = "scaf_elite_rig"
-/obj/item/rig/pcsi/elite
+ //Security RIG stats
+ armor = list(melee = 57.5, bullet = 65, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60)
+
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/scaf
+ helm_type = /obj/item/clothing/head/helmet/space/rig/scaf
+ boot_type = /obj/item/clothing/shoes/magboots/rig/scaf
+ glove_type = /obj/item/clothing/gloves/rig/scaf
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light //These grenades are harmless illumination
+ )
+
+//These pieces don't need redefined for every sub-rig, their values are set procedurally from the frame
+/obj/item/clothing/head/helmet/space/rig/scaf
+
+/obj/item/clothing/suit/space/rig/scaf
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/scaf
+
+/obj/item/clothing/shoes/magboots/rig/scaf
+
+/obj/item/rig/scaf/elite
name = "elite SCAF RIG"
icon_state = "scaf_elite_rig"
+
//SCAF Legionnaire RIG
-/obj/item/rig/pcsi/legionnaire
+/obj/item/rig/scaf/legionnaire
name = "Refurbished SCAF Expeditionary RIG"
desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
icon_state = "scaf_legionnaire_rig"
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
//SCAF Sharpshooter RIG
-/obj/item/rig/pcsi/sharpshooter
+/obj/item/rig/scaf/sharpshooter
name = "Refurbished SCAF Sharpshooter RIG"
desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
icon_state = "scaf_sharpshooter_rig"
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/vision/nvgsec //Unique advantage of the Sharpshooter rig vs its counterparts.
+ )
diff --git a/code/modules/clothing/spacesuits/rig/suits/sea.dm b/code/modules/clothing/spacesuits/rig/suits/sea.dm
new file mode 100644
index 00000000000..821341b9969
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/sea.dm
@@ -0,0 +1,83 @@
+// Patreon rig
+
+/obj/item/rig/vintage/sea
+ name = "Hazard Diving RIG"
+ desc = "The heavy-duty hazard diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces."
+ icon_state = "heavy_diving_rig"
+
+ chest_type = /obj/item/clothing/suit/space/rig/sea
+ helm_type = /obj/item/clothing/head/helmet/space/rig/sea
+ boot_type = /obj/item/clothing/shoes/magboots/rig/sea
+ glove_type = /obj/item/clothing/gloves/rig/sea
+
+/obj/item/clothing/head/helmet/space/rig/sea
+ name = "helmet"
+
+/obj/item/clothing/suit/space/rig/sea
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/sea
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/vintage/heavy
+ name = "boots"
+
+// Patreon rig
+
+/obj/item/rig/advanced/dad
+ name = "Elite Diving RIG"
+ desc = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
+ icon_state = "elite_diving_rig"
+
+ chest_type = /obj/item/clothing/suit/space/rig/sea/dad
+ helm_type = /obj/item/clothing/head/helmet/space/rig/sea/dad
+ boot_type = /obj/item/clothing/shoes/magboots/rig/sea/dad
+ glove_type = /obj/item/clothing/gloves/rig/sea/dad
+
+/obj/item/clothing/head/helmet/space/rig/sea/dad
+ name = "helmet"
+
+/obj/item/clothing/suit/space/rig/sea/dad
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/sea/dad
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/sea/dad
+ name = "boots"
+
+// Patreon rig
+
+/obj/item/rig/advanced/sister
+ name = "Strange Diving RIG"
+ desc = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
+ icon_state = "sister_rig"
+
+ chest_type = /obj/item/clothing/suit/space/rig/sea/sister
+ helm_type = /obj/item/clothing/head/helmet/space/rig/sea/sister
+ boot_type = /obj/item/clothing/shoes/magboots/rig/sea/sister
+ glove_type = /obj/item/clothing/gloves/rig/sea/sister
+
+/obj/item/clothing/head/helmet/space/rig/sea/sister
+ name = "helmet"
+
+/obj/item/clothing/suit/space/rig/sea/sister
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/sea/sister
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/sea/sister
+ name = "boots"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/security.dm b/code/modules/clothing/spacesuits/rig/suits/security.dm
index bbf7f58f9a9..0ad403e8347 100644
--- a/code/modules/clothing/spacesuits/rig/suits/security.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/security.dm
@@ -1,102 +1,152 @@
-//Ishimura Sec RIGs
-//PCSI RIG
-/obj/item/rig/pcsi
- name = "PCSI RIG"
- desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments."
- icon_state = "pcsi_rig"
- armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60)
- online_slowdown = RIG_MEDIUM
- acid_resistance = 1.75 //Contains a fair bit of plastic
-
- chest_type = /obj/item/clothing/suit/space/rig/pcsi
- helm_type = /obj/item/clothing/head/helmet/space/rig/pcsi
- boot_type = /obj/item/clothing/shoes/magboots/rig/pcsi
- glove_type = /obj/item/clothing/gloves/rig/pcsi
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
- /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
- /obj/item/rig_module/device/pen,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/nvgsec
- )
-
-/obj/item/clothing/head/helmet/space/rig/pcsi
-
-/obj/item/clothing/suit/space/rig/pcsi
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/shoes/magboots/rig/pcsi
-
-/obj/item/clothing/gloves/rig/pcsi
-
-//Titan Security RIG
-/obj/item/rig/pcsi/security
- name = "Security RIG"
- desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
- icon_state = "ds_security_rig"
-
-//PCSI Patreon RIGs
-/obj/item/rig/pcsi/ruined
- name = "PCSI Survivor RIG"
- desc = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken."
- icon_state = "pcsi_rig_ruined"
-
-/obj/item/rig/pcsi/carver
- name = "Spec Ops RIG"
- desc = "A heavily armoured rig suit, designed for military use. Especially effective against bullets."
- icon_state = "carver_rig"
-
- helm_type = /obj/item/clothing/head/helmet/space/rig/carver
-
-/obj/item/clothing/head/helmet/space/rig/carver
- name = "helmet"
- light_overlay = "carver_light"
-
-//PCSI Riot RIG
-/obj/item/rig/riot
- name = "Riot RIG"
- desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments."
- icon_state = "ds_riot_rig"
- armor = list(melee = 65, bullet = 60, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60)
- online_slowdown = RIG_MEDIUM
- acid_resistance = 1.75 //Contains a fair bit of plastic
-
- chest_type = /obj/item/clothing/suit/space/rig/riot
- helm_type = /obj/item/clothing/head/helmet/space/rig/riot
- boot_type = /obj/item/clothing/shoes/magboots/rig/riot
- glove_type = /obj/item/clothing/gloves/rig/riot
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage,
- /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
- /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
- /obj/item/rig_module/device/pen,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/nvgsec
- )
-
-/obj/item/clothing/suit/space/rig/riot
- name = "suit"
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/gloves/rig/riot
- name = "gloves"
-
-/obj/item/clothing/shoes/magboots/rig/riot
- name = "boots"
-
-/obj/item/clothing/head/helmet/space/rig/riot
- name = "helmet"
-
-//PCSI Patrol RIG
-/obj/item/rig/riot/patrol
- name = "Patrol RIG"
- desc = "A very lightweight yet reasonably armoured suit, designed for long journeys on foot."
- icon_state = "patrol"
- armor = list(melee = 60, bullet = 65, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60)
+//Ishimura Sec RIGs
+//PCSI RIG
+/obj/item/rig/security/pcsi
+ name = "PCSI RIG"
+ desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments."
+ icon_state = "pcsi_rig"
+ armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60)
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/security/pcsi
+ helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi
+ boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi
+ glove_type = /obj/item/clothing/gloves/rig/security/pcsi
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
+ /obj/item/rig_module/device/pen,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/clothing/head/helmet/space/rig/security/pcsi
+
+/obj/item/clothing/suit/space/rig/security/pcsi
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/shoes/magboots/rig/security/pcsi
+
+/obj/item/clothing/gloves/rig/security/pcsi
+
+//PCSI Patreon RIGs
+/obj/item/rig/security/pcsi/ruined
+ name = "PCSI Survivor RIG"
+ desc = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken."
+ icon_state = "pcsi_rig_ruined"
+
+ chest_type = /obj/item/clothing/suit/space/rig/security/pcsi/ruined
+ helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi/ruined
+ boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi/ruined
+ glove_type = /obj/item/clothing/gloves/rig/security/pcsi/ruined
+
+/obj/item/clothing/head/helmet/space/rig/security/pcsi/ruined
+
+/obj/item/clothing/suit/space/rig/security/pcsi/ruined
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/shoes/magboots/rig/security/pcsi/ruined
+
+/obj/item/clothing/gloves/rig/security/pcsi/ruined
+
+
+/obj/item/rig/security/pcsi/carver
+ name = "Spec Ops RIG"
+ desc = "A heavily armoured rig suit, designed for military use. Especially effective against bullets."
+ icon_state = "carver_rig"
+
+ chest_type = /obj/item/clothing/suit/space/rig/carver
+ helm_type = /obj/item/clothing/head/helmet/space/rig/carver
+ boot_type = /obj/item/clothing/shoes/magboots/rig/carver
+ glove_type = /obj/item/clothing/gloves/rig/carver
+
+/obj/item/clothing/suit/space/rig/carver
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/carver
+ name = "gloves"
+
+/obj/item/clothing/shoes/magboots/rig/carver
+ name = "boots"
+
+/obj/item/clothing/head/helmet/space/rig/carver
+ name = "helmet"
+ light_overlay = "carver_light"
+
+
+//PCSI Riot RIG
+/obj/item/rig/security/pcsi/advanced
+ name = "PCSI Riot RIG"
+ desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments."
+ icon_state = "pcsi_riot_rig"
+ armor = list(melee = 62, bullet = 56, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60)
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/security/pcsi/advanced
+ helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi/advanced
+ boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi/advanced
+ glove_type = /obj/item/clothing/gloves/rig/security/pcsi/advanced
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
+ /obj/item/rig_module/device/pen,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/clothing/head/helmet/space/rig/security/pcsi/advanced
+
+/obj/item/clothing/suit/space/rig/security/pcsi/advanced
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/shoes/magboots/rig/security/pcsi/advanced
+
+/obj/item/clothing/gloves/rig/security/pcsi/advanced
+
+
+//Sprawl Sec RIGs
+//Titan Security RIG
+/obj/item/rig/security
+ name = "Security RIG"
+ desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
+ icon_state = "ds_security_rig"
+ armor = list(melee = 56.5, bullet = 60, laser = 60, energy = 25, bomb = 60, bio = 100, rad = 60)
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/security
+ helm_type = /obj/item/clothing/head/helmet/space/rig/security
+ boot_type = /obj/item/clothing/shoes/magboots/rig/security
+ glove_type = /obj/item/clothing/gloves/rig/security
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork
+ /obj/item/rig_module/device/pen,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/clothing/head/helmet/space/rig/security
+
+/obj/item/clothing/suit/space/rig/security
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/security
+
+/obj/item/clothing/shoes/magboots/rig/security
diff --git a/code/modules/clothing/spacesuits/rig/suits/tarnished.dm b/code/modules/clothing/spacesuits/rig/suits/tarnished.dm
new file mode 100644
index 00000000000..c816cf4bf50
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/tarnished.dm
@@ -0,0 +1,19 @@
+
+//patreon rig
+/obj/item/rig/advanced/tarnished
+ name = "Tarnished RIG"
+ desc = "A rig made from the reforged armor of his family that was passed from generation to generations for decades."
+ icon_state = "tarnished"
+
+ chest_type = /obj/item/clothing/suit/space/rig/tarnished
+ helm_type = /obj/item/clothing/head/helmet/space/rig/tarnished
+ boot_type = /obj/item/clothing/shoes/magboots/rig/tarnished
+ glove_type = /obj/item/clothing/gloves/rig/tarnished
+
+/obj/item/clothing/head/helmet/space/rig/tarnished
+
+/obj/item/clothing/suit/space/rig/tarnished
+
+/obj/item/clothing/gloves/rig/tarnished
+
+/obj/item/clothing/shoes/magboots/rig/tarnished
diff --git a/code/modules/clothing/spacesuits/rig/suits/unitologist.dm b/code/modules/clothing/spacesuits/rig/suits/unitologist.dm
index f40ea40f15d..7e6b61b3ecd 100644
--- a/code/modules/clothing/spacesuits/rig/suits/unitologist.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/unitologist.dm
@@ -1,36 +1,30 @@
-/obj/item/rig/zealot
- name = "Zealot RIG"
- desc = "An security rig, it has been repainted in black and crimson colours. There are unitologist markings across the suit."
- icon_state = "zealot_rig"
- armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60)
- online_slowdown = RIG_MEDIUM
- acid_resistance = 1.75 //Contains a fair bit of plastic
-
- chest_type = /obj/item/clothing/suit/space/rig/zealot
- helm_type = /obj/item/clothing/head/helmet/space/rig/zealot
- boot_type = /obj/item/clothing/shoes/magboots/rig/zealot
- glove_type = /obj/item/clothing/gloves/rig/zealot
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage,
- /obj/item/rig_module/grenade_launcher/military,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/nvgsec
- )
-
-/obj/item/clothing/head/helmet/space/rig/zealot
- light_overlay = "zealothelm_light"
-
-/obj/item/clothing/suit/space/rig/zealot
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/gloves/rig/zealot
-
-/obj/item/clothing/shoes/magboots/rig/zealot
-/obj/item/rig/zealot/flesh
- name = "Bloated RIG"
- desc = "A horrifying amalgamation of flesh and a sparse amount of mechanical components, loosely resembling a rig."
- icon_state = "flesh"
-
+/obj/item/rig/zealot
+ name = "Zealot RIG"
+ desc = "An old combat RIG used by SCAF over two hundred years ago. The armour has seen some wear but still functions as it should, it has been repainted in black and crimson colours. There are unitologist markings across the suit."
+ icon_state = "zealot_rig"
+ armor = list(melee = 56, bullet = 60, laser = 30, energy = 20, bomb = 30, bio = 100, rad = 40)
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 1.75 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/zealot
+ helm_type = /obj/item/clothing/head/helmet/space/rig/zealot
+ boot_type = /obj/item/clothing/shoes/magboots/rig/zealot
+ glove_type = /obj/item/clothing/gloves/rig/zealot
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/vision/nvgsec
+ )
+
+/obj/item/clothing/head/helmet/space/rig/zealot
+ light_overlay = "zealothelm_light"
+
+/obj/item/clothing/suit/space/rig/zealot
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/zealot
+
+/obj/item/clothing/shoes/magboots/rig/zealot
diff --git a/code/modules/clothing/spacesuits/rig/suits/vintage.dm b/code/modules/clothing/spacesuits/rig/suits/vintage.dm
index f8df618b1fc..0b57fb23b89 100644
--- a/code/modules/clothing/spacesuits/rig/suits/vintage.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/vintage.dm
@@ -1,49 +1,65 @@
-/obj/item/rig/vintage
- name = "Antique CEC RIG"
- desc = "An extremely bulky, durable vintage suit that has mostly been replaced by sleeker modern designs. Some collectors still value the good old days though."
- icon_state = "vintage_rig"
- armor = list(melee = 66.5, bullet = 70, laser = 57.5, energy = 25, bomb = 90, bio = 100, rad = 70)
- offline_slowdown = RIG_VERY_HEAVY
- online_slowdown = RIG_SUPER_HEAVY
-
- max_health = 4000
-
- chest_type = /obj/item/clothing/suit/space/rig/vintage
- helm_type = /obj/item/clothing/head/helmet/space/rig/vintage
- boot_type = /obj/item/clothing/shoes/magboots/rig/vintage
- glove_type = /obj/item/clothing/gloves/rig/vintage
-
- initial_modules = list(
- /obj/item/rig_module/healthbar,
- /obj/item/rig_module/storage/heavy,
- /obj/item/rig_module/device/orescanner,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/vision/meson
- )
-
-/obj/item/clothing/suit/space/rig/vintage
- name = "suit"
- valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
- restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
-
-/obj/item/clothing/head/helmet/space/rig/vintage
- name = "helmet"
-
-/obj/item/clothing/gloves/rig/vintage
- name = "insulated gloves"
- desc = "These gloves will protect the wearer from electric shocks."
- siemens_coefficient = 0
-
-/obj/item/clothing/shoes/magboots/rig/vintage
- name = "boots"
-
-/obj/item/rig/vintage/heavy
- name = "Antique Heavy-Duty CEC RIG"
- desc = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers."
- icon_state = "vintage_suit"
-
-/obj/item/rig/vintage/sea
- name = "Hazard Diving RIG"
- desc = "The heavy-duty hazard diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces."
- icon_state = "heavy_diving_rig"
-
+/obj/item/rig/vintage
+ name = "Antique CEC RIG"
+ desc = "An extremely bulky, durable vintage suit that has mostly been replaced by sleeker modern designs. Some collectors still value the good old days though."
+ icon_state = "vintage_rig"
+ armor = list(melee = 66.5, bullet = 70, laser = 57.5, energy = 25, bomb = 90, bio = 100, rad = 70)
+ offline_slowdown = 5
+ online_slowdown = RIG_SUPER_HEAVY
+
+ max_health = 4000
+
+ chest_type = /obj/item/clothing/suit/space/rig/vintage
+ helm_type = /obj/item/clothing/head/helmet/space/rig/vintage
+ boot_type = /obj/item/clothing/shoes/magboots/rig/vintage
+ glove_type = /obj/item/clothing/gloves/rig/vintage
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage/heavy,
+ /obj/item/rig_module/device/orescanner,
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/vision/meson
+ )
+
+/obj/item/clothing/suit/space/rig/vintage
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/head/helmet/space/rig/vintage
+ name = "helmet"
+
+/obj/item/clothing/gloves/rig/vintage
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/vintage
+ name = "boots"
+
+
+/obj/item/rig/vintage/heavy
+ name = "Antique Heavy-Duty CEC RIG"
+ desc = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers."
+ icon_state = "vintage_suit"
+
+ chest_type = /obj/item/clothing/suit/space/rig/vintage/heavy
+ helm_type = /obj/item/clothing/head/helmet/space/rig/vintage/heavy
+ boot_type = /obj/item/clothing/shoes/magboots/rig/vintage/heavy
+ glove_type = /obj/item/clothing/gloves/rig/vintage/heavy
+
+/obj/item/clothing/head/helmet/space/rig/vintage/heavy
+ name = "helmet"
+
+/obj/item/clothing/suit/space/rig/vintage/heavy
+ name = "suit"
+ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
+ restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S)
+
+/obj/item/clothing/gloves/rig/vintage/heavy
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/vintage/heavy
+ name = "boots"
diff --git a/code/modules/clothing/spacesuits/rig/suits/wasp.dm b/code/modules/clothing/spacesuits/rig/suits/wasp.dm
new file mode 100644
index 00000000000..cd1b95c998f
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/wasp.dm
@@ -0,0 +1,38 @@
+/obj/item/rig/wasp
+ name = "Wasp RIG"
+ desc = "A lightweight and flexible armoured rig suit, offers good protection against light impacts. Use kit on an Engineering RIG."
+ icon_state = "wasp_rig"
+ armor = list(melee = 47.5, bullet = 53, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 80)
+ offline_slowdown = 4
+ online_slowdown = RIG_MEDIUM
+ acid_resistance = 2 //Contains a fair bit of plastic
+
+ chest_type = /obj/item/clothing/suit/space/rig/wasp
+ helm_type = /obj/item/clothing/head/helmet/space/rig/wasp
+ boot_type = /obj/item/clothing/shoes/magboots/rig/wasp
+ glove_type = /obj/item/clothing/gloves/rig/wasp
+
+ initial_modules = list(
+ /obj/item/rig_module/healthbar,
+ /obj/item/rig_module/storage,
+ /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/kinesis,
+ /obj/item/rig_module/hotswap,
+ /obj/item/rig_module/power_sink
+ )
+
+/obj/item/clothing/suit/space/rig/wasp
+ name = "suit"
+
+/obj/item/clothing/gloves/rig/wasp
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shocks."
+ siemens_coefficient = 0
+
+/obj/item/clothing/shoes/magboots/rig/wasp
+ name = "boots"
+
+/obj/item/clothing/head/helmet/space/rig/wasp
+ name = "helmet"
+ light_overlay = "wasp_light"
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 58769cac71a..27629915adc 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -282,7 +282,7 @@
valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L)
restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L)
body_parts_covered = UPPER_TORSO|LOWER_TORSO
- armor = list(melee = 33, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.7
starting_accessories = list(/obj/item/clothing/accessory/armguards/ballistic, /obj/item/clothing/accessory/legguards/ballistic)
@@ -332,7 +332,7 @@
valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L)
restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L)
body_parts_covered = UPPER_TORSO|LOWER_TORSO
- armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 50, bullet = 45, laser = 60, energy = 35, bomb = 30, bio = 10, rad = 0)
siemens_coefficient = 0.5
starting_accessories = list(/obj/item/clothing/accessory/armguards/pcsi, /obj/item/clothing/accessory/legguards/pcsi)
@@ -341,9 +341,9 @@
/obj/item/clothing/suit/armor/pcsi/cec
name = "CEC standard vest"
- desc = "The Concordance Extraction Corporation's standard issue vest."
+ desc = "The Concordance Extraction Corporation's standard issue vest, doesn't offer as much protection as a P.S.C.I officer's vest."
icon_state = "cecvest"
- armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 30, bullet = 15, laser = 30, energy = 20, bomb = 20, bio = 10, rad = 0)
/* - Plan on using this for something later - Snype
/obj/item/clothing/suit/armor/tactical
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index 4d6769fdd96..4a55bb6890d 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -113,7 +113,7 @@
/obj/item/clothing/accessory/armguards/pcsi
desc = "A pair of arm pads reinforced with armor plating. Attaches to a plate carrier."
icon_state = "armguards_pcsi"
- armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 30, bullet = 20, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/accessory/armguards/merc
name = "heavy arm guards"
@@ -132,7 +132,7 @@
name = "ballistic arm guards"
desc = "A pair of armored arm pads with heavy plates to protect against ballistic projectiles."
icon_state = "armguards_ballistic"
- armor = list(melee = 33, bullet = 75, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/accessory/armguards/ablative
@@ -182,7 +182,7 @@
/obj/item/clothing/accessory/legguards/pcsi
desc = "A pair of armored leg pads. Attaches to a plate carrier."
icon_state = "legguards_pcsi"
- armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 30, bullet = 20, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/accessory/legguards/merc
name = "heavy leg guards"
@@ -202,7 +202,7 @@
name = "ballistic leg guards"
desc = "A pair of armored leg pads with heavy plates to protect against ballistic projectiles. Looks like they might impair movement."
icon_state = "legguards_ballistic"
- armor = list(melee = 33, bullet = 75, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0)
siemens_coefficient = 0.7
slowdown = 1
diff --git a/code/modules/customitems/custom_item_types.dm b/code/modules/customitems/custom_item_types.dm
index 7948f90c881..ae28495d185 100644
--- a/code/modules/customitems/custom_item_types.dm
+++ b/code/modules/customitems/custom_item_types.dm
@@ -1,395 +1,334 @@
-//Unitology Ritual Blade
-//Available to all patrons, loadout only
-/datum/patron_item/uni_knife
- name = "unitology ritual blade"
- item_path = /obj/item/material/knife/unitologist
- loadout_cost = 3
- loadout_access = ACCESS_PATRONS
- description = "A pristine blade used for religious ceremonies in the Church of Unitology.\
- Mechanically, it has the same stats as an ordinary boot knife, but it has two important special features.
\
-
\
- 1. While held in hand, the blade unlocks the unique Sacrifice execution move, allowing ritual murder of a human without head protection.
\
- A human sacrificed in this manner is worth more biomass when the necromorphs get to them later.
\
- Requires the victim to remain still, so best restrain them first. The ritual takes wquite a while, giving you ample opportunity for a short speech
\
- Please note that simply owning this knife does not make you an antag, and you shouldn't be murdering humans if you aren't an antagonist.
\
-
\
- 2. While equipped, both in your loadout at roundstart, and your inventory during the round, this blade gives an extra 15% chance to be picked for unitology antagonist roles.
\
- This effect does not override your preferences, if you have unitologists set to never then you still won't be picked"
-
-
-/*
- Guns
-*/
-/datum/patron_item/rivet
- name = "711-MarkCL Rivet Gun"
- description = "The 711-MarkCL Rivet Gun is the latest refinement from Timson Tools' long line of friendly tools. Useful for rapid repairs at a distance!"
- item_path = /obj/item/gun/projectile/rivet
- id = "rivetgun"
- store_cost = 2400
- store_access = ACCESS_PUBLIC
-
- loadout_cost = 4
- loadout_access = ACCESS_PATRONS
-
- category = CATEGORY_TOOLS
- subcategory = SUBCATEGORY_DANGEROUS_TOOLS
-
-
-/*
- RIG suits
-*/
-/datum/patron_item/max_stone_rig
- name = "Advanced Engineering RIG"
- description = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights."
- item_path = /obj/item/rig/advanced/maxstone
- id = "max_stone_rig"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-//This is not my typo, his ckey is actually spelled like that
-/datum/patron_item/plaugewalker
- name = "SCAF Elite RIG"
- description = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
- item_path = /obj/item/rig/pcsi/elite
- id = "plaugewalker_rig"
- store_cost = 11000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/pcsi)
-
-
-/datum/patron_item/banditofdoom
- name = "Evangelion RIG"
- description = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters."
- item_path = /obj/item/rig/advanced/banditofdoom
- id = "banditofdoom_rig"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 2
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-
-/datum/patron_item/hacker_rig
- name = "Digital Infiltration RIG"
- item_path = /obj/item/rig/hacker
- id = "hacker_rig"
-
- loadout_cost = 4
- loadout_access = ACCESS_PATRONS
-
- loadout_subtype = /datum/gear/RIG/frame
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- tags = list(LOADOUT_TAG_RIG)
- exclusion_tags = list(LOADOUT_TAG_RIG)
- equip_adjustments = OUTFIT_ADJUSTMENT_SKIP_BACKPACK
-
-
-/datum/patron_item/mouse
- name = "mouse"
- item_path = /mob/living/simple_animal/mouse
- id = "mouse"
- store_cost = 1000
- store_access = ACCESS_WHITELIST
- loadout_access = ACCESS_WHITELIST
-
-
-/datum/patron_item/marshal_wrench
- name = "Colossal Wrench"
- description = "If everything else failed - bring a bigger wrench."
- id = "marshal_wrench"
- item_path = /obj/item/material/twohanded/fireaxe/bigwrench
- store_cost = 6000
- store_access = ACCESS_PUBLIC
-
- category = CATEGORY_TOOLS
- subcategory = SUBCATEGORY_DANGEROUS_TOOLS
-
- loadout_modkit_cost = 2
- modkit_access = ACCESS_PUBLIC
- modkit_typelist = list(/obj/item/tool/wrench/big_wrench)
-
-
-//Made public by request of commissioner
-/datum/patron_item/blackwolf
- name = "Wasp RIG"
- description = "A lightweight and flexible armoured rig suit, offers good protection against light impacts"
- id = "blackwolf_rig"
- item_path = /obj/item/rig/marksman/wasp
- store_cost = 11500
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/marksman)
-
-/datum/patron_item/sea_rig
- name = "Hazard Diving RIG"
- description = "The heavy-duty vintage diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces."
- item_path = /obj/item/rig/vintage/sea
- id = "sea_rig"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/vintage)
-
-/datum/patron_item/carver
- name = "Spec Ops RIG"
- description = "A heavily armoured rig suit, designed for military use. Especially effective against bullets."
- item_path = /obj/item/rig/pcsi/carver
- id = "carver_rig"
- store_cost = 11000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/pcsi)
-
-/datum/patron_item/dad_rig
- name = "Elite Diving RIG"
- description = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
- item_path = /obj/item/rig/advanced/dad
- id = "dad_rig"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-/datum/patron_item/sister_rig
- name = "Strange Diving RIG"
- description = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
- item_path = /obj/item/rig/advanced/sister
- id = "sister_rig"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-/datum/patron_item/muramasa
- name = "Experimental Ceremonial Sword"
- description = "A blade passed down through generations of a dedicated unitologist family, the Higgins. Sam had it modified into a experimental ceremonial blade, enhancing the already astonishing properties of the original metal and giving it an ominous crimson glow that matches the Marker. An explosive charge housed in the scabbard enables a lightning-quick draw."
- id = "muramasa"
- item_path = /obj/item/material/twohanded/muramasa
-
- store_cost = 4000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_TOOLS
- subcategory = SUBCATEGORY_DANGEROUS_TOOLS
-
- loadout_modkit_cost = 1
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/tool/pickaxe/laser)
-
-/datum/patron_item/muramasa_sheath
- name = "Ceremonial Sheath"
- id = "muramasa_sheath"
- item_path = /obj/item/storage/belt/holster/muramasa
- store_cost = 1500
- store_access = ACCESS_WHITELIST
- description = "A lavishly decorated ceremonial sheath, looks oddly gun-shaped."
- loadout_cost = 1
- loadout_access = ACCESS_WHITELIST
-
- category = CATEGORY_TOOLS
- subcategory = SUBCATEGORY_DANGEROUS_TOOLS
-
-/datum/patron_item/tarnished
- name = "Tarnished RIG"
- description = "A rig made from the reforged armor of his family that was passed from generation to generations for decades."
- item_path = /obj/item/rig/advanced/tarnished
- id = "tarnished"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-
-/datum/patron_item/arctic_suit //public for all patrons
- name = "Arctic Survival RIG"
- description = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra."
- item_path = /obj/item/rig/advanced/arctic
- id = "arctic"
- store_cost = 17000 //same as advanced rig
- store_access = ACCESS_PATRONS
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
-
-/datum/patron_item/witness
- name = "Witness RIG"
- description = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold."
- item_path = /obj/item/rig/advanced/arctic/witness
- id = "witness"
- store_cost = 17000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/advanced)
-
-
-/datum/patron_item/survivor
- name = "PCSI Survivor RIG"
- description = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken."
- item_path = /obj/item/rig/pcsi/ruined
- id = "psci_survivor"
- store_cost = 11000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/pcsi)
-
-
-/datum/patron_item/forged
- name = "Forged Engineering RIG"
- description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
- item_path = /obj/item/rig/engineering/forged
- id = "forged"
- store_cost = 6500
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/engineering)
-
-/datum/patron_item/flesh
- name = "Fleshy Power Node"
- description = "Use on a zealot rig to obtain"
- item_path = /obj/item/stack/special_node/evil
- id = "flesh"
- store_cost = 1000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
-/datum/patron_item/heavy
- name = "Antique Heavy-Duty CEC RIG"
- description = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers."
- item_path = /obj/item/rig/vintage/heavy
- id = "vintage_suit"
- store_cost = 17000
- store_access = ACCESS_PATRONS
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_PATRONS
- modkit_typelist = list(/obj/item/rig/vintage)
-
-/datum/patron_item/forged_sta
- name = "Standard Forged Engineering RIG"
- description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
- item_path = /obj/item/rig/engineering/forged_new
- id = "engineer_standard_forged_rig"
- store_cost = 6500
- store_access = ACCESS_PATRONS
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_PATRONS
- modkit_typelist = list(/obj/item/rig/engineering)
-
-/datum/patron_item/forged_int
- name = "Intermediate Forged Engineering RIG"
- description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
- item_path = /obj/item/rig/intermediate/forged
- id = "engineer_intermediate_forged_rig"
- store_cost = 10000
- store_access = ACCESS_PATRONS
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_PATRONS
- modkit_typelist = list(/obj/item/rig/intermediate)
-
-/datum/patron_item/forged_adv
- name = "Advanced Forged Engineering RIG"
- description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
- item_path = /obj/item/rig/advanced/forged
- id = "engineer_advanced_forged_rig"
- store_cost = 17000
- store_access = ACCESS_PATRONS
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_PATRONS
- modkit_typelist = list(/obj/item/rig/advanced)
-
-/datum/patron_item/intermediate/survivor
- name = "Intermediate Survivor Engineering RIG"
- description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
- item_path = /obj/item/rig/intermediate/survivor
- id = "intermediate_engineer_survivor_rig"
- store_cost = 10000
- store_access = ACCESS_WHITELIST
-
- category = CATEGORY_RIG
- subcategory = SUBCATEGORY_FRAMES
-
- loadout_modkit_cost = 0
- modkit_access = ACCESS_WHITELIST
- modkit_typelist = list(/obj/item/rig/intermediate)
+//Unitology Ritual Blade
+//Available to all patrons, loadout only
+/datum/patron_item/uni_knife
+ name = "unitology ritual blade"
+ item_path = /obj/item/material/knife/unitologist
+ loadout_cost = 3
+ loadout_access = ACCESS_PATRONS
+ description = "A pristine blade used for religious ceremonies in the Church of Unitology.\
+ Mechanically, it has the same stats as an ordinary boot knife, but it has two important special features.
\
+
\
+ 1. While held in hand, the blade unlocks the unique Sacrifice execution move, allowing ritual murder of a human without head protection.
\
+ A human sacrificed in this manner is worth more biomass when the necromorphs get to them later.
\
+ Requires the victim to remain still, so best restrain them first. The ritual takes wquite a while, giving you ample opportunity for a short speech
\
+ Please note that simply owning this knife does not make you an antag, and you shouldn't be murdering humans if you aren't an antagonist.
\
+
\
+ 2. While equipped, both in your loadout at roundstart, and your inventory during the round, this blade gives an extra 15% chance to be picked for unitology antagonist roles.
\
+ This effect does not override your preferences, if you have unitologists set to never then you still won't be picked"
+
+
+/*
+ Guns
+*/
+/datum/patron_item/rivet
+ name = "711-MarkCL Rivet Gun"
+ id = "rivetgun"
+ item_path = /obj/item/gun/projectile/rivet
+ store_cost = 2400
+ store_access = ACCESS_PATRONS
+ description = "The 711-MarkCL Rivet Gun is the latest refinement from Timson Tools' long line of friendly tools. Useful for rapid repairs at a distance!"
+ loadout_cost = 4
+ loadout_access = ACCESS_PATRONS
+
+ category = CATEGORY_TOOLS
+ subcategory = SUBCATEGORY_DANGEROUS_TOOLS
+
+
+/*
+ RIG suits
+*/
+/datum/patron_item/max_stone_rig
+ name = "Advanced Engineering RIG"
+ description = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights."
+ item_path = /obj/item/rig/advanced/maxstone
+ id = "max_stone_rig"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+//This is not my typo, his ckey is actually spelled like that
+/datum/patron_item/plaugewalker
+ name = "SCAF Elite RIG"
+ description = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement."
+ item_path = /obj/item/rig/scaf/elite
+ id = "plaugewalker_rig"
+ store_cost = 10000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/security)
+
+
+/datum/patron_item/banditofdoom
+ name = "Evangelion RIG"
+ description = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters."
+ item_path = /obj/item/rig/advanced/banditofdoom
+ id = "banditofdoom_rig"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 2
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+
+/datum/patron_item/hacker_rig
+ name = "Digital Infiltration RIG"
+ item_path = /obj/item/rig/hacker
+ id = "hacker_rig"
+
+ loadout_cost = 4
+ loadout_access = ACCESS_PATRONS
+
+ loadout_subtype = /datum/gear/RIG/frame
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ tags = list(LOADOUT_TAG_RIG)
+ exclusion_tags = list(LOADOUT_TAG_RIG)
+ equip_adjustments = OUTFIT_ADJUSTMENT_SKIP_BACKPACK
+
+
+/datum/patron_item/mouse
+ name = "mouse"
+ item_path = /mob/living/simple_animal/mouse
+ id = "mouse"
+ store_cost = 1000
+ store_access = ACCESS_WHITELIST
+ loadout_access = ACCESS_WHITELIST
+
+
+/datum/patron_item/marshal_wrench
+ name = "Colossal Wrench"
+ description = "If everything else failed - bring a bigger wrench."
+ id = "marshal_wrench"
+ item_path = /obj/item/material/twohanded/fireaxe/bigwrench
+ store_cost = 6000
+ store_access = ACCESS_PUBLIC
+
+ category = CATEGORY_TOOLS
+ subcategory = SUBCATEGORY_DANGEROUS_TOOLS
+
+ loadout_modkit_cost = 2
+ modkit_access = ACCESS_PUBLIC
+ modkit_typelist = list(/obj/item/tool/wrench/big_wrench)
+
+
+//Made public by request of commissioner
+/datum/patron_item/blackwolf
+ name = "Wasp RIG"
+ description = "A lightweight and flexible armoured rig suit, offers good protection against light impacts"
+ item_path = /obj/item/rig/wasp
+ id = "blackwolf_rig"
+ store_cost = 9000
+ store_access = ACCESS_PUBLIC
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 2
+ modkit_access = ACCESS_PUBLIC
+ modkit_typelist = list(/obj/item/rig/engineering)
+
+/datum/patron_item/sea_rig
+ name = "Hazard Diving RIG"
+ description = "The heavy-duty vintage diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces."
+ item_path = /obj/item/rig/vintage/sea
+ id = "sea_rig"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/vintage)
+
+/datum/patron_item/carver
+ name = "Spec Ops RIG"
+ description = "A heavily armoured rig suit, designed for military use. Especially effective against bullets."
+ item_path = /obj/item/rig/security/pcsi/carver
+ id = "carver_rig"
+ store_cost = 12000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/security/pcsi)
+
+/datum/patron_item/dad_rig
+ name = "Elite Diving RIG"
+ description = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
+ item_path = /obj/item/rig/advanced/dad
+ id = "dad_rig"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+/datum/patron_item/sister_rig
+ name = "Strange Diving RIG"
+ description = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility."
+ item_path = /obj/item/rig/advanced/sister
+ id = "sister_rig"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+/datum/patron_item/muramasa
+ name = "Experimental Ceremonial Sword"
+ description = "A blade passed down through generations of a dedicated unitologist family, the Higgins. Sam had it modified into a experimental ceremonial blade, enhancing the already astonishing properties of the original metal and giving it an ominous crimson glow that matches the Marker. An explosive charge housed in the scabbard enables a lightning-quick draw."
+ id = "muramasa"
+ item_path = /obj/item/material/twohanded/muramasa
+
+ store_cost = 4000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_TOOLS
+ subcategory = SUBCATEGORY_DANGEROUS_TOOLS
+
+ loadout_modkit_cost = 1
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/tool/pickaxe/laser)
+
+/datum/patron_item/muramasa_sheath
+ name = "Ceremonial Sheath"
+ id = "muramasa_sheath"
+ item_path = /obj/item/storage/belt/holster/muramasa
+ store_cost = 1500
+ store_access = ACCESS_WHITELIST
+ description = "A lavishly decorated ceremonial sheath, looks oddly gun-shaped."
+ loadout_cost = 1
+ loadout_access = ACCESS_WHITELIST
+
+ category = CATEGORY_TOOLS
+ subcategory = SUBCATEGORY_DANGEROUS_TOOLS
+
+/datum/patron_item/tarnished
+ name = "Tarnished RIG"
+ description = "A rig made from the reforged armor of his family that was passed from generation to generations for decades."
+ item_path = /obj/item/rig/advanced/tarnished
+ id = "tarnished"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+
+/datum/patron_item/arctic_suit //public for all patrons
+ name = "Arctic Survival RIG"
+ description = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra."
+ item_path = /obj/item/rig/arctic
+ id = "arctic"
+ store_cost = 15000 //same as advanced rig
+ store_access = ACCESS_PATRONS
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+
+/datum/patron_item/witness
+ name = "Witness RIG"
+ description = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold."
+ item_path = /obj/item/rig/arctic/witness
+ id = "witness"
+ store_cost = 15000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/advanced)
+
+
+/datum/patron_item/survivor
+ name = "PCSI Survivor RIG"
+ description = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken."
+ item_path = /obj/item/rig/security/pcsi/ruined
+ id = "psci_survivor"
+ store_cost = 12000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/security/pcsi)
+
+
+/datum/patron_item/forged
+ name = "Forged Engineering RIG"
+ description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering."
+ item_path = /obj/item/rig/engineering/forged
+ id = "forged"
+ store_cost = 8000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_WHITELIST
+ modkit_typelist = list(/obj/item/rig/engineering)
+
+/datum/patron_item/flesh
+ name = "Fleshy Power Node"
+ description = "Use on a zealot rig to obtain"
+ item_path = /obj/item/stack/special_node/evil
+ id = "flesh"
+ store_cost = 1000
+ store_access = ACCESS_WHITELIST
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+/datum/patron_item/heavy
+ name = "Antique Heavy-Duty CEC RIG"
+ description = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers."
+ item_path = /obj/item/rig/vintage/heavy
+ id = "vintage_suit"
+ store_cost = 15000
+ store_access = ACCESS_PATRONS
+
+ category = CATEGORY_RIG
+ subcategory = SUBCATEGORY_FRAMES
+
+ loadout_modkit_cost = 0
+ modkit_access = ACCESS_PATRONS
+ modkit_typelist = list(/obj/item/rig/vintage)
diff --git a/code/modules/projectiles/guns/ds13/divet.dm b/code/modules/projectiles/guns/ds13/divet.dm
index 338106ccaf1..00e94f0c6b9 100644
--- a/code/modules/projectiles/guns/ds13/divet.dm
+++ b/code/modules/projectiles/guns/ds13/divet.dm
@@ -45,9 +45,8 @@ Divet pistol typedef & logic
icon_state = "divet_spec"
item_state = "divet_spec"
silenced = TRUE
- damage_factor = 0.95 //Silencers reduce bullet speed, and hence damage output
+ damage_factor = 0.85 //Silencers reduce bullet speed, and hence damage output
tier_2_bonus = 1
- tier_1_bonus = 1
/obj/item/gun/projectile/divet/rending
name = "jury-rigged divet pistol"
diff --git a/code/modules/projectiles/guns/ds13/plasma_cutter.dm b/code/modules/projectiles/guns/ds13/plasma_cutter.dm
index eb096356117..95e0b8f77f2 100644
--- a/code/modules/projectiles/guns/ds13/plasma_cutter.dm
+++ b/code/modules/projectiles/guns/ds13/plasma_cutter.dm
@@ -6,7 +6,8 @@
icon_state = "plasmacutter"
item_state = "plasmacutter"
fire_sound = 'sound/weapons/plasma_cutter.ogg'
- w_class = ITEM_SIZE_SMALL
+ slot_flags = SLOT_BELT|SLOT_BACK
+ w_class = ITEM_SIZE_NORMAL
force = 8
origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ENGINEERING = 6, TECH_COMBAT = 3)
matter = list(MATERIAL_STEEL = 4000)
diff --git a/code/modules/projectiles/guns/ds13/rivet_gun.dm b/code/modules/projectiles/guns/ds13/rivet_gun.dm
index f88b0dc4ea9..dff20e48cbb 100644
--- a/code/modules/projectiles/guns/ds13/rivet_gun.dm
+++ b/code/modules/projectiles/guns/ds13/rivet_gun.dm
@@ -37,7 +37,7 @@
firemodes = list(
- FULL_AUTO_300,
+ list(mode_name = "rivet", mode_type = /datum/firemode),
list(mode_name = "fragmentate", mode_type = /datum/firemode/rivet_frag)
)
@@ -140,13 +140,13 @@
Projectile
*/
/obj/item/projectile/bullet/rivet
- damage = 13.25 //Not really meant for direct fire
+ damage = 10 //Not really meant for direct fire
expiry_method = EXPIRY_FADEOUT
muzzle_type = /obj/effect/projectile/pulse/muzzle/light
//fire_sound='sound/weapons/guns/fire/divet_fire.ogg'
- armor_penetration = 7.5
structure_damage_factor = 1
- penetration_modifier = 1.1
+ penetration_modifier = 0
+ penetrating = FALSE
var/repair_power = 80
var/deployed = FALSE
diff --git a/code/modules/projectiles/guns/ds13/seeker.dm b/code/modules/projectiles/guns/ds13/seeker.dm
index 97d57438376..20f5dd17337 100644
--- a/code/modules/projectiles/guns/ds13/seeker.dm
+++ b/code/modules/projectiles/guns/ds13/seeker.dm
@@ -6,20 +6,19 @@
item_state = "seeker"
wielded_item_state = "seeker-wielded"
w_class = ITEM_SIZE_HUGE
- force = 10
handle_casings = CLEAR_CASINGS
magazine_type = /obj/item/ammo_magazine/seeker
allowed_magazines = /obj/item/ammo_magazine/seeker
load_method = MAGAZINE
caliber = "seeker"
slot_flags = SLOT_BACK
- one_hand_penalty = -30 //Don't try to hipfire
- accuracy = -10
+ accuracy = -30 //Don't try to hipfire
ammo_type = /obj/item/ammo_casing/seeker
mag_insert_sound = 'sound/weapons/guns/interaction/rifle_load.ogg'
mag_remove_sound = 'sound/weapons/guns/interaction/pulse_magout.ogg'
+ one_hand_penalty = -30 //Don't try to fire this with one hand
fire_sound = 'sound/weapons/gunshot/sniper.ogg'
- aiming_modes = list(/datum/extension/aim_mode/sniper/seeker)
+ aiming_modes = list(/datum/extension/aim_mode/sniper/seeker, /datum/extension/aim_mode/sniper/seeker/far, /datum/extension/aim_mode/sniper/seeker/near)
firemodes = list(
@@ -44,7 +43,7 @@
/obj/item/projectile/bullet/seeker
icon_state = "seeker"
- damage = 40
+ damage = 50
embed = 1
structure_damage_factor = 3
penetration_modifier = 1.25
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 188d24c5ca8..e4f99f0be76 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -537,7 +537,7 @@
icon = 'icons/obj/drinks.dmi'
icon_state = "ds_medipack"
starts_with = list(/datum/reagent/ds_medicalgelreagent = 20)
- amount_per_transfer_from_this = 10
+ amount_per_transfer_from_this = 5
volume = 20
/obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/update_icon()
@@ -546,6 +546,5 @@
/obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/small
name = "small medical pack"
desc = "A small medi-gel container to treat life threatening injuries."
- starts_with = list(/datum/reagent/ds_medicalgelreagent = 10)
- amount_per_transfer_from_this = 5
- volume = 10
\ No newline at end of file
+ starts_with = list(/datum/reagent/ds_medicalgelreagent = 5)
+ volume = 5
\ No newline at end of file
diff --git a/code/modules/research/designs/design_rig.dm b/code/modules/research/designs/design_rig.dm
index 19bcd823caa..bcee86022a6 100644
--- a/code/modules/research/designs/design_rig.dm
+++ b/code/modules/research/designs/design_rig.dm
@@ -7,23 +7,11 @@
//Tier 0: civilian grade rigs (no modules/little to no armor)
/datum/design/item/rig/civ
build_path = /obj/item/rig/civilian
- price = 100
+ price = 500
/datum/design/item/rig/civ/slim
build_path = /obj/item/rig/civilian/slim
- price = 100
-
-/datum/design/item/rig/emergency/astro
- build_path = /obj/item/rig/emergency/astro
- price = 1000
-
-/datum/design/item/rig/firesuit
- build_path = /obj/item/rig/firesuit
- price = 1000
-
-/datum/design/item/rig/medical
- build_path = /obj/item/rig/medical
- price = 3000 //good against burns/toxins
+ price = 500
/datum/design/item/rig/clown
name = "ERROR_404_RIG_NOT_FOUND"
@@ -37,58 +25,54 @@
//Tier I: standard protection and modules
+/datum/design/item/rig/fire
+ build_path = /obj/item/rig/firesuit
+ price = 4000 //weak, good against burns
+
/datum/design/item/rig/mining
build_path = /obj/item/rig/mining
price = 6000
-/datum/design/item/rig/eng
- build_path = /obj/item/rig/engineering
- price = 6500 //moderate protection
+/datum/design/item/rig/medical
+ build_path = /obj/item/rig/medical
+ price = 6500 //good against burns/toxins
/datum/design/item/rig/excavation
build_path = /obj/item/rig/excavation
- price = 9000
+ price = 7000
-/datum/design/item/rig/intermediate
- build_path = /obj/item/rig/intermediate
- price = 10000
+/datum/design/item/rig/eng
+ build_path = /obj/item/rig/engineering
+ price = 8000 //moderate protection
-//Tier II: high protection and advanced modules
-/datum/design/item/rig/marksman
- build_path = /obj/item/rig/marksman
- price = 10500 //SSO
-/datum/design/item/rig/pcsi
- build_path = /obj/item/rig/pcsi
- price = 11000 //armory rig
+//Tier II: high protection and advanced modules
+/datum/design/item/rig/patrol
+ build_path = /obj/item/rig/patrol
+ price = 11000 //standard security rig for patrol
/datum/design/item/rig/sec
- build_path = /obj/item/rig/pcsi/security
+ build_path = /obj/item/rig/security
price = 11000 //standard security rig
-/datum/design/item/rig/patrol
- build_path = /obj/item/rig/riot/patrol
- price = 12000 //standard security rig for patrol
+
+/datum/design/item/rig/pcsi
+ build_path = /obj/item/rig/security/pcsi
+ price = 12000 //armory rig
+
+/datum/design/item/rig/marksman
+ build_path = /obj/item/rig/marksman
+ price = 13000 //SSO
/datum/design/item/rig/riot
build_path = /obj/item/rig/riot
- price = 12000 //for melee combat, kinda worse at everything else
-
-//Tier III: high protection and advanced modules
+ price = 14000 //for melee combat, kinda worse at everything else
/datum/design/item/rig/vintage
build_path = /obj/item/rig/vintage
- price = 17000 //tanky rig, slow
+ price = 15000 //tanky rig, slow
/datum/design/item/rig/advanced
build_path = /obj/item/rig/advanced
- price = 17000 //good all-rounder, comes with great modules
-
-/datum/design/item/rig/advanced/engineering
- build_path = /obj/item/rig/advanced/engineering
- price = 17000
-
-/datum/design/item/rig/advanced/mining
- build_path = /obj/item/rig/advanced/mining
- price = 17000
\ No newline at end of file
+ price = 15000 //good all-rounder, comes with great modules
diff --git a/code/modules/research/designs/design_weapons.dm b/code/modules/research/designs/design_weapons.dm
index dc60ef86f70..961baf6d1d0 100644
--- a/code/modules/research/designs/design_weapons.dm
+++ b/code/modules/research/designs/design_weapons.dm
@@ -318,6 +318,20 @@ S fuel tank (hydrazine)
build_path = /obj/item/ammo_magazine/sawblades/diamond
price = 2900
+/datum/design/item/weapon/plasmasword
+ name = "experimental mining blade"
+ id = "plasmasword"
+ materials = list(MATERIAL_STEEL = 4000, MATERIAL_DIAMOND = 4000)
+ build_path = /obj/item/material/twohanded/muramasa/plasmasword
+ price = 4000
+
+/datum/design/item/weapon/sheath
+ name = "experimental blade sheath"
+ id = "sheath"
+ materials = list(MATERIAL_STEEL = 4000)
+ build_path = /obj/item/storage/belt/holster/sheath
+ price = 3000
+
//Support Weapons
/datum/design/item/ammo/line_rack
name = "line racks"
diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi
index fc8a458e67d5ae458813fe1e8f956127082c3142..d939948829ee24bbbbf9710c4b003d0e9670fe0f 100644
GIT binary patch
literal 3278
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
diff --git a/icons/mob/onmob/feet.dmi b/icons/mob/onmob/feet.dmi
index f21f19e8be688050b0ffe9da0c5ea0b7c2d951dc..943bbc3704f7357eee5bdc6cb82fd29596e80a23 100644
GIT binary patch
literal 36106
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
bqd|a_vhvahzoYomY{Sap(s{J`jR*e&h)CNT
literal 38076
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