Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/client/preference_setup/general/04_equipment.dm

@@ -42,7 +42,7 @@
 		pref.backbag = 2 //Same as above
 	character.backbag = pref.backbag
 
-	if(pref.pdachoice > 6 || pref.pdachoice < 1)
+	if(pref.pdachoice > 7 || pref.pdachoice < 1)
 		pref.pdachoice = 1
 	character.pdachoice = pref.pdachoice
 
@@ -156,4 +156,4 @@
 			return TOPIC_REFRESH //End of YW EDIT
 
 
-	return ..()
+	return ..()

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -47,6 +47,10 @@
 	display_name = "Glasses, hipster"
 	path = /obj/item/clothing/glasses/regular/hipster
 
+/datum/gear/eyes/glasses/threedglasses
+	display_name = "Glasses, 3D"
+	path = /obj/item/clothing/glasses/threedglasses
+
 /datum/gear/eyes/glasses/monocle
 	display_name = "monocle"
 	path = /obj/item/clothing/glasses/monocle

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -13,6 +13,18 @@
 	display_name = "tourist, green"
 	path = /obj/item/clothing/shoes/tourist_2
 
+/datum/gear/shoes/sneakerspurple
+	display_name = "sneakers, purple"
+	path = /obj/item/clothing/shoes/sneakerspurple
+
+/datum/gear/shoes/sneakersblue
+	display_name = "sneakers, blue"
+	path = /obj/item/clothing/shoes/sneakersblue
+
+/datum/gear/shoes/sneakersred
+	display_name = "sneakers, red"
+	path = /obj/item/clothing/shoes/sneakersred
+
 /datum/gear/shoes/jackboots
 	display_name = "jackboots"
 	path = /obj/item/clothing/shoes/boots/jackboots

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -199,6 +199,18 @@
 	path = /obj/item/clothing/suit/cyberpunk
 	cost = 2
 
+/datum/gear/suit/puffycoat/blue
+	display_name = "puffy coat, blue"
+	path = /obj/item/clothing/suit/storage/puffyblue
+
+/datum/gear/suit/puffycoat/red
+	display_name = "puffy coat, red"
+	path = /obj/item/clothing/suit/storage/puffyred
+
+/datum/gear/suit/puffycoat/purple
+	display_name = "puffy coat, purple"
+	path = /obj/item/clothing/suit/storage/puffypurple
+
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
 	path = /obj/item/clothing/accessory/poncho
@@ -228,7 +240,6 @@
 	)
 	gear_tweaks += new/datum/gear_tweak/path(ponchos)
 
-
 /datum/gear/suit/roles/cloak
 	display_name = "cloak selection, departments"
 	path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo

code/modules/client/preference_setup/loadout/loadout_suit_vr.dm

@@ -119,3 +119,8 @@ Talon winter coat
 	display_name = "knight, Field Medic"
 	path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM
 	allowed_roles = list ("Field Medic")
+
+//Atmos-coloured hazard vest
+	display_name = "hazard vest, atmospherics"
+	path = /obj/item/clothing/suit/storage/hazardvest/atmos
+	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -699,6 +699,26 @@
 	display_name = "heavy utility, galactic survey"
 	path = /obj/item/clothing/under/gsa_work
 
+/*
+ * 80s
+ */
+
+/datum/gear/uniform/tropical_outfit/black
+	display_name = "tropical outfit, animal style"
+	path = /obj/item/clothing/under/tropical
+
+/datum/gear/uniform/tropical_outfit/green
+	display_name = "tropical outfit, tropico-puke"
+	path = /obj/item/clothing/under/tropical/green
+
+/datum/gear/uniform/tropical_outfit/pink
+	display_name = "tropical outfit, 3005 vintage"
+	path = /obj/item/clothing/under/tropical/pink
+
+/datum/gear/uniform/tropical_outfit/blue
+	display_name = "tropical outfit, miami vice"
+	path = /obj/item/clothing/under/tropical/blue
+
 /*
  * Branded Uniforms
  */

code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm

@@ -237,3 +237,31 @@ Talon jumpsuit
 		"red and white" = /obj/item/clothing/under/summerdress/red
 	)
 	gear_tweaks += new/datum/gear_tweak/path(dresses)
+
+// undersuits
+/datum/gear/uniform/undersuit
+	display_name = "undersuit selection"
+	path = /obj/item/clothing/under/undersuit
+
+/datum/gear/uniform/undersuit/New()
+	..()
+	var/list/suits = list()
+	var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec, /obj/item/clothing/under/undersuit/sec/hos, /obj/item/clothing/under/undersuit/hazard, /obj/item/clothing/under/undersuit/command, /obj/item/clothing/under/undersuit/centcom)
+	for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit) - blacklisted_types)
+		suits[initial(undersuit_type.name)] = undersuit_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
+
+/datum/gear/uniform/undersuit_sec
+	display_name = "undersuit, security (Security)"
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+	path = /obj/item/clothing/under/undersuit/sec
+
+/datum/gear/uniform/undersuit_hos
+	display_name = "undersuit, security command (HoS)"
+	allowed_roles = list("Head of Security")
+	path = /obj/item/clothing/under/undersuit/sec/hos
+
+/datum/gear/uniform/undersuit_com
+	display_name = "undersuit, command (SM/HoP)"
+	allowed_roles = list("Site Manager", "Head of Personnel")
+	path = /obj/item/clothing/under/undersuit/command