diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index c052c33bcb..142f939a3f 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/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" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3883d9d0e3..7734817ba3 100644 --- a/code/modules/clothing/head/misc.dm +++ b/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" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 343e8a80f0..f92935c2a9 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/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" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 153d93fc14..65d8ffadb1 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/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 */ diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 42e752d78e..610ecd2a31 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/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." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 9d084b3119..f15d0e61a2 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/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 */ diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 533403e4da..efda5cb434 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/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 diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 2dd848102b..3743797a00 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index e6bac630bd..4e89fd8635 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index af898b6e8f..37cd05ce5e 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index 12a4fc9e3d..0852e750f1 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/hands/item.dmi b/icons/inventory/hands/item.dmi index 556cfcfb56..05dbda93cf 100644 Binary files a/icons/inventory/hands/item.dmi and b/icons/inventory/hands/item.dmi differ diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi index e3912aa269..eac6c88a5f 100644 Binary files a/icons/inventory/hands/mob.dmi and b/icons/inventory/hands/mob.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 90de50558e..81de8374f6 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 27db023df8..0278b2f25e 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 541a40a4b3..a69cae4ca4 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 6b6ffed503..c9571caaaa 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index f7a8187995..e22f9dcd27 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 8d89071753..ad2aebade9 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ