adds 2 performer's outfits

duncathan · Dec 19, 2016 · 3f70fcd · 3f70fcd
1 parent 2646f68
commit 3f70fcd
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 3 deletions.
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
@@ -909,6 +909,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 					/obj/item/clothing/suit/whitedress = 1,
 					/obj/item/clothing/under/jester = 1, /obj/item/clothing/head/jester = 1,
 					/obj/item/clothing/under/villain = 1,
+					/obj/item/clothing/shoes/ysing = 1,/obj/item/clothing/under/singery = 1,
+					/obj/item/clothing/shoes/bsing = 1,/obj/item/clothing/under/singerb = 1,
 					/obj/item/clothing/suit/hooded/carp_costume = 1,
 					/obj/item/clothing/suit/hooded/ian_costume = 1,
 					/obj/item/clothing/suit/hooded/bee_costume = 1,

diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
@@ -63,7 +63,7 @@
 /obj/item/weapon/vending_refill/autodrobe
 	machine_name = "AutoDrobe"
 	icon_state = "refill_costume"
-	charges = list(30, 2, 3)// of 90 standard, 6 contraband, 9 premium
+	charges = list(31, 2, 3)// of 94 standard, 6 contraband, 9 premium
 	init_charges = list(27, 2, 3)
 
 /obj/item/weapon/vending_refill/clothing

diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
@@ -41,12 +41,12 @@
 	name = "magic shoes"
 	icon_state = "black"
 	resistance_flags = FIRE_PROOF |  ACID_PROOF
-	
+
 /obj/item/clothing/shoes/sandal/magic
 	name = "magical sandals"
 	desc = "A pair of sandals imbued with magic"
 	resistance_flags = FIRE_PROOF |  ACID_PROOF
-	
+
 /obj/item/clothing/shoes/galoshes
 	desc = "A pair of yellow rubber boots, designed to prevent slipping on wet surfaces."
 	name = "galoshes"
@@ -201,3 +201,15 @@
 	usr.throw_at(target,jumpdistance,1, spin=0, diagonals_first = 1)
 	jumping = FALSE
 	recharging_time = world.time + recharging_rate
+
+/obj/item/clothing/shoes/ysing
+	name = "yellow performer's boots"
+	desc = "These boots were made for dancing."
+	icon_state = "ysing"
+	put_on_delay = 50
+
+/obj/item/clothing/shoes/bsing
+	name = "blue performer's boots"
+	desc = "These boots were made for dancing."
+	icon_state = "bsing"
+	put_on_delay = 50
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
@@ -535,6 +535,26 @@
 	can_adjust = 1
 	alt_covers_chest = 1
 
+/obj/item/clothing/under/singery
+	name = "yellow performer's outfit"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "ysing"
+	item_state = "ysing"
+	item_color = "ysing"
+	fitted = NO_FEMALE_UNIFORM
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	can_adjust = 0
+
+/obj/item/clothing/under/singerb
+	name = "blue performer's outfit"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "bsing"
+	item_state = "bsing"
+	item_color = "bsing"
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = 0
+
 /obj/item/clothing/under/plaid_skirt/green
 	name = "green plaid skirt"
 	desc = "A preppy green skirt with a white blouse."

diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi