Merge remote-tracking branch 'refs/remotes/PolarisSS13/master'

code/game/machinery/suit_storage_unit.dm

@@ -586,7 +586,7 @@
 	var/electrified = 0
 
 	//Departments that the cycler can paint suits to look like.
-	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos")
+	var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT")
 	//Species that the suits can be configured to fit.
 	var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari")
 
@@ -616,7 +616,7 @@
 	name = "Engineering suit cycler"
 	model_text = "Engineering"
 	req_access = list(access_construction)
-	departments = list("Engineering","Atmos")
+	departments = list("Engineering","Atmos","HAZMAT")
 
 /obj/machinery/suit_cycler/mining
 	name = "Mining suit cycler"
@@ -751,7 +751,7 @@
 
 	//Clear the access reqs, disable the safeties, and open up all paintjobs.
 	user << "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>"
-	departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$")
+	departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","^%###^%$")
 	species = list("Human","Tajara","Skrell","Unathi", "Teshari")
 
 	emagged = 1
@@ -1018,6 +1018,15 @@
 				suit.name = "atmospherics voidsuit"
 				suit.icon_state = "rig-atmos"
 				suit.item_state = "atmos_voidsuit"
+		if("HAZMAT")
+			if(helmet)
+				helmet.name = "HAZMAT voidsuit helmet"
+				helmet.icon_state = "rig0-engineering_rad"
+				helmet.item_state = "rig0-engineering_rad"
+			if(suit)
+				suit.name = "HAZMAT voidsuit"
+				suit.icon_state = "rig-engineering_rad"
+				suit.item_state = "eng_voidsuit_rad"
 		if("^%###^%$" || "Mercenary")
 			if(helmet)
 				helmet.name = "blood-red voidsuit helmet"

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -517,9 +517,9 @@
 	new /obj/item/clothing/under/color/yellow(src)
 	new /obj/item/clothing/under/color/green(src)
 	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/skirt/plaid_blue(src)
-	new /obj/item/clothing/under/skirt/plaid_red(src)
-	new /obj/item/clothing/under/skirt/plaid_purple(src)
+	new /obj/item/clothing/under/skirt/outfit/plaid_blue(src)
+	new /obj/item/clothing/under/skirt/outfit/plaid_red(src)
+	new /obj/item/clothing/under/skirt/outfit/plaid_purple(src)
 	new /obj/item/clothing/shoes/blue(src)
 	new /obj/item/clothing/shoes/yellow(src)
 	new /obj/item/clothing/shoes/green(src)

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

@@ -7,6 +7,11 @@
 	item_state_slots = list(slot_r_hand_str = "eng_helm", slot_l_hand_str = "eng_helm")
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 
+/obj/item/clothing/head/helmet/space/void/engineering/rad
+	name = "HAZMAT voidsuit helmet"
+	icon_state = "rig0-engineering_rad"
+	item_state_slots = list(slot_r_hand_str = "eng_helm_rad", slot_l_hand_str = "eng_helm_rad")
+
 /obj/item/clothing/suit/space/void/engineering
 	name = "engineering voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
@@ -16,6 +21,11 @@
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 	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)
 
+/obj/item/clothing/suit/space/void/engineering/rad
+	name = "HAZMAT voidsuit"
+	icon_state = "rig-engineering_rad"
+	item_state_slots = list(slot_r_hand_str = "eng_voidsuit_rad", slot_l_hand_str = "eng_voidsuit_rad")
+
 //Mining
 /obj/item/clothing/head/helmet/space/void/mining
 	name = "mining voidsuit helmet"

code/modules/clothing/under/shorts.dm

@@ -91,10 +91,10 @@
 //Argh, skirts be below this line -> ------------------------------
 
 /obj/item/clothing/under/skirt
-	name = "black skirt"
-	desc = "A black skirt, very fancy!"
-	icon_state = "blackskirt"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	name = "short black skirt"
+	desc = "A skirt that is a shiny black."
+	icon_state = "skirt_short_black"
+	body_parts_covered = LOWER_TORSO
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/skirt/khaki
@@ -102,11 +102,6 @@
 	desc = "A skirt that is a khaki color."
 	icon_state = "skirt_khaki"
 
-/obj/item/clothing/under/skirt/black
-	name = "short black skirt"
-	desc = "A skirt that is a shiny black."
-	icon_state = "skirt_short_black"
-
 /obj/item/clothing/under/skirt/blue
 	name = "short blue skirt"
 	desc = "A skirt that is a shiny blue."
@@ -122,19 +117,25 @@
 	desc = "A skirt that is swept to one side."
 	icon_state = "skirt_swept"
 
-/obj/item/clothing/under/skirt/plaid_blue
+/obj/item/clothing/under/skirt/outfit
+	name = "black skirt"
+	desc = "A black skirt, very fancy!"
+	icon_state = "blackskirt"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/skirt/outfit/plaid_blue
 	name = "blue plaid skirt"
 	desc = "A preppy blue skirt with a white blouse."
 	icon_state = "plaid_blue"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
 
-/obj/item/clothing/under/skirt/plaid_red
+/obj/item/clothing/under/skirt/outfit/plaid_red
 	name = "red plaid skirt"
 	desc = "A preppy red skirt with a white blouse."
 	icon_state = "plaid_red"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
 
-/obj/item/clothing/under/skirt/plaid_purple
+/obj/item/clothing/under/skirt/outfit/plaid_purple
 	name = "blue purple skirt"
 	desc = "A preppy purple skirt with a white blouse."
 	icon_state = "plaid_purple"

html/changelogs/Anewbe - Skirts.yml

@@ -0,0 +1,36 @@
+################################
+# 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: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Split skirts into 'skirts', which are just a skirt, and 'skirt outfits', which cover the upper body. Check your loadouts, they should remain otherwise unchanged."