diff --git a/baystation12.int b/baystation12.int
index b82874fded5..51210a3f17e 100644
--- a/baystation12.int
+++ b/baystation12.int
@@ -1,6 +1,11 @@
 // BEGIN_INTERNALS
 /*
 MAP_ICON_TYPE: 0
+WINDOW: maps\exodus-1.dmm;maps\exodus-2.dmm;maps\exodus-3.dmm;maps\exodus-4.dmm;maps\exodus-5.dmm
+LAST_COMPILE_VERSION: 506.1247
+DIR: code code\modules code\modules\clothing code\modules\clothing\spacesuits code\modules\clothing\spacesuits\rig code\modules\clothing\spacesuits\rig\modules code\modules\clothing\spacesuits\rig\suits icons icons\mob icons\obj icons\obj\clothing maps 
+FILE: maps\exodus-5.dmm
+LAST_COMPILE_TIME: 1428182322
 AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index a9f7f53f8ce..57b66ddcf41 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -12,6 +12,7 @@
 	name = "mounted grenade launcher"
 	desc = "A shoulder-mounted micro-explosive dispenser."
 	selectable = 1
+	icon_state = "grenade_launcher"
 
 	interface_name = "integrated grenade launcher"
 	interface_desc = "Discharges loaded grenades against the wearer's location."
@@ -86,6 +87,7 @@
 	selectable = 1
 	usable = 1
 	module_cooldown = 0
+	icon_state = "lcannon"
 
 	engage_string = "Configure"
 
@@ -115,6 +117,7 @@
 
 	name = "mounted energy gun"
 	desc = "A forearm-mounted energy projector."
+	icon_state = "egun"
 
 	interface_name = "mounted energy gun"
 	interface_desc = "A forearm-mounted suit-powered energy gun."
@@ -124,7 +127,8 @@
 /obj/item/rig_module/mounted/taser
 
 	name = "mounted taser"
-	desc = "A shoulder-mounted energy projector."
+	desc = "A palm-mounted nonlethal energy projector."
+	icon_state = "taser"
 
 	usable = 0
 
@@ -140,6 +144,7 @@
 
 	name = "energy blade projector"
 	desc = "A powerful cutting beam projector."
+	icon_state = "eblade"
 
 	activate_string = "Project Blade"
 	deactivate_string = "Cancel Blade"
@@ -200,6 +205,7 @@
 	selectable = 1
 	usable = 1
 	use_power_cost = 15
+	icon_state = "enet"
 
 	engage_string = "Fabricate Star"
 
diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm
index a6c549b6663..3d7b36124b7 100644
--- a/code/modules/clothing/spacesuits/rig/modules/computer.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm
@@ -29,6 +29,7 @@
 
 	name = "IIS module"
 	desc = "An integrated intelligence system module suitable for most hardsuits."
+	icon_state = "IIS"
 	toggleable = 1
 	usable = 1
 	disruptive = 0
@@ -202,6 +203,7 @@
 
 	name = "datajack module"
 	desc = "A simple induction datalink module."
+	icon_state = "datajack"
 	toggleable = 1
 	activates_on_touch = 1
 	usable = 0
@@ -292,6 +294,7 @@
 
 	name = "electrowarfare module"
 	desc = "A bewilderingly complex bundle of fiber optics and chips."
+	icon_state = "ewar"
 	toggleable = 1
 	usable = 0
 
@@ -322,6 +325,7 @@
 
 	name = "hardsuit power sink"
 	desc = "An heavy-duty power sink."
+	icon_state = "powersink"
 	toggleable = 1
 	activates_on_touch = 1
 	disruptive = 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
index 6d572cdcb3e..7458ca1bc9b 100644
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
@@ -66,6 +66,7 @@
 
 	name = "teleportation module"
 	desc = "A complex, sleek-looking, hardsuit-integrated teleportation module."
+	icon_state = "teleporter"
 	use_power_cost = 40
 	redundant = 1
 	usable = 1
@@ -126,6 +127,7 @@
 
 	name = "net projector"
 	desc = "Some kind of complex energy projector with a hardsuit mount."
+	icon_state = "enet"
 
 	interface_name = "energy net launcher"
 	interface_desc = "An advanced energy-patterning projector used to capture targets."
@@ -147,6 +149,7 @@
 
 	name = "self-destruct module"
 	desc = "Oh my God, Captain. A bomb."
+	icon_state = "deadman"
 	usable = 1
 	active = 1
 	permanent = 1
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index b4a622075e2..f0001e680ae 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -28,6 +28,7 @@
 /obj/item/rig_module/device/plasmacutter
 	name = "hardsuit plasma cutter"
 	desc = "A lethal-looking industrial cutter."
+	icon_state = "plasmacutter"
 	interface_name = "plasma cutter"
 	interface_desc = "A self-sustaining plasma arc capable of cutting through walls."
 	suit_overlay_active = "plasmacutter"
@@ -38,6 +39,7 @@
 /obj/item/rig_module/device/healthscanner
 	name = "health scanner module"
 	desc = "A hardsuit-mounted health scanner."
+	icon_state = "scanner"
 	interface_name = "health scanner"
 	interface_desc = "Shows an informative health readout when used on a subject."
 
@@ -46,6 +48,7 @@
 /obj/item/rig_module/device/drill
 	name = "hardsuit drill mount"
 	desc = "A very heavy diamond-tipped drill."
+	icon_state = "drill"
 	interface_name = "mounted drill"
 	interface_desc = "A diamond-tipped industrial drill."
 	suit_overlay_active = "mounted-drill"
@@ -56,6 +59,7 @@
 /obj/item/rig_module/device/anomaly_scanner
 	name = "hardsuit anomaly scanner"
 	desc = "You think it's called an Elder Sarsparilla or something."
+	icon_state = "eldersasparilla"
 	interface_name = "Alden-Saraspova counter"
 	interface_desc = "An exotic particle detector commonly used by xenoarchaeologists."
 	engage_string = "Begin Scan"
@@ -66,6 +70,7 @@
 /obj/item/rig_module/device/orescanner
 	name = "ore scanner module"
 	desc = "A clunky old ore scanner."
+	icon_state = "scanner"
 	interface_name = "ore detector"
 	interface_desc = "A sonar system for detecting large masses of ore."
 	engage_string = "Begin Scan"
@@ -76,6 +81,7 @@
 /obj/item/rig_module/device/rcd
 	name = "RCD mount"
 	desc = "A cell-powered rapid construction device for a hardsuit."
+	icon_state = "rcd"
 	interface_name = "mounted RCD"
 	interface_desc = "A device for building or removing walls. Cell-powered."
 	usable = 1
@@ -105,9 +111,12 @@
 		device.afterattack(target,holder.wearer,1)
 	return 1
 
+
+
 /obj/item/rig_module/chem_dispenser
 	name = "mounted chemical dispenser"
 	desc = "A complex web of tubing and needles suitable for hardsuit use."
+	icon_state = "injector"
 	usable = 1
 	selectable = 0
 	toggleable = 0
@@ -223,6 +232,19 @@
 
 /obj/item/rig_module/chem_dispenser/combat
 
+	name = "combat chemical injector"
+	desc = "A complex web of tubing and needles suitable for hardsuit use."
+
+	charges = list(
+		list("synaptizine",   "synaptizine",   0, 30),
+		list("hyperzine",     "hyperzine",     0, 30),
+		list("oxycodone",     "oxycodone",     0, 30),
+		list("nutrients",     "nutriment",     0, 80),
+		)
+
+	interface_name = "combat chem dispenser"
+	interface_desc = "Dispenses loaded chemicals directly into the bloodstream."
+
 
 /obj/item/rig_module/chem_dispenser/injector
 
@@ -239,6 +261,7 @@
 
 	name = "hardsuit voice synthesiser"
 	desc = "A speaker box and sound processor."
+	icon_state = "megaphone"
 	usable = 1
 	selectable = 0
 	toggleable = 0
@@ -291,6 +314,7 @@
 
 	name = "hardsuit maneuvering jets"
 	desc = "A compact gas thruster system for a hardsuit."
+	icon_state = "thrusters"
 	usable = 1
 	toggleable = 1
 	selectable = 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm
index ec37b58f05a..aa106eda02a 100644
--- a/code/modules/clothing/spacesuits/rig/modules/vision.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm
@@ -1,8 +1,12 @@
 /*
  * Contains
  * /obj/item/rig_module/vision
+ * /obj/item/rig_module/vision/multi
  * /obj/item/rig_module/vision/meson
  * /obj/item/rig_module/vision/thermal
+ * /obj/item/rig_module/vision/nvg
+ * /obj/item/rig_module/vision/medhud
+ * /obj/item/rig_module/vision/sechud
  */
 
 /datum/rig_vision
@@ -24,10 +28,21 @@
 /datum/rig_vision/meson/New()
 	glasses = new /obj/item/clothing/glasses/meson
 
+/datum/rig_vision/sechud
+	mode = "security HUD"
+/datum/rig_vision/sechud/New()
+	glasses = new /obj/item/clothing/glasses/hud/security
+
+/datum/rig_vision/medhud
+	mode = "medical HUD"
+/datum/rig_vision/medhud/New()
+	glasses = new /obj/item/clothing/glasses/hud/health
+
 /obj/item/rig_module/vision
 
 	name = "hardsuit visor"
 	desc = "A layered, translucent visor system for a hardsuit."
+	icon_state = "optics"
 
 	interface_name = "optical scanners"
 	interface_desc = "An integrated multi-mode vision system."
@@ -49,10 +64,27 @@
 
 	var/vision_index
 
+/obj/item/rig_module/vision/multi
+
+	name = "hardsuit optical package"
+	desc = "A complete visor system of optical scanners and vision modes."
+	icon_state = "fulloptics"
+
+
+	interface_name = "multi optical visor"
+	interface_desc = "An integrated multi-mode vision system."
+
+	vision_modes = list(/datum/rig_vision/meson,
+						/datum/rig_vision/nvg,
+						/datum/rig_vision/thermal,
+						/datum/rig_vision/sechud,
+						/datum/rig_vision/medhud)
+
 /obj/item/rig_module/vision/meson
 
 	name = "hardsuit meson scanner"
 	desc = "A layered, translucent visor system for a hardsuit."
+	icon_state = "meson"
 
 	usable = 0
 
@@ -65,6 +97,7 @@
 
 	name = "hardsuit thermal scanner"
 	desc = "A layered, translucent visor system for a hardsuit."
+	icon_state = "thermal"
 
 	usable = 0
 
@@ -73,6 +106,46 @@
 
 	vision_modes = list(/datum/rig_vision/thermal)
 
+/obj/item/rig_module/vision/nvg
+
+	name = "hardsuit night vision interface"
+	desc = "A multi input night vision system for a hardsuit."
+	icon_state = "night"
+
+	usable = 0
+
+	interface_name = "night vision interface"
+	interface_desc = "An integrated night vision system."
+
+	vision_modes = list(/datum/rig_vision/nvg)
+
+/obj/item/rig_module/vision/sechud
+
+	name = "hardsuit security hud"
+	desc = "A simple tactical information system for a hardsuit."
+	icon_state = "securityhud"
+
+	usable = 0
+
+	interface_name = "security HUD"
+	interface_desc = "An integrated security heads up display."
+
+	vision_modes = list(/datum/rig_vision/sechud)
+
+/obj/item/rig_module/vision/medhud
+
+	name = "hardsuit medical hud"
+	desc = "A simple medical status indicator for a hardsuit."
+	icon_state = "healthhud"
+
+	usable = 0
+
+	interface_name = "medical HUD"
+	interface_desc = "An integrated medical heads up display."
+
+	vision_modes = list(/datum/rig_vision/medhud)
+
+
 // There should only ever be one vision module installed in a suit.
 /obj/item/rig_module/vision/installed()
 	..()
diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
index 9be2576838b..3965d57d4a9 100644
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -8,11 +8,16 @@
 	suit_type = "combat hardsuit"
 	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
 	slowdown = 1
+	offline_slowdown = 3
 	offline_vision_restriction = 1
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/combat
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 
+
+/obj/item/weapon/rig/combat/equipped
+
+
 	initial_modules = list(
 		/obj/item/rig_module/mounted,
 		/obj/item/rig_module/vision/thermal,
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm
index feec1f58103..70c21d51089 100644
--- a/code/modules/clothing/spacesuits/rig/suits/ert.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm
@@ -1,6 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/ert
 	light_overlay = "helmet_light_dual"
-	camera_networks = list("ERT","SS13")
+	camera_networks = list("ERT")
 
 /obj/item/weapon/rig/ert
 	name = "ERT-C hardsuit control module"
@@ -12,11 +12,11 @@
 
 	req_access = list(access_cent_specops)
 
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
 	/obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
-	/obj/item/device/radio, /obj/item/device/analyzer, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, \
-	/obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, /obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
+	/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
+	/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
 
 	initial_modules = list(
 		/obj/item/rig_module/ai_container,
@@ -29,7 +29,6 @@
 	desc = "A suit worn by the engineering division of a NanoTrasen Emergency Response Team. Has orange highlights. Armoured and space ready."
 	suit_type = "ERT engineer"
 	icon_state = "ert_engineer_rig"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
 
 	glove_type = /obj/item/clothing/gloves/rig/ert_engineer
 
@@ -68,4 +67,23 @@
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/grenade_launcher,
 		/obj/item/rig_module/mounted/egun,
+		)
+
+/obj/item/weapon/rig/ert/assetprotection
+	name = "Heavy Asset Protection suit control module"
+	desc = "A heavy suit worn by the highest level of Nanotrasen Asset Protection, don't mess with the person wearing this. Armoured and space ready."
+	suit_type = "heavy asset protection"
+	icon_state = "asset_protection_rig"
+	armor = list(melee = 60, bullet = 50, laser = 50,energy = 40, bomb = 40, bio = 100, rad = 100)
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/vision/multi,
+		/obj/item/rig_module/mounted/egun,
+		/obj/item/rig_module/chem_dispenser/injector,
+		/obj/item/rig_module/device/plasmacutter,
+		/obj/item/rig_module/device/rcd,
+		/obj/item/rig_module/datajack
 		)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
index 8e7b70d5f2b..22add920141 100644
--- a/code/modules/clothing/spacesuits/rig/suits/merc.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -9,6 +9,7 @@
 	suit_type = "crimson hardsuit"
 	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
 	slowdown = 1
+	offline_slowdown = 3
 	offline_vision_restriction = 1
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/merc
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index 2723a573604..5ba33b2fc1e 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -1,19 +1,45 @@
+/obj/item/clothing/head/helmet/space/rig/industrial
+	camera_networks = list("Mine")
+
+/obj/item/clothing/head/helmet/space/rig/ce
+	camera_networks = list("Engineering")
+
+/obj/item/clothing/head/helmet/space/rig/eva
+	light_overlay = "helmet_light_dual"
+	camera_networks = list("Engineering")
+
+/obj/item/clothing/head/helmet/space/rig/hazmat
+	light_overlay = "hardhat_light"
+	camera_networks = list("Research")
+
+/obj/item/clothing/head/helmet/space/rig/medical
+	camera_networks = list("Medbay")
+
+/obj/item/clothing/head/helmet/space/rig/hazard
+	light_overlay = "helmet_light_dual"
+	camera_networks = list("Security")
+
 /obj/item/weapon/rig/industrial
 	name = "industrial suit control module"
 	suit_type = "industrial hardsuit"
 	desc = "A heavy, powerful rig used by construction crews and mining corporations."
 	icon_state = "engineering_rig"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 50)
 	slowdown = 3
 	offline_slowdown = 10
 	offline_vision_restriction = 2
 	emp_protection = -20
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/industrial
+
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
 	req_access = list()
 	req_one_access = list()
 
+
+/obj/item/weapon/rig/industrial/equipped
+
 	initial_modules = list(
 		/obj/item/rig_module/device/plasmacutter,
 		/obj/item/rig_module/device/drill,
@@ -22,6 +48,32 @@
 		/obj/item/rig_module/vision/meson
 		)
 
+/obj/item/weapon/rig/eva
+	name = "EVA suit control module"
+	suit_type = "EVA hardsuit"
+	desc = "A light rig for repairs and maintenance to the outside of habitats and vessels."
+	icon_state = "eva_rig"
+	armor = list(melee = 30, bullet = 10, laser = 20,energy = 25, bomb = 20, bio = 100, rad = 100)
+	slowdown = 0
+	offline_slowdown = 1
+	offline_vision_restriction = 1
+
+	helm_type = /obj/item/clothing/head/helmet/space/rig/eva
+
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
+
+	req_access = list()
+	req_one_access = list()
+
+/obj/item/weapon/rig/eva/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/device/plasmacutter,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/device/rcd,
+		/obj/item/rig_module/vision/meson
+		)
+
 //Chief Engineer's rig. This is sort of a halfway point between the old hardsuits (voidsuits) and the rig class.
 /obj/item/weapon/rig/ce
 
@@ -29,13 +81,24 @@
 	suit_type = "advanced voidsuit"
 	desc = "An advanced voidsuit that protects against hazardous, low pressure environments. Shines with a high polish."
 	icon_state = "ce_rig"
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	armor = list(melee = 40, bullet = 10, laser = 30,energy = 25, bomb = 40, bio = 100, rad = 100)
 	slowdown = 0
 	offline_slowdown = 0
 	offline_vision_restriction = 0
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ce
+
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
+
+	req_access = list()
+	req_one_access = list()
+
+	boot_type =  null
+	glove_type = null
+
+/obj/item/weapon/rig/ce/equipped
+
 	req_access = list(access_ce)
 
 	initial_modules = list(
@@ -55,14 +118,21 @@
 	suit_type = "hazmat hardsuit"
 	desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
 	icon_state = "science_rig"
-	armor = list(melee = 15, bullet = 15, laser = 80, energy = 80, bomb = 60, bio = 100, rad = 100)
+	armor = list(melee = 45, bullet = 5, laser = 45, energy = 80, bomb = 60, bio = 100, rad = 100)
 	slowdown = 1
 	offline_vision_restriction = 1
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat
+
 	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
 
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/weapon/storage/box/excavation,/obj/item/weapon/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/weapon/pickaxe/hand,/obj/item/weapon/storage/bag/fossils)
 
+	req_access = list()
+	req_one_access = list()
+
+/obj/item/weapon/rig/hazmat/equipped
+
 	req_access = list(access_rd)
 
 	initial_modules = list(
@@ -81,30 +151,45 @@
 	slowdown = 1
 	offline_vision_restriction = 1
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/medical
+
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/roller )
 
 	req_access = list()
 	req_one_access = list()
 
+/obj/item/weapon/rig/medical/equipped
+
 	initial_modules = list(
 		/obj/item/rig_module/chem_dispenser/injector,
 		/obj/item/rig_module/maneuvering_jets,
-		/obj/item/rig_module/device/healthscanner
+		/obj/item/rig_module/device/healthscanner,
+		/obj/item/rig_module/vision/medhud
 		)
 
 /obj/item/weapon/rig/hazard
 	name = "hazard hardsuit control module"
 	suit_type = "hazard hardsuit"
-	desc = "A Nanotrasen security hardsuit designed for prolonged EVA in dangerous environments. The name HARPER is printed on the control unit."
+	desc = "A Nanotrasen security hardsuit designed for prolonged EVA in dangerous environments."
 	icon_state = "hazard_rig"
-	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
+	armor = list(melee = 60, bullet = 40, laser = 30, energy = 15, bomb = 60, bio = 100, rad = 30)
 	slowdown = 1
+	offline_slowdown = 3
 	offline_vision_restriction = 1
 
-	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
+	helm_type = /obj/item/clothing/head/helmet/space/rig/hazard
 
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 
 	req_access = list()
 	req_one_access = list()
 
+
+/obj/item/weapon/rig/hazard/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/vision/sechud,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/mounted/taser
+		)
\ No newline at end of file
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 0c99056632e..ed60b1fa86a 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 091ecf1269f..f79c6641cb0 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index e6903797d4e..8038dc3d785 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi
index f5fef65c746..fdd761de541 100644
Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index e8f9800334c..afb8b523618 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 1657f8b17a0..6399acfc15d 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index a55c1b1cc22..ec29f0ce41b 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 5f9553089be..50981432711 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index a5ed2192bcc..b8156cad06d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi
index eb542d07773..02af395159d 100644
Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ
diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm
index 1f0a960d34f..80cff067406 100644
--- a/maps/exodus-1.dmm
+++ b/maps/exodus-1.dmm
@@ -4508,7 +4508,7 @@
 "bIJ" = (/turf/simulated/wall,/area/rnd/storage)
 "bIK" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/rnd/research)
 "bIL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/rnd/research)
-"bIM" = (/obj/structure/table/rack,/obj/item/weapon/rig/hazmat,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor)
+"bIM" = (/obj/structure/table/rack,/obj/item/weapon/rig/hazmat/equipped,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor)
 "bIN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor)
 "bIO" = (/obj/machinery/computer/mecha,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor)
 "bIP" = (/obj/machinery/computer/area_atmos,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor)
@@ -5542,7 +5542,7 @@
 "ccD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/purple{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology)
 "ccE" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/purple{dir = 4},/turf/simulated/floor/plating,/area/maintenance/research_starboard)
 "ccF" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_mining{name = "Delivery Office"; req_access = list(50)},/turf/simulated/floor,/area/quartermaster/office)
-"ccG" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/weapon/rig/ce,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/crew_quarters/heads/chief)
+"ccG" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/weapon/rig/ce/equipped,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/crew_quarters/heads/chief)
 "ccH" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/crew_quarters/heads/chief)
 "ccI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/crew_quarters/heads/chief)
 "ccJ" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_dock_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/plating,/area/hallway/secondary/entry/aft)
diff --git a/maps/exodus-5.dmm b/maps/exodus-5.dmm
index 98aae309719..22732bb0b88 100644
--- a/maps/exodus-5.dmm
+++ b/maps/exodus-5.dmm
@@ -1396,7 +1396,7 @@
 "AR" = (/obj/item/weapon/cigbutt,/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor{icon_state = "bar"},/area/outpost/mining_main/dorms)
 "AS" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "bar"},/area/outpost/mining_main/dorms)
 "AT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/outpost/mining_main/west_hall)
-"AU" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table/rack,/obj/item/weapon/rig/industrial,/turf/simulated/floor,/area/outpost/mining_main/west_hall)
+"AU" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table/rack,/obj/item/weapon/rig/industrial/equipped,/turf/simulated/floor,/area/outpost/mining_main/west_hall)
 "AV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/outpost/mining_main/west_hall)
 "AW" = (/obj/machinery/camera{c_tag = "Storage Room"; dir = 1; network = list("MINE")},/turf/simulated/floor,/area/outpost/mining_main/west_hall)
 "AX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 4},/area/mine/explored)