Rig and Spacesuit additions

- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.

code/game/machinery/suit_storage_unit.dm

@@ -643,6 +643,20 @@
 	departments = list("Mercenary", "Charring")
 	can_repair = 1
 
+/obj/machinery/suit_cycler/exploration
+	name = "Explorer suit cycler"
+	model_text = "Exploration"
+	departments = list("Exploration","Old Exploration")
+
+/obj/machinery/suit_cycler/exploreration/initialize()
+	species -= SPECIES_TESHARI
+	return ..()
+
+/obj/machinery/suit_cycler/pilot
+	name = "Pilot suit cycler"
+	model_text = "Pilot"
+	departments = list("Pilot Blue","Pilot")
+
 /obj/machinery/suit_cycler/attack_ai(mob/user as mob)
 	return attack_hand(user)
 
@@ -1106,6 +1120,51 @@
 				suit.icon_state = "rig-firebug"
 				suit.item_state_slots[slot_r_hand_str] = "rig-firebug"
 				suit.item_state_slots[slot_l_hand_str] = "rig-firebug"
+		if("Exploration")
+			if(helmet)
+				helmet.name = "exploration voidsuit helmet"
+				helmet.icon_state = "helm_explorer"
+				helmet.item_state = "helm_explorer"
+			if(suit)
+				suit.name = "exploration voidsuit"
+				suit.icon_state = "void_explorer"
+				suit.item_state = "void_explorer"
+				suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit"
+				suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit"
+		if("Old Exploration")
+			if(helmet)
+				helmet.name = "exploration voidsuit helmet"
+				helmet.icon_state = "helm_explorer2"
+				helmet.item_state = "helm_explorer2"
+			if(suit)
+				suit.name = "exploration voidsuit"
+				suit.icon_state = "void_explorer2"
+				suit.item_state = "void_explorer2"
+				suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit"
+				suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit"
+		if("Pilot")
+			if(helmet)
+				helmet.name = "pilot voidsuit helmet"
+				helmet.icon_state = "rig0_pilot"
+				helmet.item_state = "pilot_helm"
+			if(suit)
+				suit.name = "pilot voidsuit"
+				suit.icon_state = "rig-pilot"
+				suit.item_state = "rig-pilot"
+				suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG"
+				suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG"
+		if("Pilot Blue")
+			if(helmet)
+				helmet.name = "pilot voidsuit helmet"
+				helmet.icon_state = "rig0_pilot2"
+				helmet.item_state = "pilot_helm2"
+			if(suit)
+				suit.name = "pilot voidsuit"
+				suit.icon_state = "rig-pilot2"
+				suit.item_state = "rig-pilot2"
+				suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG"
+				suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG"
+
 
 	if(helmet) helmet.name = "refitted [helmet.name]"
 	if(suit) suit.name = "refitted [suit.name]"

code/modules/clothing/spacesuits/rig/suits/combat.dm

@@ -17,7 +17,6 @@
 
 /obj/item/weapon/rig/combat/equipped
 
-
 	initial_modules = list(
 		/obj/item/rig_module/mounted,
 		/obj/item/rig_module/vision/thermal,
@@ -26,4 +25,59 @@
 		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/chem_dispenser/combat
+		)
+
+/obj/item/weapon/rig/combat/empty
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/electrowarfare_suite,
+		)
+
+/obj/item/weapon/rig/military
+	name = "military hardsuit control module"
+	desc = "An austere hardsuit used by paramilitary groups and real soldiers alike."
+	icon_state = "military_rig"
+	suit_type = "military hardsuit"
+	armor = list(melee = 80, bullet = 70, laser = 55, energy = 15, bomb = 80, bio = 100, rad = 30)
+	slowdown = 1
+	offline_slowdown = 3
+	offline_vision_restriction = 1
+	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/handcuffs,/obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/tool/crowbar, \
+	/obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/device/multitool, \
+	/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
+	/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/device/suit_cooling_unit)
+
+	chest_type = /obj/item/clothing/suit/space/rig/military
+	helm_type = /obj/item/clothing/head/helmet/space/rig/military
+	boot_type = /obj/item/clothing/shoes/magboots/rig/military
+	glove_type = /obj/item/clothing/gloves/rig/military
+
+/obj/item/clothing/head/helmet/space/rig/military
+	light_overlay = "helmet_light_dual_green"
+	species_restricted = list(SPECIES_HUMAN,SPECIES_PROMETHEAN)
+
+/obj/item/clothing/suit/space/rig/military
+	species_restricted = list(SPECIES_HUMAN,SPECIES_PROMETHEAN)
+
+/obj/item/clothing/shoes/magboots/rig/military
+	species_restricted = list(SPECIES_HUMAN,SPECIES_PROMETHEAN)
+
+/obj/item/clothing/gloves/rig/military
+	species_restricted = list(SPECIES_HUMAN,SPECIES_PROMETHEAN)
+
+/obj/item/weapon/rig/military/equipped
+	initial_modules = list(
+		/obj/item/rig_module/mounted/egun,
+		/obj/item/rig_module/vision/multi,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/electrowarfare_suite,
+		/obj/item/rig_module/chem_dispenser/combat,
+		)
+
+/obj/item/weapon/rig/military/empty
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/electrowarfare_suite,
 		)

code/modules/clothing/spacesuits/rig/suits/pmc.dm

@@ -0,0 +1,124 @@
+/obj/item/clothing/head/helmet/space/rig/pmc
+	light_overlay = "helmet_light_dual"
+
+/obj/item/weapon/rig/pmc
+	name = "PMC hardsuit control module"
+	desc = "A suit worn by private military contractors. Armoured and space ready."
+	suit_type = "PMC"
+	icon_state = "pmc_commandergrey_rig"
+
+	helm_type = /obj/item/clothing/head/helmet/space/rig/pmc
+
+	req_access = list(access_cent_specops)
+
+	armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95)
+	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/tool/crowbar, \
+	/obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/device/multitool, \
+	/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
+	/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
+
+/obj/item/weapon/rig/pmc/commander
+	name = "PMC-C hardsuit control module"
+	desc = "A suit worn by private military contractors. Armoured and space ready."
+	suit_type = "PMC commander"
+	icon_state = "pmc_commandergrey_rig"
+
+/obj/item/weapon/rig/pmc/commander/grey/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/datajack,
+		)
+
+/obj/item/weapon/rig/pmc/commander/green
+	icon_state = "pmc_commandergreen_rig"
+
+/obj/item/weapon/rig/pmc/commander/green/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/datajack,
+		)
+
+/obj/item/weapon/rig/pmc/engineer
+	name = "PMC-E suit control module"
+	desc = "A suit worn by private military contractors. This one is setup for engineering. Armoured and space ready."
+	suit_type = "PMC engineer"
+	icon_state = "pmc_engineergrey_rig"
+	armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 100)
+	siemens_coefficient = 0
+
+/obj/item/weapon/rig/pmc/engineer/grey/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/device/plasmacutter,
+		/obj/item/rig_module/device/rcd
+		)
+
+/obj/item/weapon/rig/pmc/engineer/green
+	icon_state = "pmc_engineergreen_rig"
+
+/obj/item/weapon/rig/pmc/engineer/green/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/device/plasmacutter,
+		/obj/item/rig_module/device/rcd
+		)
+
+/obj/item/weapon/rig/pmc/medical
+	name = "PMC-M suit control module"
+	desc = "A suit worn by private military contractors. This one is setup for medical. Armoured and space ready."
+	suit_type = "PMC medic"
+	icon_state = "pmc_medicalgrey_rig"
+
+/obj/item/weapon/rig/pmc/medical/grey/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/device/healthscanner,
+		/obj/item/rig_module/chem_dispenser/injector/advanced
+		)
+
+/obj/item/weapon/rig/pmc/medical/green
+	icon_state = "pmc_medicalgreen_rig"
+
+/obj/item/weapon/rig/pmc/medical/green/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/device/healthscanner,
+		/obj/item/rig_module/chem_dispenser/injector/advanced
+		)
+
+/obj/item/weapon/rig/pmc/security
+	name = "ERT-S suit control module"
+	desc = "A suit worn by private military contractors. This one is setup for security. Armoured and space ready."
+	suit_type = "PMC security"
+	icon_state = "pmc_securitygrey_rig"
+
+/obj/item/weapon/rig/pmc/security/grey/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/mounted/egun,
+		)
+
+/obj/item/weapon/rig/pmc/security/green
+	icon_state = "pmc_securitygreen_rig"
+
+/obj/item/weapon/rig/pmc/security/green/equipped
+
+	initial_modules = list(
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/mounted/egun,
+		)

code/modules/clothing/spacesuits/void/station.dm

@@ -244,3 +244,62 @@
 	name = "heavy duty atmos voidsuit"
 	armor = list(melee = 20, bullet = 5, laser = 20,energy = 15, bomb = 45, bio = 100, rad = 50)
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+
+//Exploration
+/obj/item/clothing/head/helmet/space/void/exploration
+	name = "exploration voidsuit helmet"
+	desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments."
+	icon_state = "helm_explorer"
+	item_state = "helm_explorer"
+	item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black")
+	armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
+	light_overlay = "helmet_light_dual" //explorer_light
+
+/obj/item/clothing/suit/space/void/exploration
+	name = "exploration voidsuit"
+	desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments."
+	icon_state = "void_explorer"
+	item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black")
+	armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \
+	/obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun)
+
+/obj/item/clothing/head/helmet/space/void/exploration/alt
+	desc = "A radiation-resistant helmet retrofitted for exploring unknown planetary environments."
+	icon_state = "helm_explorer2"
+	item_state = "helm_explorer2"
+	item_state_slots = list(slot_r_hand_str = "mining_helm", slot_l_hand_str = "mining_helm")
+
+/obj/item/clothing/suit/space/void/exploration/alt
+	desc = "A lightweight, radiation-resistant voidsuit. Retrofitted for exploring unknown planetary environments."
+	icon_state = "void_explorer2"
+	item_state_slots = list(slot_r_hand_str = "skrell_suit_white", slot_l_hand_str = "skrell_suit_white")
+
+//Pilot
+/obj/item/clothing/head/helmet/space/void/pilot
+	desc = "An atmos resistant helmet for space and planet exploration."
+	name = "pilot voidsuit helmet"
+	icon_state = "rig0_pilot"
+	item_state = "pilot_helm"
+	item_state_slots = list(slot_r_hand_str = "atmos_helm", slot_l_hand_str = "atmos_helm")
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
+	light_overlay = "helmet_light_dual"
+
+/obj/item/clothing/suit/space/void/pilot
+	desc = "An atmos resistant voidsuit for space and planet exploration."
+	icon_state = "rig-pilot"
+	item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit")
+	name = "pilot voidsuit"
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	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/clothing/head/helmet/space/void/pilot/alt
+	icon_state = "rig0_pilot2"
+	item_state = "pilot_helm2"
+
+/obj/item/clothing/suit/space/void/pilot/alt
+	desc = "An atmos resistant voidsuit for space."
+	icon_state = "rig-pilot2"
+	item_state = "rig-pilot2"

html/changelogs/Woodrat - Spacesuit.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Adds two rig suits. Military Rig suit from bay and PMC rigsuits"
+  - rscadd: "Adds four exploration and pilot voidsuits (alternate sprites by Naidh)"
+  - rscadd: "Adds exploration and pilot voidsuits"

maps/southern_cross/southern_cross_defines.dm

@@ -261,3 +261,16 @@
 		Z_LEVEL_SURFACE_WILD,
 		Z_LEVEL_TRANSIT
 	)
+
+//Suit Storage Units
+
+/obj/machinery/suit_cycler/exploration
+	name = "Explorer suit cycler"
+	model_text = "Exploration"
+	req_one_access = list(access_pilot,access_explorer)
+
+/obj/machinery/suit_cycler/pilot
+	name = "Pilot suit cycler"
+	model_text = "Pilot"
+	req_access = null
+	req_one_access = list(access_pilot,access_explorer)

polaris.dme

@@ -1430,6 +1430,7 @@
 #include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\light.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\pmc.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
 #include "code\modules\clothing\spacesuits\void\merc.dm"
 #include "code\modules\clothing\spacesuits\void\station.dm"