Merge pull request #14418 from Flump1/master

Ports four outfits from skyrat

code/modules/clothing/gloves/miscellaneous.dm

@@ -142,6 +142,11 @@
 	drop_sound = 'sound/items/drop/metalboots.ogg'
 	pickup_sound = 'sound/items/pickup/toolbox.ogg'
 
+/obj/item/clothing/gloves/maid_arms
+	name = "maid arm covers"
+	desc = "Cylindrical looking tubes that go over your arm, weird."
+	icon_state = "maid_arms"
+
 /obj/item/clothing/gloves/ranger
 	var/glovecolor = "white"
 	name = "ranger gloves"

code/modules/clothing/head/misc.dm

@@ -14,7 +14,12 @@
 	name = "halo"
 	desc = "a small metal ring, floating above it's wearer."
 	icon_state = "halo"
-	
+
+/obj/item/clothing/head/maid_headband
+	name = "maid headband"
+	desc = "Just like from my Japanese cartoons!"
+	icon_state = "maid_headband"
+
 /obj/item/clothing/head/pin
 	icon_state = "pin"
 	addblends = "pin_a"

code/modules/clothing/shoes/boots.dm

@@ -241,3 +241,13 @@
 	icon_state = "jackboots"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	siemens_coefficient = 0.6
+
+/obj/item/clothing/shoes/boots/bsing
+    name = "blue performer's boots"
+    desc = "These boots were made for dancing."
+    icon_state = "bsing"
+
+/obj/item/clothing/shoes/boots/ysing
+	name = "yellow performer's boots"
+	desc = "These boots were made for dancing."
+	icon_state = "ysing"

code/modules/clothing/suits/miscellaneous.dm

@@ -277,6 +277,12 @@
 	flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
 	item_state_slots = list(slot_r_hand_str = "red_labcoat", slot_l_hand_str = "red_labcoat")
 
+/obj/item/clothing/suit/shrine_maiden
+	name = "Shrine maiden costume."
+	desc = "Makes you want to exterminate some troublesome youkai."
+	icon_state = "shrine_maiden"
+	body_parts_covered = LOWER_TORSO|UPPER_TORSO|LEGS|ARMS
+
 /*
  * Misc
  */

code/modules/clothing/under/accessories/accessory.dm

@@ -171,6 +171,16 @@
 	name = "white bow tie"
 	icon_state = "whitebowtie"
 
+/obj/item/clothing/accessory/maid_neck
+	name = "maid neck cover"
+	desc = "A neckpiece for a maid costume, it smells faintly of disappointment."
+	icon_state = "maid_neck"
+
+/obj/item/clothing/accessory/maidcorset
+	name = "maid corset"
+	desc = "The final touch that holds it all together."
+	icon_state = "maidcorset"
+
 /obj/item/clothing/accessory/stethoscope
 	name = "stethoscope"
 	desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."

code/modules/clothing/under/miscellaneous.dm

@@ -360,6 +360,11 @@
 	desc = "You must be a bit risque teasing all of them in a maid uniform!"
 	icon_state = "sexymaid"
 
+/obj/item/clothing/under/dress/maid/under_maid
+	name = "cute maid uniform"
+	desc = "You're going to use this for housekeeping, right?."
+	icon_state = "under_maid"
+
 /obj/item/clothing/under/dress/dress_fire
 	name = "flame dress"
 	desc = "A small black dress with blue flames print on it."
@@ -587,6 +592,16 @@
 	desc = "A waistline this high is just made for ripping bodices, swashing buckles, or - just occasionally - sucking blood."
 	icon_state = "gayvampire"
 
+/obj/item/clothing/under/dress/bsing
+	name = "blue singer dress"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "bsing"
+
+/obj/item/clothing/under/dress/ysing
+	name = "yellow singer dress"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "ysing"
+
 /*
  * Wedding Stuff
  */

code/modules/economy/vending_machines_vr.dm

@@ -1527,7 +1527,17 @@
 					/obj/item/clothing/shoes/knight_costume = 3,
 					/obj/item/clothing/shoes/knight_costume/black = 3,
 					/obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 3,
-					/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 3)
+					/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 3,
+					/obj/item/clothing/under/dress/bsing = 3,
+					/obj/item/clothing/shoes/boots/bsing = 3,
+					/obj/item/clothing/under/dress/ysing = 3,
+					/obj/item/clothing/shoes/boots/ysing = 3,
+					/obj/item/clothing/under/dress/maid/under_maid = 3,
+					/obj/item/clothing/accessory/maid_neck = 3,
+					/obj/item/clothing/gloves/maid_arms = 3,
+					/obj/item/clothing/head/maid_headband = 3,
+					/obj/item/clothing/accessory/maidcorset = 3,
+					/obj/item/clothing/suit/shrine_maiden = 3)
 	prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
 					/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
 					/obj/item/clothing/suit/chickensuit = 200,
@@ -1594,7 +1604,17 @@
 					/obj/item/clothing/shoes/knight_costume = 200,
 					/obj/item/clothing/shoes/knight_costume/black = 200,
 					/obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 200,
-					/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 200)
+					/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 200,
+					/obj/item/clothing/under/dress/bsing = 200,
+					/obj/item/clothing/shoes/boots/bsing = 50,
+					/obj/item/clothing/under/dress/ysing = 200,
+					/obj/item/clothing/shoes/boots/ysing = 50,
+					/obj/item/clothing/under/dress/maid/under_maid = 200,
+					/obj/item/clothing/accessory/maid_neck = 25,
+					/obj/item/clothing/gloves/maid_arms = 25,
+					/obj/item/clothing/head/maid_headband = 25,
+					/obj/item/clothing/accessory/maidcorset = 25,
+					/obj/item/clothing/suit/shrine_maiden = 200)
 	premium = list(/obj/item/clothing/suit/imperium_monk = 3,
 					/obj/item/clothing/suit/barding/agatha = 2,
 					/obj/item/clothing/suit/barding/alt_agatha = 2,
@@ -1753,7 +1773,17 @@
 					/obj/item/clothing/gloves/combat/knight_costume = 3,
 					/obj/item/clothing/gloves/combat/knight_costume/brown = 3,
 					/obj/item/clothing/shoes/knight_costume = 3,
-					/obj/item/clothing/shoes/knight_costume/black = 3)
+					/obj/item/clothing/shoes/knight_costume/black = 3,
+					/obj/item/clothing/under/dress/bsing = 3,
+					/obj/item/clothing/shoes/boots/bsing = 3,
+					/obj/item/clothing/under/dress/ysing = 3,
+					/obj/item/clothing/shoes/boots/ysing = 3,
+					/obj/item/clothing/under/dress/maid/under_maid = 3,
+					/obj/item/clothing/accessory/maid_neck = 3,
+					/obj/item/clothing/gloves/maid_arms = 3,
+					/obj/item/clothing/head/maid_headband = 3,
+					/obj/item/clothing/accessory/maidcorset = 3,
+					/obj/item/clothing/suit/shrine_maiden = 3)
 
 // Event Loadout Vending Machines Start
 
@@ -2541,7 +2571,17 @@
 					/obj/item/clothing/suit/barding/mason = 2,
 					/obj/item/clothing/suit/drake_cloak = 2,
 					/obj/item/clothing/head/syndicatefake = 1,
-					/obj/item/clothing/suit/syndicatefake = 1
+					/obj/item/clothing/suit/syndicatefake = 1,
+					/obj/item/clothing/under/dress/bsing = 3,
+					/obj/item/clothing/shoes/boots/bsing = 3,
+					/obj/item/clothing/under/dress/ysing = 3,
+					/obj/item/clothing/shoes/boots/ysing = 3,
+					/obj/item/clothing/under/dress/maid/under_maid = 3,
+					/obj/item/clothing/accessory/maid_neck = 3,
+					/obj/item/clothing/gloves/maid_arms = 3,
+					/obj/item/clothing/head/maid_headband = 3,
+					/obj/item/clothing/accessory/maidcorset = 3,
+					/obj/item/clothing/suit/shrine_maiden = 3
 					)
 
 // Event Loadout Vending Machines End