TGS Test Merge (#6042)

code/game/machinery/vending.dm

@@ -2479,6 +2479,7 @@
 		/obj/item/clothing/suit/banana = 3,
 		/obj/item/clothing/suit/assassin = 3,
 		/obj/item/clothing/head/bard = 3,
+		/obj/item/clothing/head/helmet/aquiline = 3,
 		/obj/item/clothing/under/aquiline_enforcer = 3,
 		/obj/item/clothing/under/yoko = 3,
 		/obj/item/clothing/under/kamina = 3,

code/modules/clothing/head/helmet.dm

@@ -386,6 +386,14 @@
 /obj/item/clothing/head/helmet/kettle/eyes
 	icon_state = "kettle_eyes"
 
+//Dredd
+/obj/item/clothing/head/helmet/aquiline
+	name = "aquiline enforcer helmet"
+	desc = "Prior to the Final War, issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. This striking helmet was designed to help law enforcement officers easily identify themselves in crowds."
+	icon = 'icons/clothing/uniform/costume/aquiline.dmi'
+	icon_state = "dredd"
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
 //More Warhammer Fun
 /obj/item/clothing/head/helmet/utilitarian
 	name = "utilitarian military helmet"

code/modules/clothing/shoes/miscellaneous.dm

@@ -286,3 +286,10 @@
 	icon = 'icons/clothing/shoes/ballet.dmi'
 	icon_state = "ballet"
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
+/obj/item/clothing/shoes/socksandals
+	name = "socks and sandals"
+	desc = "These broken in leather sandals go great with a brand new pair of white socks. The ultimate in comfort for a wandering sightseer."
+	icon = 'icons/clothing/uniform/misc/tourist.dmi'
+	icon_state = "touristsandal"
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

code/modules/clothing/under/miscellaneous.dm

@@ -2356,3 +2356,10 @@
 	icon = 'icons/clothing/uniform/costume/darkcleric.dmi'
 	icon_state = "darkcleric"
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
+/obj/item/clothing/under/tourist
+	name = "tourist liesurewear"
+	desc = "This loud shirt is made of mid-grade cashmere. This premier liesurewear pairs well with a nice pair of khaki shorts that stop uncomfortably above the knee."
+	icon = 'icons/clothing/uniform/misc/tourist.dmi'
+	icon_state = "tourist"
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

code/modules/holidays/halloween_loadout.dm

@@ -140,6 +140,10 @@
 	display_name = "Costume Head - Dark Cleric Circlet"
 	path = /obj/item/clothing/head/darkcleric
 
+/datum/loadout_entry/seasonal/halloween/costumes/head/aquiline
+	display_name = "Costume Head - Aquiline Enforcer"
+	path = /obj/item/clothing/head/helmet/aquiline
+
 // Mask
 /datum/loadout_entry/seasonal/halloween/costumes/mask
 	name = "Costume Mask - Fake Moustache"
@@ -432,6 +436,10 @@
 	display_name = "Costume Uniform - Dark Cleric Armor"
 	path = /obj/item/clothing/under/darkcleric
 
+/datum/loadout_entry/seasonal/halloween/costumes/under/aquiline
+	display_name = "Costume Uniform - Aquiline Enforcer"
+	path = /obj/item/clothing/under/aquiline_enforcer
+
 // Gloves
 
 /datum/loadout_entry/seasonal/halloween/costumes/gloves

code/modules/loadout/loadout_shoes.dm

@@ -227,3 +227,7 @@
 /datum/loadout_entry/shoes/ballet
 	name = "Antheia Pointe Shoes"
 	path = /obj/item/clothing/shoes/ballet
+
+/datum/loadout_entry/shoes/socksandals
+	name = "Sandals With Socks"
+	path = /obj/item/clothing/shoes/socksandals

code/modules/loadout/loadout_uniform.dm

@@ -917,6 +917,10 @@ Swimsuits
 	name = "Antheia Tutu"
 	path = /obj/item/clothing/under/ballet
 
+/datum/loadout_entry/uniform/tourist
+	name = "Tourist Liesurewear"
+	path = /obj/item/clothing/under/tourist
+
 //Tajaran wears
 
 /datum/loadout_entry/uniform/tajaran/summercloths_selection