diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index c798f35218..c0f587ad2d 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -174,3 +174,13 @@ /datum/dog_fashion/back/deathsquad name = "Trooper REAL_NAME" desc = "That's not red paint. That's real corgi blood." + +/datum/dog_fashion/head/colour + name = "Styled REAL_NAME" + desc = "From the tips of their paws to the top of their head, they look like a made bed." + emote_see = list("tries to tap dances.","looks sadly at others outfits...","barks at bad fashion!") + +/datum/dog_fashion/head/telegram + name = "Messager REAL_NAME" + desc = "Dont shoot the messager..." + emote_see = list("licks an evolope.","looks ready to set off to send a letter...","works on barking!") \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index e44d3c9079..8e3a1778c1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -42,6 +42,7 @@ new /obj/item/storage/backpack/satchel/leather/withwallet( src ) new /obj/item/instrument/piano_synth(src) new /obj/item/radio/headset( src ) + new /obj/item/clothing/head/colour(src) /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params) var/obj/item/card/id/I = W.GetID() diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 10f1f30e13..2a293f70d6 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -321,8 +321,9 @@ /datum/outfit/hotelstaff name = "Hotel Staff" - uniform = /obj/item/clothing/under/assistantformal + uniform = /obj/item/clothing/under/telegram shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/hotel r_pocket = /obj/item/radio/off back = /obj/item/storage/backpack implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 5457d32e8a..e4eefde49f 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -29,7 +29,6 @@ icon_state = "chef" item_state = "chef" dynamic_hair_suffix = "" - dog_fashion = /datum/dog_fashion/head/chef /obj/item/clothing/head/collectable/paper diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 071e52b46d..406f290bb5 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -117,10 +117,8 @@ desc = "Wearing these makes you look useless, and only good for your sex appeal." icon_state = "bunny" dynamic_hair_suffix = "" - dog_fashion = /datum/dog_fashion/head/rabbit - /obj/item/clothing/head/flatcap name = "flat cap" desc = "A working man's cap." @@ -212,7 +210,6 @@ item_state = "sombrero" desc = "You can practically taste the fiesta." flags_inv = HIDEHAIR - dog_fashion = /datum/dog_fashion/head/sombrero /obj/item/clothing/head/sombrero/green @@ -377,3 +374,17 @@ item_state = "assu_helmet" desc = "A cheap replica of old riot helmet without visor. It has \"D.A.B.\" written on the front." flags_inv = HIDEHAIR + +/obj/item/clothing/head/hotel + name = "Telegram cap" + desc = "A bright red cap warn by hotel staff. Or people who want to be a singing telegram" + icon_state = "telegramhat" + item_color = "telegramhat" + dog_fashion = null + +/obj/item/clothing/head/colour + name = "Singer cap" + desc = "A light white hat that has bands of color. Just makes you want to sing and dance!" + icon_state = "colour" + item_color = "colour" + dog_fashion = /datum/dog_fashion/head/colour \ No newline at end of file diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index b14b0575f9..ab1df28bfc 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -139,4 +139,4 @@ flags_inv = HIDEEYES|HIDEFACE armor = list("melee" = 35, "bullet" = 35, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 90) strip_delay = 90 //You dont take a Major Leage cap - dog_fashion = null \ No newline at end of file + dog_fashion = null diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6f188d513f..ead33785de 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -5,6 +5,7 @@ item_color = "red_pyjamas" item_state = "w_suit" can_adjust = FALSE + /obj/item/clothing/under/pj/blue name = "blue pj's" desc = "Sleepwear." @@ -12,6 +13,7 @@ item_color = "blue_pyjamas" item_state = "w_suit" can_adjust = FALSE + /obj/item/clothing/under/patriotsuit name = "Patriotic Suit" desc = "Motorcycle not included." @@ -19,6 +21,7 @@ item_state = "ek" item_color = "ek" can_adjust = FALSE + /obj/item/clothing/under/scratch name = "white suit" desc = "A white suit, suitable for an excellent host." @@ -43,6 +46,7 @@ icon_state = "sl_suit" item_color = "sl_suit" can_adjust = FALSE + /obj/item/clothing/under/roman name = "\improper Roman armor" desc = "Ancient Roman armor. Made of metallic and leather straps." @@ -52,6 +56,7 @@ can_adjust = FALSE strip_delay = 100 resistance_flags = NONE + /obj/item/clothing/under/waiter name = "waiter's outfit" desc = "It's a very smart uniform with a special pocket for tip." @@ -59,6 +64,7 @@ item_state = "waiter" item_color = "waiter" can_adjust = FALSE + /obj/item/clothing/under/rank/prisoner name = "prison jumpsuit" desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." @@ -85,12 +91,14 @@ icon_state = "mailman" item_state = "b_suit" item_color = "mailman" + /obj/item/clothing/under/rank/psyche name = "psychedelic jumpsuit" desc = "Groovy!" icon_state = "psyche" item_state = "p_suit" item_color = "psyche" + /obj/item/clothing/under/rank/clown/sexy name = "sexy-clown suit" desc = "It makes you look HONKable!" @@ -98,6 +106,7 @@ item_state = "sexyclown" item_color = "sexyclown" can_adjust = FALSE + /obj/item/clothing/under/jabroni name = "Jabroni Outfit" desc = "The leather club is two sectors down." @@ -105,6 +114,7 @@ item_state = "darkholme" item_color = "darkholme" can_adjust = FALSE + /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." @@ -112,6 +122,7 @@ item_state = "gy_suit" item_color = "vice" can_adjust = FALSE + /obj/item/clothing/under/rank/centcom_officer desc = "It's a jumpsuit worn by CentCom Officers." name = "\improper CentCom officer's jumpsuit" @@ -119,12 +130,14 @@ item_state = "g_suit" item_color = "officer" alt_covers_chest = TRUE + /obj/item/clothing/under/rank/centcom_commander desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders." name = "\improper CentCom officer's jumpsuit" icon_state = "centcom" item_state = "dg_suit" item_color = "centcom" + /obj/item/clothing/under/space name = "\improper NASA jumpsuit" desc = "It has a NASA logo on it and is made of space-proofed materials." @@ -141,6 +154,7 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT can_adjust = FALSE resistance_flags = NONE + /obj/item/clothing/under/acj name = "administrative cybernetic jumpsuit" icon_state = "syndicate" @@ -157,24 +171,28 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT can_adjust = FALSE resistance_flags = FIRE_PROOF | ACID_PROOF + /obj/item/clothing/under/owl name = "owl uniform" desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction." icon_state = "owl" item_color = "owl" can_adjust = FALSE + /obj/item/clothing/under/griffin name = "griffon uniform" desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem." icon_state = "griffin" item_color = "griffin" can_adjust = FALSE + /obj/item/clothing/under/cloud name = "cloud" desc = "cloud" icon_state = "cloud" item_color = "cloud" can_adjust = FALSE + /obj/item/clothing/under/gimmick/rank/captain/suit name = "captain's suit" desc = "A green suit and yellow necktie. Exemplifies authority." @@ -218,18 +236,21 @@ item_state = "bl_suit" item_color = "black_suit" can_adjust = FALSE + /obj/item/clothing/under/suit_jacket/really_black name = "executive suit" desc = "A formal black suit and red tie, intended for the station's finest." icon_state = "really_black_suit" item_state = "bl_suit" item_color = "really_black_suit" + /obj/item/clothing/under/suit_jacket/female name = "executive suit" desc = "A formal trouser suit for women, intended for the station's finest." icon_state = "black_suit_fem" item_state = "black_suit_fem" item_color = "black_suit_fem" + /obj/item/clothing/under/suit_jacket/green name = "green suit" desc = "A green suit and yellow necktie. Baller." @@ -237,48 +258,56 @@ item_state = "dg_suit" item_color = "green_suit" can_adjust = FALSE + /obj/item/clothing/under/suit_jacket/red name = "red suit" desc = "A red suit and blue tie. Somewhat formal." icon_state = "red_suit" item_state = "r_suit" item_color = "red_suit" + /obj/item/clothing/under/suit_jacket/charcoal name = "charcoal suit" desc = "A charcoal suit and red tie. Very professional." icon_state = "charcoal_suit" item_state = "charcoal_suit" item_color = "charcoal_suit" + /obj/item/clothing/under/suit_jacket/navy name = "navy suit" desc = "A navy suit and red tie, intended for the station's finest." icon_state = "navy_suit" item_state = "navy_suit" item_color = "navy_suit" + /obj/item/clothing/under/suit_jacket/burgundy name = "burgundy suit" desc = "A burgundy suit and black tie. Somewhat formal." icon_state = "burgundy_suit" item_state = "burgundy_suit" item_color = "burgundy_suit" + /obj/item/clothing/under/suit_jacket/checkered name = "checkered suit" desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" icon_state = "checkered_suit" item_state = "checkered_suit" item_color = "checkered_suit" + /obj/item/clothing/under/suit_jacket/tan name = "tan suit" desc = "A tan suit with a yellow tie. Smart, but casual." icon_state = "tan_suit" item_state = "tan_suit" item_color = "tan_suit" + /obj/item/clothing/under/suit_jacket/white name = "white suit" desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" icon_state = "white_suit" item_state = "white_suit" item_color = "white_suit" + /obj/item/clothing/under/burial name = "burial garments" desc = "Traditional burial garments from the early 22nd century." @@ -286,6 +315,7 @@ item_state = "burial" item_color = "burial" has_sensor = NO_SENSORS + /obj/item/clothing/under/skirt/black name = "black skirt" desc = "A black skirt, very fancy!" @@ -294,6 +324,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/skirt/blue name = "blue skirt" desc = "A blue, casual skirt." @@ -303,6 +334,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/skirt/red name = "red skirt" desc = "A red, casual skirt." @@ -312,6 +344,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/skirt/purple name = "purple skirt" desc = "A purple, casual skirt." @@ -321,6 +354,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/schoolgirl name = "blue schoolgirl uniform" desc = "It's just like one of my Japanese animes!" @@ -330,21 +364,25 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/schoolgirl/red name = "red schoolgirl uniform" icon_state = "schoolgirlred" item_state = "schoolgirlred" item_color = "schoolgirlred" + /obj/item/clothing/under/schoolgirl/green name = "green schoolgirl uniform" icon_state = "schoolgirlgreen" item_state = "schoolgirlgreen" item_color = "schoolgirlgreen" + /obj/item/clothing/under/schoolgirl/orange name = "orange schoolgirl uniform" icon_state = "schoolgirlorange" item_state = "schoolgirlorange" item_color = "schoolgirlorange" + /obj/item/clothing/under/overalls name = "laborer's overalls" desc = "A set of durable overalls for getting the job done." @@ -352,6 +390,7 @@ item_state = "lb_suit" item_color = "overalls" can_adjust = FALSE + /obj/item/clothing/under/pirate name = "pirate outfit" desc = "Yarr." @@ -359,6 +398,7 @@ item_state = "pirate" item_color = "pirate" can_adjust = FALSE + /obj/item/clothing/under/soviet name = "soviet uniform" desc = "For the Motherland!" @@ -366,6 +406,7 @@ item_state = "soviet" item_color = "soviet" can_adjust = FALSE + /obj/item/clothing/under/redcoat name = "redcoat uniform" desc = "Looks old." @@ -373,6 +414,7 @@ item_state = "redcoat" item_color = "redcoat" can_adjust = FALSE + /obj/item/clothing/under/kilt name = "kilt" desc = "Includes shoes and plaid." @@ -382,6 +424,7 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/kilt/highlander desc = "You're the only one worthy of this kilt." @@ -398,6 +441,7 @@ body_parts_covered = CHEST|GROIN|LEGS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" @@ -408,9 +452,11 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + /obj/item/clothing/under/gladiator/ash_walker desc = "This gladiator uniform appears to be covered in ash and fairly dated." has_sensor = NO_SENSORS + /obj/item/clothing/under/sundress name = "sundress" desc = "Makes you want to frolic in a field of daisies." @@ -420,6 +466,7 @@ body_parts_covered = CHEST|GROIN fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/captainparade name = "captain's parade uniform" desc = "A captain's luxury-wear, for special occasions." @@ -427,6 +474,7 @@ item_state = "by_suit" item_color = "captain_parade" can_adjust = FALSE + /obj/item/clothing/under/hosparademale name = "head of security's parade uniform" desc = "A male head of security's luxury-wear, for special occasions." @@ -434,6 +482,7 @@ item_state = "r_suit" item_color = "hos_parade_male" can_adjust = FALSE + /obj/item/clothing/under/hosparadefem name = "head of security's parade uniform" desc = "A female head of security's luxury-wear, for special occasions." @@ -442,6 +491,7 @@ item_color = "hos_parade_fem" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/assistantformal name = "assistant's formal uniform" desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown." @@ -449,6 +499,7 @@ item_state = "gy_suit" item_color = "assistant_formal" can_adjust = FALSE + /obj/item/clothing/under/blacktango name = "black tango dress" desc = "Filled with Latin fire." @@ -457,6 +508,7 @@ item_color = "black_tango" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/stripeddress name = "striped dress" desc = "Fashion in space." @@ -466,6 +518,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_FULL can_adjust = FALSE + /obj/item/clothing/under/sailordress name = "sailor dress" desc = "Formal wear for a leading lady." @@ -475,6 +528,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/redeveninggown name = "red evening gown" desc = "Fancy dress for space bar singers." @@ -483,6 +537,7 @@ item_color = "red_evening_gown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/maid name = "maid costume" desc = "Maid in China." @@ -492,10 +547,12 @@ body_parts_covered = CHEST|GROIN fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/maid/Initialize() . = ..() var/obj/item/clothing/accessory/maidapron/A = new (src) attach_accessory(A) + /obj/item/clothing/under/janimaid name = "maid uniform" desc = "A simple maid uniform for housekeeping." @@ -505,6 +562,7 @@ body_parts_covered = CHEST|GROIN fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/plaid_skirt name = "red plaid skirt" desc = "A preppy red skirt with a white blouse." @@ -514,6 +572,7 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = TRUE alt_covers_chest = TRUE + /obj/item/clothing/under/plaid_skirt/blue name = "blue plaid skirt" desc = "A preppy blue skirt with a white blouse." @@ -523,6 +582,7 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = TRUE alt_covers_chest = TRUE + /obj/item/clothing/under/plaid_skirt/purple name = "purple plaid skirt" desc = "A preppy purple skirt with a white blouse." @@ -532,6 +592,7 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = TRUE alt_covers_chest = TRUE + /obj/item/clothing/under/singery name = "yellow performer's outfit" desc = "Just looking at this makes you want to sing." @@ -542,6 +603,7 @@ fitted = NO_FEMALE_UNIFORM alternate_worn_layer = ABOVE_SHOES_LAYER can_adjust = FALSE + /obj/item/clothing/under/singerb name = "blue performer's outfit" desc = "Just looking at this makes you want to sing." @@ -552,6 +614,7 @@ alternate_worn_layer = ABOVE_SHOES_LAYER fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/plaid_skirt/green name = "green plaid skirt" desc = "A preppy green skirt with a white blouse." @@ -561,14 +624,17 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = TRUE alt_covers_chest = TRUE + /obj/item/clothing/under/jester name = "jester suit" desc = "A jolly dress, well suited to entertain your master, nuncle." icon_state = "jester" item_color = "jester" can_adjust = FALSE + /obj/item/clothing/under/jester/alt icon_state = "jester2" + /obj/item/clothing/under/geisha name = "geisha suit" desc = "Cute space ninja senpai not included." @@ -576,12 +642,14 @@ item_color = "geisha" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE + /obj/item/clothing/under/villain name = "villain suit" desc = "A change of wardrobe is necessary if you ever want to catch a real superhero." icon_state = "villain" item_color = "villain" can_adjust = FALSE + /obj/item/clothing/under/sailor name = "sailor suit" desc = "Skipper's in the wardroom drinkin gin'." @@ -649,6 +717,7 @@ icon_state = "hostanclothes" item_state = "hostanclothes" item_color = "hostanclothes" + /obj/item/clothing/under/mummy name = "mummy wrapping" desc = "Return the slab or suffer my stale references." @@ -659,6 +728,7 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + /obj/item/clothing/under/scarecrow name = "scarecrow clothes" desc = "Perfect camouflage for hiding in botany." @@ -669,6 +739,7 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + /obj/item/clothing/under/draculass name = "draculass coat" desc = "A dress inspired by the ancient \"Victorian\" era." @@ -678,6 +749,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + /obj/item/clothing/under/drfreeze name = "doctor freeze's jumpsuit" desc = "A modified scientist jumpsuit to look extra cool." @@ -685,6 +757,7 @@ item_state = "drfreeze" item_color = "drfreeze" can_adjust = FALSE + /obj/item/clothing/under/lobster name = "foam lobster suit" desc = "Who beheaded the college mascot?" @@ -693,6 +766,7 @@ item_color = "lobster" fitted = NO_FEMALE_UNIFORM can_adjust = FALSE + /obj/item/clothing/under/gondola name = "gondola hide suit" desc = "Now you're cooking." @@ -700,6 +774,7 @@ item_state = "lb_suit" item_color = "gondola" can_adjust = FALSE + /obj/item/clothing/under/skeleton name = "skeleton jumpsuit" desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!" @@ -719,6 +794,14 @@ body_parts_covered = CHEST|GROIN can_adjust = FALSE +/obj/item/clothing/under/telegram + name = "telegram suit" + desc = "Bright and red, hard to miss. Mostly warn by hotel staff or singing telegram." + icon_state = "telegram" + item_state = "telegram" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE + /obj/item/clothing/under/durathread name = "durathread jumpsuit" desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 69e75e7d28..d4eec7dbc4 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 072511b444..1141c4b8c9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 195742c68c..0ab9c8394a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 50f9e0a207..a980fd4177 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ