Merge pull request #51 from Atermonera/jumpsuits

Port most standard jumpsuits (#4)

code/modules/client/preference_setup/loadout/lists/uniforms.dm

@@ -165,3 +165,14 @@
 	name = "dress, nurse"
 	path = /obj/item/clothing/dress/nurse
 	uid = "gear_under_nurse"
+
+/decl/loadout_option/uniform/utility
+	name = "utility jumpsuit selection"
+	path = /obj/item/clothing/jumpsuit/utility
+	loadout_flags = GEAR_HAS_TYPE_SELECTION
+	uid = "gear_under_util_jumpsuit"
+
+/decl/loadout_option/uniform/sleekoveralls
+	name = "overalls, sleek"
+	path = /obj/item/clothing/jumpsuit/sleekoveralls
+	uid = "gear_under_overalls"

code/modules/clothing/jumpsuits/_jumpsuit.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/jumpsuit
 	name = "jumpsuit"
-	desc = "The latest in space fashion."
+	desc = "The latest in utilitarian fashion."
 	icon = 'icons/clothing/jumpsuits/jumpsuit.dmi'
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_ARMS
 	permeability_coefficient = 0.90

code/modules/clothing/jumpsuits/color.dm

@@ -57,4 +57,4 @@
 
 /obj/item/clothing/jumpsuit/brown
 	name = "brown jumpsuit"
-	color = "#c08720"
+	color = "#8d6722"

code/modules/clothing/jumpsuits/corp.dm

@@ -0,0 +1,80 @@
+/*
+ * Corporate
+*/
+
+/obj/item/clothing/jumpsuit/corporate
+	name = "\improper NanoTrasen assistant uniform"
+	icon = 'icons/clothing/jumpsuits/corp/corp_nanotrasen.dmi'
+	desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey."
+
+/obj/item/clothing/jumpsuit/corporate/techass
+	name = "\improper NanoTrasen technical assistant's uniform"
+	desc = "A NanoTrasen-branded jumpsuit in fetching ocean grey with engineering yellow accents."
+	icon = 'icons/clothing/jumpsuits/corp/corp_nanotrasentech.dmi'
+
+/obj/item/clothing/jumpsuit/corporate/veymed
+	name = "\improper Vey-Medical uniform"
+	icon = 'icons/clothing/jumpsuits/corp/corp_nanotrasen.dmi'
+	desc = "A uniform belonging to Vey-Medical, a Skrellian biomedical Trans-Stellar."
+	armor = list(
+		ARMOR_BIO = ARMOR_BIO_MINOR
+	)
+
+/obj/item/clothing/jumpsuit/corporate/centauri
+	name = "\improper Centauri Provisions jumpsuit"
+	icon = 'icons/clothing/jumpsuits/corp/corp_centauri.dmi'
+	desc = "A jumpsuit belonging to Centauri Provisions, a Trans-Stellar best known for its food and drink products."
+
+/obj/item/clothing/jumpsuit/corporate/grayson
+	name = "\improper Grayson overalls"
+	icon = 'icons/clothing/jumpsuits/corp/corp_grayson.dmi'
+	desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar."
+
+/obj/item/clothing/jumpsuit/corporate/kaleidoscope
+	name = "\improper Kaleidoscope uniform"
+	icon = 'icons/clothing/jumpsuits/corp/corp_kaleid.dmi'
+	desc = "A science uniform belonging to Kaleidoscope Cosmetics, a cosmetic and gene-modification trans-stellar."
+	armor = list(
+		ARMOR_BIO = ARMOR_BIO_MINOR
+	)
+
+/obj/item/clothing/jumpsuit/corporate/mbill_flight
+	name = "\improper Major Bill's flight suit"
+	icon = 'icons/clothing/jumpsuits/corp/corp_mbillflight.dmi'
+	desc = "A faux-surplus pilot's suit belonging to Major Bill's Transportation, a shipping megacorporation."
+
+/obj/item/clothing/jumpsuit/corporate/wulf
+	name = "\improper Wulf jumpsuit"
+	icon = 'icons/clothing/jumpsuits/corp/corp_wulf.dmi'
+	desc = "A jumpsuit belonging to Wulf Aeronautics, a ship-building and propulsion systems Trans-Stellar."
+
+/obj/item/clothing/jumpsuit/corporate/xion
+	name = "\improper Xion jumpsuit"
+	icon = 'icons/clothing/jumpsuits/corp/corp_xion.dmi'
+	desc = "A jumpsuit belonging to Xion Manufacturing, an industrial equipment Trans-Stellar."
+
+
+/obj/item/clothing/jumpsuit/corporate/zenghu
+	name = "\improper Zeng-Hu jumpsuit"
+	icon = 'icons/clothing/jumpsuits/corp/corp_zenghu.dmi'
+	desc = "A jumpsuit belonging to Zeng-Hu Pharmaceuticals, a Trans-Stellar in the business of exactly what you'd expect..."
+	armor = list(
+		ARMOR_BIO = ARMOR_BIO_MINOR
+	)
+
+/obj/item/clothing/costume/hedberg //Not in loadout
+	name = "\improper Hedberg law enforcement uniform"
+	icon = 'icons/clothing/jumpsuits/corp/corp_hedberg.dmi'
+	desc = "A sturdy civilian law enforcement uniform belonging to the Hedberg-Hammarstrom private security corporation."
+	armor = list(
+		ARMOR_MELEE = ARMOR_MELEE_SMALL
+		) //Equivalent to security jumpsuit
+	siemens_coefficient = 0.9
+
+/obj/item/clothing/costume/hedbergtech //Not in loadout
+	name = "\improper Hedberg technician uniform"
+	icon = 'icons/clothing/jumpsuits/corp/corp_hedbergtech.dmi'
+	desc = "A technician's uniform belonging to the Hedberg-Hammarstrom private security corporation. It is lightly shielded against radiation."
+	armor = list(
+		ARMOR_RAD = ARMOR_RAD_MINOR
+	) // Equivalent to engineer's jumpsuit.

code/modules/clothing/jumpsuits/job.dm

@@ -1,40 +1,39 @@
 
-/obj/item/clothing/jumpsuit/hazard
-	name = "hazard jumpsuit"
-	desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
-	icon = 'icons/clothing/jumpsuits/jumpsuit_hazard.dmi'
-	siemens_coefficient = 0.8
-	armor = list(
-		ARMOR_ENERGY = ARMOR_ENERGY_SMALL,
-		ARMOR_RAD = ARMOR_RAD_MINOR
-		)
-	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-
-/obj/item/clothing/jumpsuit/sterile
-	name = "sterile jumpsuit"
-	desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
-	icon = 'icons/clothing/jumpsuits/jumpsuit_sterile.dmi'
-	permeability_coefficient = 0.50
-	armor = list(
-		ARMOR_BIO = ARMOR_BIO_SMALL
-	)
-
-/obj/item/clothing/jumpsuit/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
-	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
-	name = "captain's jumpsuit"
-	icon = 'icons/clothing/jumpsuits/jumpsuit_captain.dmi'
+/*
+ * Cargo
+ */
 
 /obj/item/clothing/jumpsuit/cargo
 	name = "quartermaster's jumpsuit"
 	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
 	icon = 'icons/clothing/jumpsuits/jumpsuit_qm.dmi'
 
 /obj/item/clothing/jumpsuit/cargotech
+	name = "cargo technician's jumpsuit"
+	desc = "Practical high-visibility workwear for lugging crates at the crack of dawn."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_cargo_alt.dmi'
+
+/obj/item/clothing/jumpsuit/miner
+	desc = "A branded high-vis jumpsuit for toiling in the mines. Somehow it's dirty already."
+	name = "shaft miner's jumpsuit"
+	icon = 'icons/clothing/jumpsuits/jumpsuit_miner.dmi'
+
+/obj/item/clothing/jumpsuit/miner/overalls
+	desc = "It's a snappy purple shirt with a sturdy set of overalls. Very retro."
+	name = "shaft miner's overalls"
+	icon = 'icons/clothing/jumpsuits/jumpsuit_miner_overalls.dmi'
+
+
+/obj/item/clothing/jumpsuit/cargoshort
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
 	icon = 'icons/clothing/jumpsuits/jumpsuit_cargo.dmi'
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS
 
+/*
+ * Civilian
+ */
+
 /obj/item/clothing/jumpsuit/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
 	name = "chaplain's jumpsuit"
@@ -59,10 +58,10 @@
 		ARMOR_BIO = ARMOR_BIO_MINOR
 	)
 
-/obj/item/clothing/jumpsuit/miner
-	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
-	name = "shaft miner's jumpsuit"
-	icon = 'icons/clothing/jumpsuits/jumpsuit_miner.dmi'
+/*
+ * Engineering
+ */
+
 /obj/item/clothing/jumpsuit/chief_engineer
 	desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
 	name = "chief engineer's jumpsuit"
@@ -71,6 +70,18 @@
 		ARMOR_RAD = ARMOR_RAD_MINOR
 	)
 
+/obj/item/clothing/jumpsuit/hazard
+	name = "hazard jumpsuit"
+	desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_hazard.dmi'
+	siemens_coefficient = 0.8
+	armor = list(
+		ARMOR_ENERGY = ARMOR_ENERGY_SMALL,
+		ARMOR_RAD = ARMOR_RAD_MINOR
+		)
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+
+
 /obj/item/clothing/jumpsuit/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
 	name = "atmospheric technician's jumpsuit"
@@ -84,6 +95,10 @@
 		ARMOR_RAD = ARMOR_RAD_MINOR
 		)
 
+/*
+ * Research / Science
+ */
+
 /obj/item/clothing/jumpsuit/roboticist
 	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
 	name = "roboticist's jumpsuit"
@@ -125,6 +140,15 @@
 		ARMOR_BIO = ARMOR_BIO_MINOR
 		)
 
+/obj/item/clothing/jumpsuit/sterile
+	name = "sterile jumpsuit"
+	desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_sterile.dmi'
+	permeability_coefficient = 0.50
+	armor = list(
+		ARMOR_BIO = ARMOR_BIO_SMALL
+	)
+
 /obj/item/clothing/jumpsuit/geneticist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
 	name = "geneticist's jumpsuit"
@@ -161,6 +185,16 @@
 	name = "short sleeve medical jumpsuit"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
 
+/obj/item/clothing/jumpsuit/medical/utility
+	name = "medical utility jumpsuit"
+	desc = "A hard-wearing version of the standard medical uniform, made with the same bioresistant lining. Designed for long term medical postings."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_utility_med.dmi'
+
+
+/*
+ * Security
+ */
+
 /obj/item/clothing/jumpsuit/head_of_security
 	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
 	name = "head of security's jumpsuit"
@@ -173,6 +207,17 @@
 	matter = list(/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE)
 	origin_tech = @'{"materials":1,"engineering":1, "combat":1}'
 
+/obj/item/clothing/jumpsuit/head_of_security/corporate
+	icon = 'icons/clothing/jumpsuits/jumpsuit_hos_corp.dmi'
+
+/obj/item/clothing/jumpsuit/head_of_security/jensen
+	desc = "You never asked for anything that stylish."
+	name = "head of security's jumpsuit"
+	icon = 'icons/clothing/jumpsuits/jumpsuit_hos_alt.dmi'
+	siemens_coefficient = 0.6
+	matter = list(/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE)
+	origin_tech = @'{"materials":3,"engineering":1, "combat":2}'
+
 /obj/item/clothing/jumpsuit/warden
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
 	name = "warden's jumpsuit"
@@ -185,6 +230,9 @@
 		/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE
 	)
 
+/obj/item/clothing/jumpsuit/warden/corporate
+	icon = 'icons/clothing/jumpsuits/jumpsuit_warden_corp.dmi'
+
 /obj/item/clothing/jumpsuit/security
 	name = "security officer's jumpsuit"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
@@ -197,25 +245,18 @@
 		/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE
 	)
 
-/obj/item/clothing/jumpsuit/head_of_security/jensen
-	desc = "You never asked for anything that stylish."
-	name = "head of security's jumpsuit"
-	icon = 'icons/clothing/jumpsuits/jumpsuit_hos_alt.dmi'
-	siemens_coefficient = 0.6
-	matter = list(/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE)
-	origin_tech = @'{"materials":3,"engineering":1, "combat":2}'
+/obj/item/clothing/jumpsuit/security/corporate
+	icon = 'icons/clothing/jumpsuits/jumpsuit_sec_corp.dmi'
 
-/obj/item/clothing/jumpsuit/tactical
-	name = "tactical jumpsuit"
-	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
-	icon = 'icons/clothing/uniform_swat.dmi'
-	armor = list(
-		ARMOR_MELEE = ARMOR_MELEE_SMALL
-		)
-	siemens_coefficient = 0.9
-	matter = list(
-		/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE
-	)
+
+/*
+ * Command
+*/
+
+/obj/item/clothing/jumpsuit/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
+	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
+	name = "captain's jumpsuit"
+	icon = 'icons/clothing/jumpsuits/jumpsuit_captain.dmi'
 
 /obj/item/clothing/jumpsuit/captainformal
 	name = "captain's formal uniform"

code/modules/clothing/jumpsuits/misc.dm

@@ -39,3 +39,35 @@
 	desc = "A holy jumpsuit. Treat it well."
 	icon = 'icons/clothing/jumpsuits/caretaker.dmi'
 	bodytype_equip_flags = BODY_FLAG_HUMANOID
+
+/obj/item/clothing/jumpsuit/tactical
+	name = "tactical jumpsuit"
+	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+	icon = 'icons/clothing/uniform_swat.dmi'
+	armor = list(
+		ARMOR_MELEE = ARMOR_MELEE_SMALL
+		)
+	siemens_coefficient = 0.9
+	matter = list(
+		/decl/material/solid/metal/steel = MATTER_AMOUNT_TRACE
+	)
+
+/*
+ * Utility
+*/
+
+/obj/item/clothing/jumpsuit/utility
+	name = "blue utility uniform"
+	desc = "A comfortable blue utility jumpsuit."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_utility_blue.dmi'
+
+/obj/item/clothing/jumpsuit/utility/grey
+	name = "grey utility uniform"
+	desc = "A comfortable grey utility jumpsuit."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_utility_grey.dmi'
+
+/obj/item/clothing/jumpsuit/sleekoveralls
+	name = "sleek overalls"
+	desc = "A set of modern pleather reinforced overalls."
+	icon = 'icons/clothing/jumpsuits/jumpsuit_sleekoveralls.dmi'
+

mods/content/corporate/clothing/under/jumpsuits.dm

@@ -1,19 +1,19 @@
-/obj/item/clothing/jumpsuit/aether
+/obj/item/clothing/jumpsuit/corporate/aether
 	name = "\improper Aether jumpsuit"
-	desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a company that supplies recycling and atmospheric systems to colonies."
+	desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies."
 	icon = 'mods/content/corporate/icons/clothing/under/aether.dmi'
 
-/obj/item/clothing/jumpsuit/focal
+/obj/item/clothing/jumpsuit/corporate/focal
 	name = "\improper Focal Point jumpsuit"
-	desc = "A jumpsuit belonging to Focal Point Energistics, an engineering corporation."
+	desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation."
 	icon = 'mods/content/corporate/icons/clothing/under/focal.dmi'
 
-/obj/item/clothing/jumpsuit/hephaestus
+/obj/item/clothing/jumpsuit/corporate/hephaestus
 	name = "\improper Hephaestus jumpsuit"
-	desc = "A jumpsuit belonging to Hephaestus Industries, a megacorp best known for its arms production."
+	desc = "A set of overalls belonging to Hephaestus, a Trans-Stellar best known for high-grade arms manufacturing."
 	icon = 'mods/content/corporate/icons/clothing/under/heph.dmi'
 
-/obj/item/clothing/jumpsuit/wardt
+/obj/item/clothing/jumpsuit/corporate/wardt
 	name = "\improper Ward-Takahashi jumpsuit"
-	desc = "A jumpsuit belonging to Ward-Takahashi, a megacorp in the consumer goods and research market."
+	desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market."
 	icon = 'mods/content/corporate/icons/clothing/under/wardt.dmi'

mods/content/corporate/clothing/under/security.dm

@@ -7,11 +7,11 @@
 /obj/item/clothing/jumpsuit/head_of_security/corp
 	icon = 'mods/content/corporate/icons/clothing/under/hos_corporate.dmi'
 
-/obj/item/clothing/jumpsuit/pcrc
+/obj/item/clothing/jumpsuit/corporate/pcrc
 	name = "\improper PCRC uniform"
 	desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
 	icon = 'mods/content/corporate/icons/clothing/under/pcrc.dmi'
 	armor = list(
 		ARMOR_MELEE = ARMOR_MELEE_SMALL
 		)
-	siemens_coefficient = 0.9
+	siemens_coefficient = 0.9