diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 92302660d7..e0ea39d8e6 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -26,7 +26,7 @@ for(var/obj/item/briefcase_item in new_briefcase) qdel(briefcase_item) new_briefcase.contents += new /obj/item/gun/projectile/pistol/toy - new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat + new_briefcase.contents += new /obj/item/clothing/mask/gas/costume H.equip_to_slot_or_del(new_briefcase, slot_l_hand) /decl/hierarchy/outfit/costume/horrorcop @@ -84,7 +84,7 @@ /decl/hierarchy/outfit/costume/highlander name = OUTFIT_COSTUME("Highlander") - uniform = /obj/item/clothing/under/kilt + uniform = /obj/item/clothing/under/costume/kilt shoes = /obj/item/clothing/shoes/boots/jackboots head = /obj/item/clothing/head/beret r_hand = /obj/item/material/sword/foam @@ -107,10 +107,10 @@ /decl/hierarchy/outfit/costume/pirate name = OUTFIT_COSTUME("Pirate") - uniform = /obj/item/clothing/under/pirate + uniform = /obj/item/clothing/under/costume/pirate shoes = /obj/item/clothing/shoes/brown - head = /obj/item/clothing/head/pirate - suit = /obj/item/clothing/suit/pirate + head = /obj/item/clothing/head/collectable/pirate + suit = /obj/item/clothing/suit/costume glasses = /obj/item/clothing/glasses/eyepatch /decl/hierarchy/outfit/costume/whiteout @@ -125,6 +125,6 @@ name = OUTFIT_COSTUME("Ruin Marine") uniform = /obj/item/clothing/under/color/grey shoes = /obj/item/clothing/shoes/brown - head = /obj/item/clothing/head/marine - suit = /obj/item/clothing/suit/marine + head = /obj/item/clothing/head/collectable/marine + suit = /obj/item/clothing/suit/costume/marine r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm index aa45f4e23d..cd58f4c910 100644 --- a/code/datums/outfits/horror_killers.dm +++ b/code/datums/outfits/horror_killers.dm @@ -3,7 +3,7 @@ uniform = /obj/item/clothing/under/rank/clown shoes = /obj/item/clothing/shoes/clown_shoes gloves = /obj/item/clothing/gloves/black - mask = /obj/item/clothing/mask/gas/clown_hat + mask = /obj/item/clothing/mask/gas/costume head = /obj/item/clothing/head/chaplain_hood l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/plain/monocle @@ -42,7 +42,7 @@ l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/sunglasses l_pocket = /obj/item/melee/energy/sword - mask = /obj/item/clothing/mask/gas/clown_hat + mask = /obj/item/clothing/mask/gas/costume id_slot = slot_wear_id id_type = /obj/item/card/id/syndicate/station_access diff --git a/code/datums/outfits/jobs/misc.dm b/code/datums/outfits/jobs/misc.dm index 43bbd919f8..a9cd0f7540 100644 --- a/code/datums/outfits/jobs/misc.dm +++ b/code/datums/outfits/jobs/misc.dm @@ -1,5 +1,5 @@ /decl/hierarchy/outfit/job/silicon - head = /obj/item/clothing/head/cardborg + head = /obj/item/clothing/head/collectable/cardborg hierarchy_type = /decl/hierarchy/outfit/job/silicon /decl/hierarchy/outfit/job/silicon/ai @@ -8,4 +8,4 @@ /decl/hierarchy/outfit/job/silicon/cyborg name = OUTFIT_JOB_NAME("Cyborg") - suit = /obj/item/clothing/suit/cardborg + suit = /obj/item/clothing/suit/costume/cardborg diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm index b7e70ed340..66c9f3e511 100644 --- a/code/datums/outfits/misc.dm +++ b/code/datums/outfits/misc.dm @@ -19,7 +19,7 @@ /decl/hierarchy/outfit/soviet_soldier name = "Soviet soldier" - uniform = /obj/item/clothing/under/soviet + uniform = /obj/item/clothing/under/costume/soviet shoes = /obj/item/clothing/shoes/boots/combat head = /obj/item/clothing/head/ushanka gloves = /obj/item/clothing/gloves/combat @@ -28,10 +28,10 @@ /decl/hierarchy/outfit/soviet_soldier/admiral name = "Soviet admiral" - head = /obj/item/clothing/head/hgpiratecap + head = /obj/item/clothing/head/collectable/hgpiratecap l_ear = /obj/item/radio/headset/heads/captain glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch - suit = /obj/item/clothing/suit/hgpirate + suit = /obj/item/clothing/suit/costume/hgpirate id_slot = slot_wear_id id_type = /obj/item/card/id/centcom //station diff --git a/code/datums/outfits/pirates.dm b/code/datums/outfits/pirates.dm index 5595ee357d..c4385f1362 100644 --- a/code/datums/outfits/pirates.dm +++ b/code/datums/outfits/pirates.dm @@ -1,7 +1,7 @@ /decl/hierarchy/outfit/pirate hierarchy_type = /decl/hierarchy/outfit/pirate name = "Pirate" - uniform = /obj/item/clothing/under/pirate + uniform = /obj/item/clothing/under/costume/pirate shoes = /obj/item/clothing/shoes/brown head = /obj/item/clothing/head/bandana glasses = /obj/item/clothing/glasses/eyepatch @@ -12,6 +12,6 @@ /decl/hierarchy/outfit/pirate/space name = "Pirate - Space" head = /obj/item/clothing/head/helmet/space - suit = /obj/item/clothing/suit/pirate + suit = /obj/item/clothing/suit/costume back = /obj/item/tank/jetpack/oxygen flags = OUTFIT_HAS_JETPACK diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm index 48501395fc..12ffc285dd 100644 --- a/code/datums/supplypacks/costumes.dm +++ b/code/datums/supplypacks/costumes.dm @@ -25,7 +25,7 @@ /datum/supply_pack/randomised/costumes/hats num_contained = 4 contains = list( - /obj/item/clothing/head/collectable/chef, + /obj/item/clothing/head/collectable, /obj/item/clothing/head/collectable/paper, /obj/item/clothing/head/collectable/tophat, /obj/item/clothing/head/collectable/captain, @@ -54,13 +54,12 @@ /datum/supply_pack/randomised/costumes/costume num_contained = 3 contains = list( - /obj/item/clothing/suit/pirate, - /obj/item/clothing/suit/judgerobe, + /obj/item/clothing/suit/costume, + /obj/item/clothing/suit/costume/judgerobe, /obj/item/clothing/accessory/wcoat, - /obj/item/clothing/suit/hastur, - /obj/item/clothing/suit/holidaypriest, + /obj/item/clothing/suit/costume/hastur, + /obj/item/clothing/suit/costume/holidaypriest, /obj/item/clothing/suit/nun, - /obj/item/clothing/suit/imperium_monk, /obj/item/clothing/suit/ianshirt, /obj/item/clothing/under/gimmick/rank/captain/suit, /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, @@ -70,16 +69,16 @@ /obj/item/clothing/suit/suspenders, /obj/item/clothing/suit/storage/toggle/labcoat/mad, /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, - /obj/item/clothing/under/schoolgirl, - /obj/item/clothing/under/owl, + /obj/item/clothing/under/costume/schoolgirl, + /obj/item/clothing/under/costume/owl, /obj/item/clothing/under/waiter, - /obj/item/clothing/under/gladiator, - /obj/item/clothing/under/soviet, + /obj/item/clothing/under/costume/gladiator, + /obj/item/clothing/under/costume/soviet, /obj/item/clothing/under/wedding/bride_white, /obj/item/clothing/suit/chef, /obj/item/clothing/suit/storage/apron/overalls, - /obj/item/clothing/under/redcoat, - /obj/item/clothing/under/kilt + /obj/item/clothing/under/costume/redcoat, + /obj/item/clothing/under/costume/kilt ) name = "Costumes crate" cost = 10 @@ -128,10 +127,10 @@ num_contained = 3 contains = list( /obj/item/clothing/head/redcoat, - /obj/item/clothing/head/mailman, - /obj/item/clothing/head/plaguedoctorhat, - /obj/item/clothing/head/pirate, - /obj/item/clothing/head/hasturhood, + /obj/item/clothing/head/collectable/mailman, + /obj/item/clothing/head/collectable/plaguedoctorhat, + /obj/item/clothing/head/collectable/pirate, + /obj/item/clothing/head/collectable/hasturhood, /obj/item/clothing/head/powdered_wig, /obj/item/clothing/head/pin/flower, /obj/item/clothing/head/pin/flower/yellow, @@ -139,9 +138,9 @@ /obj/item/clothing/head/pin/flower/pink, /obj/item/clothing/head/pin/clover, /obj/item/clothing/head/pin/butterfly, - /obj/item/clothing/mask/gas/owl_mask, - /obj/item/clothing/mask/gas/monkeymask, - /obj/item/clothing/head/helmet/gladiator, + /obj/item/clothing/mask/gas/costume/owl_mask, + /obj/item/clothing/mask/gas/costume/monkeymask, + /obj/item/clothing/head/helmet/collectable/gladiator, /obj/item/clothing/head/ushanka ) diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index e2fbcec3f3..0e7c03e11c 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -97,7 +97,7 @@ /obj/item/clothing/head/nun_hood, /obj/item/clothing/suit/storage/hooded/chaplain_hoodie, /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout, - /obj/item/clothing/suit/holidaypriest, + /obj/item/clothing/suit/costume/holidaypriest, /obj/item/clothing/under/wedding/bride_white, /obj/item/storage/backpack/cultpack, /obj/item/storage/fancy/candle_box = 3 @@ -197,4 +197,4 @@ /obj/item/toy/desk/officetoy = 2, /obj/item/toy/desk/dippingbird = 2) cost = 15 - containertype = /obj/structure/closet/crate/oculum \ No newline at end of file + containertype = /obj/structure/closet/crate/oculum diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 1619569c9d..d101f301c0 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -34,7 +34,7 @@ /datum/job/ai/equip_preview(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/suit/straight_jacket(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/cardborg(H), slot_head) return 1 ////////////////////////////////// @@ -78,6 +78,6 @@ return 1 /datum/job/cyborg/equip_preview(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/cardborg(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/costume/cardborg(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/cardborg(H), slot_head) return 1 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 08b8e968d9..31febf7a60 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -10,7 +10,7 @@ /obj/item/toy/sword = 2, /obj/item/gun/projectile/revolver/capgun = 2, /obj/item/gun/projectile/revolver/toy/crossbow = 2, - /obj/item/clothing/suit/syndicatefake = 2, + /obj/item/clothing/suit/costume/syndicatefake = 2, /obj/item/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, /obj/random/mech_toy = 1, @@ -45,8 +45,8 @@ var/prizeselect = pickweight(prizes) new prizeselect(src.loc) - if(istype(prizeselect, /obj/item/clothing/suit/syndicatefake)) //Helmet is part of the suit - new /obj/item/clothing/head/syndicatefake(src.loc) + if(istype(prizeselect, /obj/item/clothing/suit/costume/syndicatefake)) //Helmet is part of the suit + new /obj/item/clothing/head/collectable/syndicatefake(src.loc) /obj/machinery/computer/arcade/attack_ai(mob/user as mob) return attack_hand(user) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index d64aba6c76..6939cb4b7e 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -129,15 +129,15 @@ //SUBCLASSES. Spawn a bunch of items and disappear likewise /obj/effect/landmark/costume/chicken/Initialize() ..() - new /obj/item/clothing/suit/chickensuit(src.loc) - new /obj/item/clothing/head/chicken(src.loc) + new /obj/item/clothing/suit/costume/chickensuit(src.loc) + new /obj/item/clothing/head/collectable/chicken(src.loc) new /obj/item/reagent_containers/food/snacks/egg(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/gladiator/Initialize() ..() - new /obj/item/clothing/under/gladiator(src.loc) - new /obj/item/clothing/head/helmet/gladiator(src.loc) + new /obj/item/clothing/under/costume/gladiator(src.loc) + new /obj/item/clothing/head/helmet/collectable/gladiator(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/madscientist/Initialize() @@ -158,7 +158,7 @@ /obj/effect/landmark/costume/nyangirl/Initialize() ..() - new /obj/item/clothing/under/schoolgirl(src.loc) + new /obj/item/clothing/under/costume/schoolgirl(src.loc) new /obj/item/clothing/head/kitty(src.loc) return INITIALIZE_HINT_QDEL @@ -179,7 +179,7 @@ /obj/effect/landmark/costume/highlander/Initialize() ..() - new /obj/item/clothing/under/kilt(src.loc) + new /obj/item/clothing/under/costume/kilt(src.loc) new /obj/item/clothing/head/beret(src.loc) return INITIALIZE_HINT_QDEL @@ -198,13 +198,13 @@ /obj/effect/landmark/costume/plaguedoctor/Initialize() ..() new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc) - new /obj/item/clothing/head/plaguedoctorhat(src.loc) + new /obj/item/clothing/head/collectable/plaguedoctorhat(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/nightowl/Initialize() ..() - new /obj/item/clothing/under/owl(src.loc) - new /obj/item/clothing/mask/gas/owl_mask(src.loc) + new /obj/item/clothing/under/costume/owl(src.loc) + new /obj/item/clothing/mask/gas/costume/owl_mask(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/waiter/Initialize() @@ -217,29 +217,22 @@ /obj/effect/landmark/costume/pirate/Initialize() ..() - new /obj/item/clothing/under/pirate(src.loc) - new /obj/item/clothing/suit/pirate(src.loc) - var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana ) + new /obj/item/clothing/under/costume/pirate(src.loc) + new /obj/item/clothing/suit/costume(src.loc) + var/CHOICE = pick( /obj/item/clothing/head/collectable/pirate , /obj/item/clothing/head/bandana ) new CHOICE(src.loc) new /obj/item/clothing/glasses/eyepatch(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/commie/Initialize() ..() - new /obj/item/clothing/under/soviet(src.loc) + new /obj/item/clothing/under/costume/soviet(src.loc) new /obj/item/clothing/head/ushanka(src.loc) return INITIALIZE_HINT_QDEL -/obj/effect/landmark/costume/imperium_monk/Initialize() - ..() - new /obj/item/clothing/suit/imperium_monk(src.loc) - if (prob(25)) - new /obj/item/clothing/mask/gas/cyborg(src.loc) - return INITIALIZE_HINT_QDEL - /obj/effect/landmark/costume/holiday_priest/Initialize() ..() - new /obj/item/clothing/suit/holidaypriest(src.loc) + new /obj/item/clothing/suit/costume/holidaypriest(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/marisawizard/fake/Initialize() @@ -251,7 +244,7 @@ /obj/effect/landmark/costume/cutewitch/Initialize() ..() new /obj/item/clothing/under/sundress(src.loc) - new /obj/item/clothing/head/witchwig(src.loc) + new /obj/item/clothing/head/collectable/witchwig(src.loc) new /obj/item/staff/broom(src.loc) return INITIALIZE_HINT_QDEL @@ -264,14 +257,14 @@ /obj/effect/landmark/costume/sexyclown/Initialize() ..() - new /obj/item/clothing/mask/gas/sexyclown(src.loc) - new /obj/item/clothing/under/sexyclown(src.loc) + new /obj/item/clothing/mask/gas/costume/sexyclown(src.loc) + new /obj/item/clothing/under/costume/sexyclown(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/costume/sexymime/Initialize() ..() - new /obj/item/clothing/mask/gas/sexymime(src.loc) - new /obj/item/clothing/under/sexymime(src.loc) + new /obj/item/clothing/mask/gas/costume/sexymime(src.loc) + new /obj/item/clothing/under/costume/sexymime(src.loc) return INITIALIZE_HINT_QDEL /obj/effect/landmark/crashed_pod diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 04458ef911..2025d2456f 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -423,9 +423,9 @@ /obj/structure/closet/crate/science ), prob(1);list( - /obj/item/clothing/head/bearpelt, - /obj/item/clothing/under/soviet, - /obj/item/clothing/under/soviet, + /obj/item/clothing/head/collectable/bearpelt, + /obj/item/clothing/under/costume/soviet, + /obj/item/clothing/under/costume/soviet, /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, /obj/structure/closet/crate @@ -465,7 +465,7 @@ /obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes, /obj/item/pda/clown, - /obj/item/clothing/mask/gas/clown_hat, + /obj/item/clothing/mask/gas/costume, /obj/item/bikehorn, /obj/item/reagent_containers/spray/waterflower, /obj/item/pen/crayon/rainbow, @@ -476,7 +476,7 @@ /obj/item/clothing/shoes/black, /obj/item/pda/mime, /obj/item/clothing/gloves/white, - /obj/item/clothing/mask/gas/mime, + /obj/item/clothing/mask/gas/costume/mime, /obj/item/clothing/head/beret, /obj/item/clothing/suit/suspenders, /obj/item/pen/crayon/mime, diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index a1e5128f2e..84e81cc641 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -23,7 +23,7 @@ starts_with = list( /obj/item/clothing/head/ushanka = 5, - /obj/item/clothing/under/soviet = 5) + /obj/item/clothing/under/costume/soviet = 5) /obj/structure/closet/gimmick/tacticool diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 8da479e2ee..da117f28a0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -290,7 +290,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br /obj/item/clothing/shoes/brown, /obj/item/paper/Court = 3, /obj/item/pen, - /obj/item/clothing/suit/judgerobe, + /obj/item/clothing/suit/costume/judgerobe, /obj/item/clothing/head/powdered_wig, /obj/item/storage/briefcase) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 16874f5e4c..bcf704cf27 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -93,7 +93,7 @@ /obj/item/clothing/head/nun_hood, /obj/item/clothing/suit/storage/hooded/chaplain_hoodie, /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout, - /obj/item/clothing/suit/holidaypriest, + /obj/item/clothing/suit/costume/holidaypriest, /obj/item/clothing/under/wedding/bride_white, /obj/item/storage/backpack/cultpack, /obj/item/storage/fancy/candle_box = 2, diff --git a/code/modules/antagonist/outsider/raider.dm b/code/modules/antagonist/outsider/raider.dm index 592461d07a..49e0409ac4 100644 --- a/code/modules/antagonist/outsider/raider.dm +++ b/code/modules/antagonist/outsider/raider.dm @@ -21,11 +21,11 @@ var/global/datum/antagonist/raider/raiders // Heist overrides check_victory() and doesn't need victory or loss strings/tags. var/list/raider_uniforms = list( - /obj/item/clothing/under/soviet, - /obj/item/clothing/under/pirate, - /obj/item/clothing/under/redcoat, + /obj/item/clothing/under/costume/soviet, + /obj/item/clothing/under/costume/pirate, + /obj/item/clothing/under/costume/redcoat, /obj/item/clothing/under/serviceoveralls, - /obj/item/clothing/under/captain_fly, + /obj/item/clothing/under/costume/captain_fly, /obj/item/clothing/under/det, /obj/item/clothing/under/color/brown, ) @@ -44,16 +44,16 @@ var/global/datum/antagonist/raider/raiders ) var/list/raider_helmets = list( - /obj/item/clothing/head/bearpelt, + /obj/item/clothing/head/collectable/bearpelt, /obj/item/clothing/head/ushanka, - /obj/item/clothing/head/pirate, + /obj/item/clothing/head/collectable/pirate, /obj/item/clothing/head/bandana, - /obj/item/clothing/head/hgpiratecap, + /obj/item/clothing/head/collectable/hgpiratecap, ) var/list/raider_suits = list( - /obj/item/clothing/suit/pirate, - /obj/item/clothing/suit/hgpirate, + /obj/item/clothing/suit/costume, + /obj/item/clothing/suit/costume/hgpirate, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/leather_jacket, /obj/item/clothing/suit/storage/toggle/brown_jacket, diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index c446555380..c054d92f98 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -184,7 +184,7 @@ corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes corpseradio = /obj/item/radio/headset - corpsemask = /obj/item/clothing/mask/gas/clown_hat + corpsemask = /obj/item/clothing/mask/gas/costume corpsepocket1 = /obj/item/bikehorn corpseback = /obj/item/storage/backpack/clown corpseid = 1 diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 723bf92458..7b07e0de7b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -65,7 +65,6 @@ captype["soft cap, solgov"] = /obj/item/clothing/head/soft/solgov captype["soft cap, white"] = /obj/item/clothing/head/soft/mime captype["soft cap, yellow"] = /obj/item/clothing/head/soft/yellow - captype["station cap, blue"] = /obj/item/clothing/head/mailman gear_tweaks += new/datum/gear_tweak/path(captype) /datum/gear/head/sec_cap @@ -169,7 +168,7 @@ /datum/gear/head/wig/philosopher display_name = "wig, natural philosopher" - path = /obj/item/clothing/head/philosopher_wig + path = /obj/item/clothing/head/collectable/philosopher_wig /datum/gear/head/wig display_name = "wig, powdered" @@ -365,10 +364,6 @@ display_name = "black and gold headdress" path = /obj/item/clothing/head/blackngoldheaddress -/datum/gear/head/plaguedoctor2 - display_name = "hat, golden plague doctor" - path = /obj/item/clothing/head/plaguedoctorhat/gold - /datum/gear/head/nonla display_name = "non la" path = /obj/item/clothing/head/nonla @@ -397,3 +392,17 @@ var/obj/item/clothing/head/helmet/tank/cap_type = tankercap tankercaps[initial(cap_type.name)] = cap_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tankercaps)) + +/datum/gear/head/costumes + display_name = "costume hat selection" + description = "A selection of fancy-dress hats." + path = /obj/item/clothing/head/collectable + cost = 2 + +/datum/gear/head/costumes/New() + ..() + var/list/costumes = list() + for(var/costume in typesof(/obj/item/clothing/head/collectable)) + var/obj/item/clothing/head/collectable/costume_type = costume + costumes[initial(costume_type.name)] = costume_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 9af4c08919..ae0731425f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -31,8 +31,6 @@ var/masks = list() masks["gas mask"] = /obj/item/clothing/mask/gas masks["clear gas mask"] = /obj/item/clothing/mask/gas/clear - masks["plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor - masks["gold plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor/gold gear_tweaks += new/datum/gear_tweak/path(masks) /datum/gear/mask/cloth @@ -48,3 +46,16 @@ display_name = "mask, dust" path = /obj/item/clothing/mask/surgical/dust cost = 2 + +/datum/gear/mask/costumes + display_name = "mask, costume selection" + description = "A selection of fancy-dress masks." + path = /obj/item/clothing/mask/costume + +/datum/gear/mask/costumes/New() + ..() + var/list/costumes = list() + for(var/costume in typesof(/obj/item/clothing/mask/costume, /obj/item/clothing/mask/gas/costume)) + var/obj/item/clothing/mask/costume/costume_type = costume + costumes[initial(costume_type.name)] = costume_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index d5a63ce717..75c0ad23f6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -387,3 +387,16 @@ /datum/gear/suit/cardigan/New() ..() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/costumes + display_name = "costume overclothing selection" + description = "A selection of fancy-dress costumes worn on the suit slot." + path = /obj/item/clothing/suit/costume + +/datum/gear/suit/costumes/New() + ..() + var/list/costumes = list() + for(var/costume in typesof(/obj/item/clothing/suit/costume)) + var/obj/item/clothing/suit/costume/costume_type = costume + costumes[initial(costume_type.name)] = costume_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 4663d57da5..172955b1d2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -39,10 +39,6 @@ display_name = "cropped sweater" path = /obj/item/clothing/under/wednesday -/datum/gear/uniform/kilt - display_name = "kilt" - path = /obj/item/clothing/under/kilt - /datum/gear/uniform/cuttop display_name = "cut top selection" description = "Loose, low-cut shirts with matching shorts." @@ -643,3 +639,16 @@ display_name = "jumpsuit, chaplain striped" path = /obj/item/clothing/under/rank/chaplain/alt allowed_roles = list("Chaplain") + +/datum/gear/uniform/costumes + display_name = "costume clothing selection" + description = "A selection of fancy-dress costumes worn on the clothing slot." + path = /obj/item/clothing/under/costume + +/datum/gear/uniform/costumes/New() + ..() + var/list/costumes = list() + for(var/costume in typesof(/obj/item/clothing/under/costume)) + var/obj/item/clothing/under/costume/costume_type = costume + costumes[initial(costume_type.name)] = costume_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 122ef042bb..2f4cf88a43 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -119,7 +119,7 @@ /obj/item/clothing/suit/chameleon/Initialize() . = ..() if(!clothing_choices) - var/blocked = list(src.type, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice, /obj/item/clothing/suit/greatcoat) + var/blocked = list(src.type, /obj/item/clothing/suit/costume/cyborg_suit, /obj/item/clothing/suit/costume/justice, /obj/item/clothing/suit/greatcoat) clothing_choices = generate_chameleon_choices(/obj/item/clothing/suit, blocked) /obj/item/clothing/suit/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 4b410163fe..6b3df50ca1 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -1,9 +1,10 @@ -//Hat Station 13 +//Non-functional-version or costume hats /obj/item/clothing/head/collectable - name = "collectable hat" - desc = "A rare collectable hat." + name = "collectable chef's hat" + desc = "A rare Chef's Hat meant for hat collectors!" + icon_state = "chefhat" /obj/item/clothing/head/collectable/petehat name = "ultra rare hat" @@ -15,23 +16,18 @@ ) /obj/item/clothing/head/collectable/slime - name = "collectable slime cap!" + name = "collectable slime cap" desc = "It just latches right in place!" icon_state = "headslime" body_parts_covered = 0 /obj/item/clothing/head/collectable/xenom - name = "collectable xenomorph helmet!" + name = "collectable xenomorph helmet" desc = "Hiss hiss hiss!" icon_state = "xenom" item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm") body_parts_covered = HEAD|FACE|EYES -/obj/item/clothing/head/collectable/chef - name = "collectable chef's hat" - desc = "A rare Chef's Hat meant for hat collectors!" - icon_state = "chefhat" - /obj/item/clothing/head/collectable/paper name = "collectable paper hat" desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." @@ -81,13 +77,6 @@ desc = "A Collectible farmer's Flat Cap!" icon_state = "flat_cap" item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective") - -/obj/item/clothing/head/collectable/pirate - name = "collectable pirate hat" - desc = "You'd make a great Dread Syndie Roberts!" - icon_state = "pirate" - body_parts_covered = 0 - /obj/item/clothing/head/collectable/kitty name = "collectable kitty ears" desc = "The fur feels.....a bit too realistic." @@ -126,3 +115,222 @@ name = "collectable SWAT helmet" desc = "Now you can be in the Deathsquad too!" icon_state = "swat" + +/obj/item/clothing/head/collectable/witch + name = "witch hat" + desc = "Which hat?" + icon_state = "dark_witch_hat" + +/obj/item/clothing/head/collectable/snowman + name = "snowman head" + desc = "Keepin' it cool." + icon_state = "snowman_hat" + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/pharaoh + name = "pharaoh headdress" + desc = "The ancient hat with many Nemes." + icon_state = "pharaoh_hat" + +/obj/item/clothing/head/collectable/jester + name = "jester hat" + desc = "You'll look like a fool." + icon_state = "jester_hat" + +/obj/item/clothing/head/collectable/bee + name = "bee antennae" + desc = "According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don't care what humans think is impossible..." + icon_state = "bee_hat" + +/obj/item/clothing/head/collectable/roman + name = "collectable legionary helmet" + desc = "Are you worth your salt?" + icon_state = "roman_hat" + +/obj/item/clothing/head/collectable/griffin + name = "griffin head" + desc = "For the eagle-eyed collector." + icon_state = "griffin" + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/bunnyhead + name = "bunny head" + desc = "All the world will be your enemy, Prince with a Thousand Enemies." + icon_state = "bunny_head" + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/scarecrow + name = "scarecrow costume hat" + desc = "Awarded to those who are outstanding in their field." + icon_state = "scarecrow_hat" + +/obj/item/clothing/head/collectable/lobster + name = "lobster costume head" + desc = "There's no need to be shellfish." + icon_state = "lobster_hat" + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/ice_fairy + name = "collectable ice fairy bow" + desc = "Accent a really cool hair-do." + icon_state = "ice_fairy_bow" + +/obj/item/clothing/head/collectable/witchwig + name = "witch costume wig" + desc = "Eeeee~heheheheheheh!" + icon_state = "witch" + flags_inv = BLOCKHAIR + siemens_coefficient = 2.0 + +/obj/item/clothing/head/collectable/chicken + name = "chicken suit head" + desc = "Bkaw!" + icon_state = "chickenhead" + flags_inv = BLOCKHAIR + siemens_coefficient = 0.7 + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/bearpelt + name = "bear pelt hat" + desc = "Fuzzy." + icon_state = "bearpelt" + item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") + flags_inv = BLOCKHAIR + siemens_coefficient = 0.7 + +/obj/item/clothing/head/collectable/xenos + name = "xenos helmet" + icon_state = "xenos" + item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm") + desc = "A helmet made out of chitinous alien hide." + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + siemens_coefficient = 2.0 + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/philosopher_wig + name = "natural philosopher's wig" + desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!" + icon_state = "philosopher_wig" + item_state_slots = list(slot_r_hand_str = "pwig", slot_l_hand_str = "pwig") + flags_inv = BLOCKHAIR + siemens_coefficient = 2.0 //why is it so conductive?! + body_parts_covered = 0 + +/obj/item/clothing/head/collectable/marine + name = "marine helmet" + desc = "A marine helmet prop from the popular game 'Ruin'." + icon_state = "marine" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/pirate + name = "pirate hat" + desc = "Yarr." + icon_state = "pirate" + body_parts_covered = 0 + +/obj/item/clothing/head/collectable/hgpiratecap + name = "pirate captain hat" + desc = "Yarr." + icon_state = "hgpiratecap" + item_state_slots = list(slot_r_hand_str = "hoscap", slot_l_hand_str = "hoscap") + body_parts_covered = 0 + +/obj/item/clothing/head/collectable/syndicatefake + name = "red space-helmet replica" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red") + icon_state = "syndicate" + desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + siemens_coefficient = 2.0 + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/cardborg + name = "cardborg helmet" + desc = "A helmet made out of a box." + icon_state = "cardborg_h" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + body_parts_covered = HEAD|FACE|EYES + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + +/obj/item/clothing/head/collectable/hasturhood + name = "hastur's hood" + desc = "It's unspeakably stylish." + icon_state = "hasturhood" + item_state_slots = list(slot_r_hand_str = "enginering_beret", slot_l_hand_str = "enginering_beret") + flags_inv = BLOCKHAIR + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/head/collectable/mailman + name = "stationmaster's cap" + icon_state = "mailman" + item_state_slots = list(slot_r_hand_str = "hopcap", slot_l_hand_str = "hopcap") + desc = "Choo-choo!" + body_parts_covered = 0 + +/obj/item/clothing/head/collectable/plaguedoctorhat + name = "plague doctor's hat" + desc = "These were once used by Plague doctors. They're pretty much useless." + icon_state = "plaguedoctor" + item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat") + permeability_coefficient = 0.01 + siemens_coefficient = 0.9 + body_parts_covered = 0 + +/obj/item/clothing/head/collectable/plaguedoctorhat/gold + name = "golden plague doctor's hat" + desc = "These were once used by plague doctors, allegedly. This one has gold accents." + icon_state = "plaguedoctor2" + +/obj/item/clothing/head/helmet/collectable/gladiator + name = "gladiator helmet" + desc = "Ave, Imperator, morituri te salutant." + icon_state = "gladiator" + item_state_slots = list(slot_r_hand_str = "vhelmet", slot_l_hand_str = "vhelmet") + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR + siemens_coefficient = 1 + valid_accessory_slots = null + +/obj/item/clothing/head/collectable/ranger + var/hatcolor = "white" + name = "white ranger helmet" + desc = "A special helmet designed for the Go Go ERT-Rangers, able to withstand a pressureless environment, filter gas and provide air. It has thermal vision and sometimes \ + mesons to find breaches, as well as an integrated radio... well, only in the show, of course." + icon = 'icons/obj/clothing/ranger.dmi' + icon_state = "ranger_helmet" + light_overlay = "helmet_light" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' + w_class = ITEMSIZE_NORMAL + +/obj/item/clothing/head/collectable/ranger/Initialize() + . = ..() + if(icon_state == "ranger_helmet") + name = "[hatcolor] ranger helmet" + icon_state = "[hatcolor]_ranger_helmet" + +/obj/item/clothing/head/collectable/ranger/black + name = "black ranger helmet" + hatcolor = "black" + +/obj/item/clothing/head/collectable/ranger/pink + name = "pink ranger helmet" + hatcolor = "pink" + +/obj/item/clothing/head/collectable/ranger/green + name = "green ranger helmet" + hatcolor = "green" + +/obj/item/clothing/head/collectable/ranger/cyan + name = "cyan ranger helmet" + hatcolor = "cyan" + +/obj/item/clothing/head/collectable/ranger/orange + name = "orange ranger helmet" + hatcolor = "orange" + +/obj/item/clothing/head/collectable/ranger/yellow + name = "yellow ranger helmet" + hatcolor = "yellow" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8ff991f7c5..c3433f9639 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -201,15 +201,6 @@ min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 1 -/obj/item/clothing/head/helmet/gladiator - name = "gladiator helmet" - desc = "Ave, Imperator, morituri te salutant." - icon_state = "gladiator" - item_state_slots = list(slot_r_hand_str = "vhelmet", slot_l_hand_str = "vhelmet") - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR - siemens_coefficient = 1 - valid_accessory_slots = null - /obj/item/clothing/head/helmet/tactical name = "tactical helmet" desc = "An armored helmet capable of being fitted with a multitude of attachments." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 1d73fa7841..6526f00058 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -115,35 +115,6 @@ desc = "Stand and deliver!" body_parts_covered = 0 -/obj/item/clothing/head/mailman - name = "station cap" - icon_state = "mailman" - item_state_slots = list(slot_r_hand_str = "hopcap", slot_l_hand_str = "hopcap") - desc = "Choo-choo!" - body_parts_covered = 0 - -/obj/item/clothing/head/plaguedoctorhat - name = "plague doctor's hat" - desc = "These were once used by Plague doctors. They're pretty much useless." - icon_state = "plaguedoctor" - item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat") - permeability_coefficient = 0.01 - siemens_coefficient = 0.9 - body_parts_covered = 0 - -/obj/item/clothing/head/plaguedoctorhat/gold - name = "golden plague doctor's hat" - desc = "These were once used by plague doctors, allegedly. This one has gold accents." - icon_state = "plaguedoctor2" - -/obj/item/clothing/head/hasturhood - name = "hastur's hood" - desc = "It's unspeakably stylish" - icon_state = "hasturhood" - item_state_slots = list(slot_r_hand_str = "enginering_beret", slot_l_hand_str = "enginering_beret") - flags_inv = BLOCKHAIR - body_parts_covered = HEAD|FACE|EYES - /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." @@ -151,38 +122,12 @@ siemens_coefficient = 0.9 body_parts_covered = 0 -/obj/item/clothing/head/syndicatefake - name = "red space-helmet replica" - item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red") - icon_state = "syndicate" - desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!" - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR - siemens_coefficient = 2.0 - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/head/cueball - name = "cueball helmet" - desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?" - icon_state = "cueball" - flags_inv = BLOCKHAIR - body_parts_covered = HEAD|FACE|EYES - /obj/item/clothing/head/greenbandana name = "green bandana" desc = "It's a green bandana with some fine nanotech lining." icon_state = "greenbandana" flags_inv = 0 body_parts_covered = 0 - -/obj/item/clothing/head/cardborg - name = "cardborg helmet" - desc = "A helmet made out of a box." - icon_state = "cardborg_h" - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - body_parts_covered = HEAD|FACE|EYES - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - /obj/item/clothing/head/justice name = "justice hat" desc = "fight for what's righteous!" @@ -220,19 +165,6 @@ addblends = "flat_capw_a" item_state_slots = list(slot_r_hand_str = "greysoft", slot_l_hand_str = "greysoft") -/obj/item/clothing/head/pirate - name = "pirate hat" - desc = "Yarr." - icon_state = "pirate" - body_parts_covered = 0 - -/obj/item/clothing/head/hgpiratecap - name = "pirate hat" - desc = "Yarr." - icon_state = "hgpiratecap" - item_state_slots = list(slot_r_hand_str = "hoscap", slot_l_hand_str = "hoscap") - body_parts_covered = 0 - /obj/item/clothing/head/bandana name = "pirate bandana" desc = "Yarr." @@ -317,47 +249,6 @@ desc = "For the tiniest of cowboys." icon_state = "cowboy_small" -/obj/item/clothing/head/witchwig - name = "witch costume wig" - desc = "Eeeee~heheheheheheh!" - icon_state = "witch" - flags_inv = BLOCKHAIR - siemens_coefficient = 2.0 - -/obj/item/clothing/head/chicken - name = "chicken suit head" - desc = "Bkaw!" - icon_state = "chickenhead" - flags_inv = BLOCKHAIR - siemens_coefficient = 0.7 - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/head/bearpelt - name = "bear pelt hat" - desc = "Fuzzy." - icon_state = "bearpelt" - item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") - flags_inv = BLOCKHAIR - siemens_coefficient = 0.7 - -/obj/item/clothing/head/xenos - name = "xenos helmet" - icon_state = "xenos" - item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm") - desc = "A helmet made out of chitinous alien hide." - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR - siemens_coefficient = 2.0 - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/head/philosopher_wig - name = "natural philosopher's wig" - desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!" - icon_state = "philosopher_wig" - item_state_slots = list(slot_r_hand_str = "pwig", slot_l_hand_str = "pwig") - flags_inv = BLOCKHAIR - siemens_coefficient = 2.0 //why is it so conductive?! - body_parts_covered = 0 - /obj/item/clothing/head/orangebandana //themij: Taryn Kifer name = "orange bandana" desc = "An orange piece of cloth, worn on the head." @@ -511,47 +402,3 @@ desc = "You... you're not actually going to wear that, right?" icon_state = "fishskull" flags_inv = HIDEEARS|BLOCKHAIR - -/obj/item/clothing/head/marine - name = "marine helmet" - desc = "A marine helmet prop from the popular game 'Ruin'." - icon_state = "marine" - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/head/ranger - var/hatcolor = "white" - name = "ranger helmet" - desc = "A special helmet designed for the Go Go ERT-Rangers, able to withstand a pressureless environment, filter gas and provide air. It has thermal vision and sometimes \ - mesons to find breaches, as well as an integrated radio... well, only in the show, of course." - icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_helmet" - light_overlay = "helmet_light" - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR - drop_sound = 'sound/items/drop/helm.ogg' - pickup_sound = 'sound/items/pickup/helm.ogg' - w_class = ITEMSIZE_NORMAL - -/obj/item/clothing/head/ranger/Initialize() - . = ..() - if(icon_state == "ranger_helmet") - name = "[hatcolor] ranger helmet" - icon_state = "[hatcolor]_ranger_helmet" - -/obj/item/clothing/head/ranger/black - hatcolor = "black" - -/obj/item/clothing/head/ranger/pink - hatcolor = "pink" - -/obj/item/clothing/head/ranger/green - hatcolor = "green" - -/obj/item/clothing/head/ranger/cyan - hatcolor = "cyan" - -/obj/item/clothing/head/ranger/orange - hatcolor = "orange" - -/obj/item/clothing/head/ranger/yellow - hatcolor = "yellow" \ No newline at end of file diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3438150771..2a56af9180 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -60,20 +60,6 @@ qdel(src) ..() -//Plague Dr suit can be found in clothing/suits/bio.dm -/obj/item/clothing/mask/gas/plaguedoctor - name = "plague doctor mask" - desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply." - icon_state = "plaguedoctor" - item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas") - armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/mask/gas/plaguedoctor/gold - name = "gold plague doctor mask" - desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold." - icon_state = "plaguedoctor2" - /obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask that can be connected to an air supply." @@ -130,60 +116,12 @@ armor = list(melee = 10, bullet = 5, laser = 5,energy = 5, bomb = 0, bio = 50, rad = 0) siemens_coefficient = 0.9 -/obj/item/clothing/mask/gas/clown_hat - name = "clown wig and mask" - desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask." - icon_state = "clown" - item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat") - -/obj/item/clothing/mask/gas/sexyclown - name = "sexy-clown wig and mask" - desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." - icon_state = "sexyclown" - item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat") - -/obj/item/clothing/mask/gas/mime - name = "mime mask" - desc = "The traditional mime's mask. It has an eerie facial posture." - icon_state = "mime" - item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") - -/obj/item/clothing/mask/gas/monkeymask - name = "monkey mask" - desc = "A mask used when acting as a monkey." - icon_state = "monkeymask" - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/mask/gas/sexymime - name = "sexy mime mask" - desc = "A traditional female mime's mask." - icon_state = "sexymime" - item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") - -/obj/item/clothing/mask/gas/guy - name = "guy fawkes mask" - desc = "A mask stylised to depict Guy Fawkes." - icon_state = "guyfawkes" - flags_inv = HIDEEARS|HIDEFACE - item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") - /obj/item/clothing/mask/gas/commando name = "commando mask" icon_state = "fullgas" item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat") siemens_coefficient = 0.2 -/obj/item/clothing/mask/gas/cyborg - name = "cyborg visor" - desc = "Beep boop" - icon_state = "death" - -/obj/item/clothing/mask/gas/owl_mask - name = "owl mask" - desc = "Twoooo!" - icon_state = "owl" - body_parts_covered = HEAD|FACE|EYES - /obj/item/clothing/mask/gas/vox name = "alien respirator" desc = "A respiratory filter designed for an alien facial structure. The filter intakes seem nasally fitted, and the mouth covering is articulated to allow the wearer to eat." @@ -193,3 +131,66 @@ flags_inv = 0 species_restricted = list(SPECIES_VOX) filtered_gases = list("phoron", "nitrous_oxide", "oxygen") + +//Costume masks + +/obj/item/clothing/mask/gas/costume + name = "clown wig and mask" + desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask." + icon_state = "clown" + item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat") + +/obj/item/clothing/mask/gas/costume/plaguedoctor + name = "plague doctor mask" + desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply." + icon_state = "plaguedoctor" + item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas") + armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/mask/gas/costume/plaguedoctor/gold + name = "gold plague doctor mask" + desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold." + icon_state = "plaguedoctor2" + +/obj/item/clothing/mask/gas/costume/sexyclown + name = "sexy-clown wig and mask" + desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." + icon_state = "sexyclown" + item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat") + +/obj/item/clothing/mask/gas/costume/mime + name = "mime mask" + desc = "The traditional mime's mask. It has an eerie facial posture." + icon_state = "mime" + item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") + +/obj/item/clothing/mask/gas/costume/monkeymask + name = "monkey mask" + desc = "A mask used when acting as a monkey." + icon_state = "monkeymask" + body_parts_covered = HEAD|FACE|EYES + +/obj/item/clothing/mask/gas/costume/sexymime + name = "sexy mime mask" + desc = "A traditional female mime's mask." + icon_state = "sexymime" + item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") + +/obj/item/clothing/mask/gas/costume/guy + name = "guy fawkes mask" + desc = "A mask stylised to depict Guy Fawkes." + icon_state = "guyfawkes" + flags_inv = HIDEEARS|HIDEFACE + item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") + +/obj/item/clothing/mask/gas/costume/cyborg + name = "cyborg visor" + desc = "Beep boop" + icon_state = "death" + +/obj/item/clothing/mask/gas/costume/owl_mask + name = "owl mask" + desc = "Twoooo!" + icon_state = "owl" + body_parts_covered = HEAD|FACE|EYES diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 8e50be4c1c..5310a28a1b 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -117,16 +117,7 @@ gas_transfer_coefficient = 0.90 siemens_coefficient = 0 -/obj/item/clothing/mask/pig - name = "pig mask" - desc = "A rubber pig mask." - icon_state = "pig" - flags_inv = HIDEFACE|BLOCKHAIR - w_class = ITEMSIZE_SMALL - siemens_coefficient = 0.9 - body_parts_covered = HEAD|FACE|EYES - -/obj/item/clothing/mask/shark +/obj/item/clothing/mask/costume name = "shark mask" desc = "A rubber shark mask." icon_state = "shark" @@ -135,41 +126,49 @@ siemens_coefficient = 0.9 body_parts_covered = HEAD|FACE|EYES -/obj/item/clothing/mask/dolphin +/obj/item/clothing/mask/costume/mummy + name = "mummy bandages" + desc = "Who's the father?" + icon_state = "mummy" + body_parts_covered = HEAD|FACE + item_flags = FLEXIBLEMATERIAL + flags_inv = HIDEFACE|BLOCKHAIR + siemens_coefficient = 0 + +/obj/item/clothing/mask/costume/pig + name = "pig mask" + desc = "A rubber pig mask." + icon_state = "pig" + flags_inv = HIDEFACE|BLOCKHAIR + +/obj/item/clothing/mask/costume/dolphin name = "dolphin mask" desc = "A rubber dolphin mask." icon_state = "dolphin" - flags_inv = HIDEFACE - w_class = ITEMSIZE_SMALL - siemens_coefficient = 0.9 - body_parts_covered = HEAD|FACE|EYES -/obj/item/clothing/mask/goblin +/obj/item/clothing/mask/costume/goblin name = "goblin mask" desc = "A rubber goblin mask." icon_state = "goblin" - flags_inv = HIDEFACE - w_class = ITEMSIZE_SMALL - siemens_coefficient = 0.9 - body_parts_covered = HEAD|FACE|EYES -/obj/item/clothing/mask/demon +/obj/item/clothing/mask/costume/demon name = "demon mask" desc = "A rubber demon mask." icon_state = "demon" - flags_inv = HIDEFACE - w_class = ITEMSIZE_SMALL - siemens_coefficient = 0.9 - body_parts_covered = HEAD|FACE|EYES -/obj/item/clothing/mask/horsehead +/obj/item/clothing/mask/costume/horsehead name = "horse head mask" desc = "A mask made of soft vinyl and latex, representing the head of a horse." icon_state = "horsehead" flags_inv = HIDEFACE|BLOCKHAIR - body_parts_covered = HEAD|FACE|EYES - w_class = ITEMSIZE_SMALL - siemens_coefficient = 0.9 + +/obj/item/clothing/mask/costume/horsehead/Initialize() + . = ..() + // The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary + say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") + say_verbs = list("whinnies", "neighs", "says") + +//None of the Nock masks have icons. /obj/item/clothing/mask/nock_scarab name = "nock mask (blue, scarab)" @@ -199,12 +198,6 @@ w_class = ITEMSIZE_SMALL body_parts_covered = HEAD|FACE -/obj/item/clothing/mask/horsehead/Initialize() - . = ..() - // The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary - say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - say_verbs = list("whinnies", "neighs", "says") - /obj/item/clothing/mask/ai name = "camera MIU" desc = "Allows for direct mental connection to accessible camera networks." @@ -306,4 +299,4 @@ /obj/item/clothing/mask/surgical/dust name = "dust mask" desc = "A dust mask designed to protect the wearer against construction and/or custodial particulate." - icon_state = "dust" \ No newline at end of file + icon_state = "dust" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 7f2f7a273f..ac40892fac 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -33,14 +33,30 @@ /* * Costume */ -/obj/item/clothing/suit/pirate + +/obj/item/clothing/suit/costume name = "pirate coat" desc = "Yarr." icon_state = "pirate" item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat") body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/hgpirate +/obj/item/clothing/suit/costume/lobster + name = "lobster costume" + desc = "Pass the butter." + icon_state = "lobster" + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD + +/obj/item/clothing/suit/costume/chickensuit + name = "Chicken Suit" + desc = "Not a costume for cowards." + icon_state = "chickensuit" + body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + siemens_coefficient = 2.0 + +/obj/item/clothing/suit/costume/hgpirate name = "pirate captain coat" desc = "Yarr." icon_state = "hgpirate" @@ -48,28 +64,15 @@ flags_inv = HIDEJUMPSUIT body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS -/obj/item/clothing/suit/cyborg_suit +/obj/item/clothing/suit/costume/cyborg_suit name = "cyborg suit" desc = "Suit for a cyborg costume." icon_state = "death" fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS -/obj/item/clothing/suit/greatcoat - name = "great coat" - desc = "A heavy great coat" - icon_state = "gentlecoat" - item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat") - flags_inv = HIDEHOLSTER - -/obj/item/clothing/suit/johnny_coat - name = "johnny~~ coat" - desc = "Johnny~~" - icon_state = "gentlecoat" - item_state_slots = list(slot_r_hand_str = "johnny_coat", slot_l_hand_str = "johnny_coat") - flags_inv = HIDEHOLSTER - -/obj/item/clothing/suit/justice +/obj/item/clothing/suit/costume/justice name = "justice suit" desc = "This pretty much looks ridiculous." icon_state = "gentle_coat" @@ -77,21 +80,15 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET -/obj/item/clothing/suit/judgerobe +/obj/item/clothing/suit/costume/judgerobe name = "judge's robe" desc = "This robe commands authority." icon_state = "judge" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash) flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS -/obj/item/clothing/suit/storage/apron/overalls - name = "coveralls" - desc = "A set of denim overalls." - icon_state = "overalls" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - -/obj/item/clothing/suit/syndicatefake +/obj/item/clothing/suit/costume/syndicatefake name = "red space suit replica" icon = 'icons/obj/clothing/spacesuits.dmi' icon_state = "syndicate" @@ -102,31 +99,16 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET -/obj/item/clothing/suit/hastur - name = "Hastur's Robes" - desc = "Robes not meant to be worn by man" +/obj/item/clothing/suit/costume/hastur + name = "Hastur's robes" + desc = "Robes once worn in Lost Carcosa." icon_state = "hastur" item_state_slots = list(slot_r_hand_str = "rad", slot_l_hand_str = "rad") body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER -/obj/item/clothing/suit/imperium_monk - name = "Imperium monk" - desc = "Have YOU killed a xenos today?" - icon_state = "imperium_monk" - body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS - flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - -/obj/item/clothing/suit/chickensuit - name = "Chicken Suit" - desc = "A suit made long ago by the ancient empire KFC." - icon_state = "chickensuit" - body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET - flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - siemens_coefficient = 2.0 - -/obj/item/clothing/suit/monkeysuit - name = "Monkey Suit" +/obj/item/clothing/suit/costume/monkeysuit + name = "monkey suit" desc = "A suit that looks like a primate" icon_state = "monkeysuit" item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") @@ -134,22 +116,22 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER siemens_coefficient = 2.0 -/obj/item/clothing/suit/holidaypriest - name = "Holiday Priest" +/obj/item/clothing/suit/costume/holidaypriest + name = "priestly vestments" desc = "This is a nice holiday my son." icon_state = "holidaypriest" item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER -/obj/item/clothing/suit/cardborg +/obj/item/clothing/suit/costume/cardborg name = "cardborg suit" desc = "An ordinary cardboard box with holes cut in the sides." icon_state = "cardborg" body_parts_covered = UPPER_TORSO|LOWER_TORSO flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER -/obj/item/clothing/suit/skeleton +/obj/item/clothing/suit/costume/skeleton name = "skeleton costume" desc = "A body-tight costume with the human skeleton lined out on it." icon_state = "skelecost" @@ -157,7 +139,7 @@ flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDEGLOVES|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "judge", slot_l_hand_str = "judge") -/obj/item/clothing/suit/engicost +/obj/item/clothing/suit/costume/engicost name = "sexy engineering voidsuit costume" desc = "It's supposed to look like an engineering voidsuit... It doesn't look like it could protect from much radiation." icon_state = "engicost" @@ -165,7 +147,7 @@ flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "eng_voidsuit", slot_l_hand_str = "eng_voidsuit") -/obj/item/clothing/suit/maxman +/obj/item/clothing/suit/costume/maxman name = "doctor maxman costume" desc = "A costume made to look like Dr. Maxman, the famous male-enhancement salesman. Complete with red do-rag and sleeveless labcoat." icon_state = "maxman" @@ -173,7 +155,7 @@ flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") -/obj/item/clothing/suit/iasexy +/obj/item/clothing/suit/costume/iasexy name = "sexy internal affairs suit" desc = "Now where's your pen?~" icon_state = "iacost" @@ -181,7 +163,7 @@ flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black") -/obj/item/clothing/suit/sexyminer +/obj/item/clothing/suit/costume/sexyminer name = "sexy miner costume" desc = "For when you need to get your rocks off." icon_state = "sexyminer" @@ -189,7 +171,7 @@ flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "miner", slot_l_hand_str = "miner") -/obj/item/clothing/suit/sumo +/obj/item/clothing/suit/costume/sumo name = "inflatable sumo wrestler costume" desc = "An inflated sumo wrestler costume. It's quite hot." icon_state = "sumo" @@ -198,7 +180,7 @@ item_state_slots = list(slot_r_hand_str = "classicponcho", slot_l_hand_str = "classicponcho") min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE -/obj/item/clothing/suit/hackercost +/obj/item/clothing/suit/costume/hackercoat name = "classic hacker costume" desc = "You would feel insanely cool wearing this." icon_state = "hackercost" @@ -206,7 +188,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "leather_coat", slot_l_hand_str = "leather_coat") -/obj/item/clothing/suit/lumber +/obj/item/clothing/suit/costume/lumber name = "sexy lumberjack costume" desc = "Smells of dusky pine. Includes chest hair and beard." icon_state = "sexylumber" @@ -214,7 +196,7 @@ 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/marine +/obj/item/clothing/suit/costume/marine name = "marine armor" desc = "A set of marine prop armor from the popular game 'Ruin'." icon_state = "marine" @@ -222,9 +204,88 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") +/obj/item/clothing/suit/costume/hotdog + name = "hot dog costume" + desc = "Frankly ridiculous." + icon_state = "hotdog" + item_state_slots = list(slot_r_hand_str = "hotdog", slot_l_hand_str = "hotdog") + body_parts_covered = UPPER_TORSO|LOWER_TORSO + flags_inv = HIDETIE|HIDEHOLSTER|HIDEEARS|BLOCKHEADHAIR + +/obj/item/clothing/suit/costume/dog + name = "dog costume" + desc = "Strangely musky." + icon_state = "dog_costume" + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD + +/obj/item/clothing/suit/costume/bunny + name = "bunny costume" + desc = "Whenever they catch you, they will kill you. But first they must catch you." + icon_state = "bunnysuit" + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD + +/obj/item/clothing/suit/costume/snowman + name = "snowman costume" + desc = "Dressed for the ball." + icon_state = "snowman" + flags_inv = HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/costume/bee + name = "bee costume" + desc = "According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don't care what humans think is impossible..." + icon_state = "bee" + flags_inv = HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/costume/roman + name = "roman legionary costume" + desc = "Replica ancient armour. Hit the road." + icon_state = "roman" + flags_inv = HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/costume/pharaoh + name = "pharaonic costume" + desc = "The garments of ancient kings." + icon_state = "pharaoh" + flags_inv = HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/suit/costume/vampire + name = "vampire overcoat" + desc = "This costume kind of sucks." + icon_state = "vampire" + item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat") + flags_inv = HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + +/obj/item/clothing/suit/costume/icefairy + name = "icy fairy wings" + desc = "They really move!" + icon_state = "ice_fairy_wings" + flags_inv = HIDETIE|HIDEHOLSTER + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + /* * Misc */ + +/obj/item/clothing/suit/storage/apron/overalls + name = "coveralls" + desc = "A set of denim overalls." + icon_state = "overalls" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + +/obj/item/clothing/suit/greatcoat + name = "great coat" + desc = "A heavy great coat" + icon_state = "gentlecoat" + item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat") + flags_inv = HIDEHOLSTER + /obj/item/clothing/suit/straight_jacket //A mispelling from time immemorial... name = "straitjacket" desc = "A suit that completely restrains the wearer." diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm new file mode 100644 index 0000000000..da8776f32b --- /dev/null +++ b/code/modules/clothing/under/costume.dm @@ -0,0 +1,160 @@ +/obj/item/clothing/under/costume + name = "jester costume" + desc = "Jingle most merrily." + icon_state = "jester" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "green") + +/obj/item/clothing/under/costume/mummy + name = "mummy bandages" + desc = "The wrappings of the ancient dead, or somebody who walked clean through a NanoMed." + icon_state = "mummy" + item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") + +/obj/item/clothing/under/costume/griffin + name = "griffin costume" + desc = "The iconic outfit of classic supervillain, The Griffin." + icon_state = "griffin" + item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown") + +/obj/item/clothing/under/costume/scarecrow + name = "scarecrow's rags" + desc = "Ad hominem." + icon_state = "scarecrow" + item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown") + +/obj/item/clothing/under/costume/ice_fairy + name = "ice fairy dress" + desc = "Aren't you cold in that?" + icon_state = "ice_fairy_dress" + item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") + +/obj/item/clothing/under/costume/witch + name = "witch dress" + desc = "They don't make these from canvas anymore." + icon_state = "dark_witch" + item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") + +//Repathed from old files + +/obj/item/clothing/under/costume/rainbow + name = "rainbow jumpsuit" + desc = "A multi-colored jumpsuit." + icon_state = "rainbow" + +/obj/item/clothing/under/costume/captain_fly + name = "rogue's uniform" + desc = "For the man who doesn't care because he's still free." + icon_state = "captain_fly" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") + +/obj/item/clothing/under/costume/pirate + name = "pirate outfit" + desc = "Yarr." + icon_state = "pirate" + item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + +/obj/item/clothing/under/costume/soviet + name = "soviet uniform" + desc = "For the Motherland!" + icon_state = "soviet" + item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey") + +/obj/item/clothing/under/costume/redcoat + name = "redcoat uniform" + desc = "Looks old." + icon_state = "redcoat" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") + +/obj/item/clothing/under/costume/kilt + name = "kilt" + desc = "Includes shoes and sporran." + icon_state = "kilt" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET + rolled_sleeves = 0 + +/obj/item/clothing/under/costume/gladiator + name = "gladiator uniform" + desc = "Are you not entertained? Is that not why you are here?" + icon_state = "gladiator" + item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow") + body_parts_covered = LOWER_TORSO + +/obj/item/clothing/under/costume/owl + name = "owl uniform" + desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!" + icon_state = "owl" + +/obj/item/clothing/under/costume/schoolgirl + name = "schoolgirl uniform" + desc = "It's just like one of my Japanese animes!" + icon_state = "schoolgirl" + item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/costume/sexyclown + name = "sexy-clown suit" + desc = "It makes you look HONKable!" + icon_state = "sexyclown" + item_state_slots = list(slot_r_hand_str = "clown", slot_l_hand_str = "clown") + body_parts_covered = UPPER_TORSO|LOWER_TORSO + rolled_sleeves = -1 //Please never + +/obj/item/clothing/under/costume/sexymime + name = "sexy mime outfit" + desc = "The only time when you DON'T enjoy looking at someone's rack." + icon_state = "sexymime" + item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") + body_parts_covered = UPPER_TORSO|LOWER_TORSO + rolled_sleeves = -1 //Please never + +/obj/item/clothing/under/costume/sexymaid + name = "sexy maid costume" + desc = "You must be a bit risque teasing all of them in a maid uniform!" + icon_state = "sexymaid" + index = 1 + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +//Ranger uniforms +//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional. +//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform" +/obj/item/clothing/under/costume/ranger + var/unicolor = "white" + name = "white ranger uniform" + desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \ + This costume is instead made from genuine cotton fibre and is based on the season three uniform." + icon = 'icons/obj/clothing/ranger.dmi' + icon_state = "ranger_uniform" + rolled_sleeves = FALSE + +/obj/item/clothing/under/costume/ranger/Initialize() + . = ..() + if(icon_state == "ranger_uniform") //allows for custom items + name = "[unicolor] ranger uniform" + icon_state = "[unicolor]_ranger_uniform" + +/obj/item/clothing/under/costume/ranger/black + name = "black ranger uniform" + unicolor = "black" + +/obj/item/clothing/under/costume/ranger/pink + name = "pink ranger uniform" + unicolor = "pink" + +/obj/item/clothing/under/costume/ranger/green + name = "green ranger uniform" + unicolor = "green" + +/obj/item/clothing/under/costume/ranger/cyan + name = "cyan ranger uniform" + unicolor = "cyan" + +/obj/item/clothing/under/costume/ranger/orange + name = "orange ranger uniform" + unicolor = "orange" + +/obj/item/clothing/under/costume/ranger/yellow + name = "yellow ranger uniform" + unicolor = "yellow" + +//End of old costumes diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index aba1fc0a72..19e876c0c6 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -10,12 +10,6 @@ icon_state = "blue_pyjamas" item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") -/obj/item/clothing/under/captain_fly - name = "rogue's uniform" - desc = "For the man who doesn't care because he's still free." - icon_state = "captain_fly" - item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") - /obj/item/clothing/under/sl_suit desc = "It's a very amish looking suit." name = "amish suit" @@ -43,14 +37,6 @@ item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") rolled_sleeves = 0 -/obj/item/clothing/under/sexyclown - name = "sexy-clown suit" - desc = "It makes you look HONKable!" - icon_state = "sexyclown" - item_state_slots = list(slot_r_hand_str = "clown", slot_l_hand_str = "clown") - body_parts_covered = UPPER_TORSO|LOWER_TORSO - rolled_sleeves = -1 //Please never - /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." @@ -123,21 +109,10 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 -/obj/item/clothing/under/owl - name = "owl uniform" - desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!" - icon_state = "owl" - /obj/item/clothing/under/johnny name = "johnny~~ jumpsuit" desc = "Johnny~~" icon_state = "johnny" - -/obj/item/clothing/under/color/rainbow - name = "rainbow jumpsuit" - desc = "A multi-colored jumpsuit." - icon_state = "rainbow" - /obj/item/clothing/under/psysuit name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." @@ -220,13 +195,6 @@ desc = "A red suit and blue necktie. Somewhat formal." icon_state = "red_suit_skirt" -/obj/item/clothing/under/schoolgirl - name = "schoolgirl uniform" - desc = "It's just like one of my Japanese animes!" - icon_state = "schoolgirl" - item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") - body_parts_covered = UPPER_TORSO|LOWER_TORSO - /obj/item/clothing/under/overalls name = "laborer's overalls" desc = "A set of durable overalls for getting the job done." @@ -238,47 +206,6 @@ desc = "A set of modern pleather reinforced overalls." icon_state = "overalls_sleek" -/obj/item/clothing/under/pirate - name = "pirate outfit" - desc = "Yarr." - icon_state = "pirate" - item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit") - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - -/obj/item/clothing/under/soviet - name = "soviet uniform" - desc = "For the Motherland!" - icon_state = "soviet" - item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey") - -/obj/item/clothing/under/redcoat - name = "redcoat uniform" - desc = "Looks old." - icon_state = "redcoat" - item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") - -/obj/item/clothing/under/kilt - name = "kilt" - desc = "Includes shoes and plaid" - icon_state = "kilt" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET - rolled_sleeves = 0 - -/obj/item/clothing/under/sexymime - name = "sexy mime outfit" - desc = "The only time when you DON'T enjoy looking at someone's rack." - icon_state = "sexymime" - item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime") - body_parts_covered = UPPER_TORSO|LOWER_TORSO - rolled_sleeves = -1 //Please never - -/obj/item/clothing/under/gladiator - name = "gladiator uniform" - desc = "Are you not entertained? Is that not why you are here?" - icon_state = "gladiator" - item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow") - body_parts_covered = LOWER_TORSO - /obj/item/clothing/under/moderncoat name = "modern wrapped coat" desc = "The cutting edge of fashion." @@ -355,11 +282,6 @@ desc = "A simple maid uniform for housekeeping." icon_state = "janimaid" -/obj/item/clothing/under/dress/maid/sexy - name = "sexy maid costume" - desc = "You must be a bit risque teasing all of them in a maid uniform!" - icon_state = "sexymaid" - /obj/item/clothing/under/dress/dress_fire name = "flame dress" desc = "A small black dress with blue flames print on it." @@ -1275,39 +1197,3 @@ Uniforms and such name = "hazard cohesion suit" desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure." icon_state = "cohesionsuit_hazard" - -//Ranger uniforms -//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional. -//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform" -/obj/item/clothing/under/ranger - var/unicolor = "white" - name = "ranger uniform" - desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \ - This costume is instead made from genuine cotton fibre and is based on the season three uniform." - icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_uniform" - rolled_sleeves = FALSE - -/obj/item/clothing/under/ranger/Initialize() - . = ..() - if(icon_state == "ranger_uniform") //allows for custom items - name = "[unicolor] ranger uniform" - icon_state = "[unicolor]_ranger_uniform" - -/obj/item/clothing/under/ranger/black - unicolor = "black" - -/obj/item/clothing/under/ranger/pink - unicolor = "pink" - -/obj/item/clothing/under/ranger/green - unicolor = "green" - -/obj/item/clothing/under/ranger/cyan - unicolor = "cyan" - -/obj/item/clothing/under/ranger/orange - unicolor = "orange" - -/obj/item/clothing/under/ranger/yellow - unicolor = "yellow" diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 418b55f2ab..821458cd33 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -15,7 +15,7 @@ /obj/item/paper, /obj/item/clothing/head/wizard, /obj/item/clothing/head/cakehat, - /obj/item/clothing/mask/gas/clown_hat, + /obj/item/clothing/mask/gas/costume, /obj/item/clothing/head/beret ) diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index f18e1ffec0..da6e82dfe5 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -74,7 +74,7 @@ appliance = GRILL items = list( /obj/item/reagent_containers/food/snacks/bun, - /obj/item/clothing/mask/gas/clown_hat + /obj/item/clothing/mask/gas/costume ) result = /obj/item/reagent_containers/food/snacks/clownburger @@ -325,4 +325,4 @@ /obj/item/reagent_containers/food/snacks/chickenkatsu, /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/chickenfillet \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/chickenfillet diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 96e73d6417..f55e808c59 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -19,7 +19,7 @@ new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wig", /obj/item/clothing/head/powdered_wig, 4, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/collectable/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("taqiyah", /obj/item/clothing/head/taqiyah, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("turban", /obj/item/clothing/head/turban, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("hijab", /obj/item/clothing/head/hijab, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -118,4 +118,4 @@ ignition_point = T0C+232 melting_point = T0C+300 protectiveness = 1 // 4% - conductive = 0 \ No newline at end of file + conductive = 0 diff --git a/code/modules/materials/materials/organic/leather.dm b/code/modules/materials/materials/organic/leather.dm index 71dc4c1cdf..5cd65971d4 100644 --- a/code/modules/materials/materials/organic/leather.dm +++ b/code/modules/materials/materials/organic/leather.dm @@ -19,7 +19,7 @@ new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wig", /obj/item/clothing/head/powdered_wig, 4, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/collectable/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("taqiyah", /obj/item/clothing/head/taqiyah, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("turban", /obj/item/clothing/head/turban, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("hijab", /obj/item/clothing/head/hijab, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -34,4 +34,4 @@ new /datum/stack_recipe("[display_name] armor plate", /obj/item/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("whip", /obj/item/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") - ) \ No newline at end of file + ) diff --git a/code/modules/materials/materials/plastic.dm b/code/modules/materials/materials/plastic.dm index ae18aaf4db..9d077103a9 100644 --- a/code/modules/materials/materials/plastic.dm +++ b/code/modules/materials/materials/plastic.dm @@ -62,8 +62,8 @@ new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/collectable/cardborg, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("pizza box", /obj/item/pizzabox, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe_list("folders",list( new /datum/stack_recipe("blue folder", /obj/item/folder/blue, recycle_material = "[name]"), @@ -85,4 +85,4 @@ hardness = 1 weight = 1 protectiveness = 0 // 0% - conductive = 0 \ No newline at end of file + conductive = 0 diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 16e217456d..fb78a5e071 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -102,7 +102,7 @@ if(88) new/obj/item/xenos_claw(src) if(89) - new/obj/item/clothing/head/bearpelt(src) + new/obj/item/clothing/head/collectable/bearpelt(src) if(90) new/obj/item/organ/internal/heart(src) if(91) @@ -116,7 +116,7 @@ new/obj/item/clothing/under/rank/clown(src) new/obj/item/clothing/shoes/clown_shoes(src) new/obj/item/pda/clown(src) - new/obj/item/clothing/mask/gas/clown_hat(src) + new/obj/item/clothing/mask/gas/costume(src) new/obj/item/bikehorn(src) //new/obj/item/stamp/clown(src) I'd add it, but only clowns can use it new/obj/item/pen/crayon/rainbow(src) @@ -126,7 +126,7 @@ new/obj/item/clothing/shoes/black(src) new/obj/item/pda/mime(src) new/obj/item/clothing/gloves/white(src) - new/obj/item/clothing/mask/gas/mime(src) + new/obj/item/clothing/mask/gas/costume/mime(src) new/obj/item/clothing/head/beret(src) new/obj/item/clothing/suit/suspenders(src) new/obj/item/pen/crayon/mime(src) diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm index 10b0f5178a..4cd19a9a70 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -134,7 +134,7 @@ corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes corpseradio = /obj/item/radio/headset - corpsemask = /obj/item/clothing/mask/gas/clown_hat + corpsemask = /obj/item/clothing/mask/gas/costume corpsepocket1 = /obj/item/bikehorn corpseback = /obj/item/storage/backpack/clown corpseid = 1 @@ -145,7 +145,7 @@ /obj/effect/landmark/mobcorpse/pirate name = "Pirate" - corpseuniform = /obj/item/clothing/under/pirate + corpseuniform = /obj/item/clothing/under/costume/pirate corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpseglasses = /obj/item/clothing/glasses/eyepatch corpsehelmet = /obj/item/clothing/head/bandana @@ -154,16 +154,16 @@ /obj/effect/landmark/mobcorpse/pirate/ranged name = "Pirate Gunner" - corpsesuit = /obj/item/clothing/suit/pirate - corpsehelmet = /obj/item/clothing/head/pirate + corpsesuit = /obj/item/clothing/suit/costume + corpsehelmet = /obj/item/clothing/head/collectable/pirate /obj/effect/landmark/mobcorpse/russian name = "Russian" - corpseuniform = /obj/item/clothing/under/soviet + corpseuniform = /obj/item/clothing/under/costume/soviet corpseshoes = /obj/item/clothing/shoes/boots/jackboots - corpsehelmet = /obj/item/clothing/head/bearpelt + corpsehelmet = /obj/item/clothing/head/collectable/bearpelt /obj/effect/landmark/mobcorpse/russian/ranged - corpsehelmet = /obj/item/clothing/head/ushanka \ No newline at end of file + corpsehelmet = /obj/item/clothing/head/ushanka diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 1832cff793..66a392f8f7 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -406,7 +406,7 @@ /obj/item/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) if(istype(user, /mob/living/carbon/human)) to_chat(user, "HOR-SIE HAS RISEN") - var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead + var/obj/item/clothing/mask/costume/horsehead/magichead = new /obj/item/clothing/mask/costume/horsehead magichead.canremove = 0 //curses! magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH diff --git a/code/modules/spells/targeted/equip/horsemask.dm b/code/modules/spells/targeted/equip/horsemask.dm index c52f75acee..5130e804fa 100644 --- a/code/modules/spells/targeted/equip/horsemask.dm +++ b/code/modules/spells/targeted/equip/horsemask.dm @@ -19,7 +19,7 @@ /spell/targeted/equip_item/horsemask/New() ..() - equipped_summons = list("[slot_wear_mask]" = /obj/item/clothing/mask/horsehead) + equipped_summons = list("[slot_wear_mask]" = /obj/item/clothing/mask/costume/horsehead) /spell/targeted/equip_item/horsemask/cast(list/targets, mob/user = usr) ..() @@ -32,8 +32,8 @@ var/obj/item/new_item = new new_type new_item.canremove = 0 //curses! new_item.unacidable = 1 - if(istype(new_item, /obj/item/clothing/mask/horsehead)) - var/obj/item/clothing/mask/horsehead/magichead = new_item + if(istype(new_item, /obj/item/clothing/mask/costume/horsehead)) + var/obj/item/clothing/mask/costume/horsehead/magichead = new_item magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH return new_item diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 51607531cd..215901b18a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index e8ac30d008..e1fa348b07 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index f34d67af35..152da387d4 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 9106290db4..b82d1bcd91 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 75274280ad..c5bed35102 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index f6ba9c4dae..e94d832776 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 82b09e2fb1..e7d86e4f89 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 35d8410d21..e3d1328596 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index da9ef1922c..02a8538138 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a287a38bd3..2d255de44e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index fb7ed670f2..eec25733fb 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -4871,7 +4871,7 @@ /area/centcom/specops) "fCC" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/head/bearpelt, +/obj/item/clothing/head/collectable/bearpelt, /obj/item/clothing/head/bowler, /obj/item/clothing/head/caphat/cap, /obj/item/clothing/head/beaverhat, @@ -4897,9 +4897,9 @@ /obj/item/clothing/head/justice/green, /obj/item/clothing/head/justice/pink, /obj/item/clothing/head/justice/yellow, -/obj/item/clothing/head/philosopher_wig, -/obj/item/clothing/head/plaguedoctorhat, -/obj/item/clothing/head/xenos, +/obj/item/clothing/head/collectable/philosopher_wig, +/obj/item/clothing/head/collectable/plaguedoctorhat, +/obj/item/clothing/head/collectable/xenos, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "fCK" = ( @@ -10295,7 +10295,7 @@ }, /area/centcom/main_hall) "loZ" = ( -/obj/item/clothing/head/philosopher_wig, +/obj/item/clothing/head/collectable/philosopher_wig, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -11529,7 +11529,7 @@ "mIb" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/glasses/thermal/plain/monocle, -/obj/item/clothing/head/pirate, +/obj/item/clothing/head/collectable/pirate, /turf/simulated/shuttle/floor/darkred, /area/skipjack_station/start) "mIs" = ( @@ -12969,13 +12969,13 @@ /obj/item/clothing/under/hosformalmale, /obj/item/clothing/under/hosformalfem, /obj/item/clothing/under/harness, -/obj/item/clothing/under/gladiator, +/obj/item/clothing/under/costume/gladiator, /obj/item/clothing/under/ert, -/obj/item/clothing/under/schoolgirl, -/obj/item/clothing/under/redcoat, -/obj/item/clothing/under/sexymime, -/obj/item/clothing/under/sexyclown, -/obj/item/clothing/under/soviet, +/obj/item/clothing/under/costume/schoolgirl, +/obj/item/clothing/under/costume/redcoat, +/obj/item/clothing/under/costume/sexymime, +/obj/item/clothing/under/costume/sexyclown, +/obj/item/clothing/under/costume/soviet, /obj/item/clothing/under/space, /obj/item/clothing/under/swimsuit/stripper/mankini, /obj/item/clothing/under/suit_jacket/female, @@ -13404,7 +13404,7 @@ /area/shuttle/merchant/home) "oPQ" = ( /obj/structure/table/standard, -/obj/item/clothing/under/color/rainbow, +/obj/item/clothing/under/costume/rainbow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/collectable/petehat{ pixel_y = 5 @@ -18368,15 +18368,14 @@ /area/shuttle/escape/centcom) "tTz" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/suit/hgpirate, -/obj/item/clothing/suit/imperium_monk, +/obj/item/clothing/suit/costume/hgpirate, /obj/item/clothing/suit/leathercoat, -/obj/item/clothing/suit/justice, -/obj/item/clothing/suit/justice, -/obj/item/clothing/suit/justice, -/obj/item/clothing/suit/justice, -/obj/item/clothing/suit/justice, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/suit/costume/justice, +/obj/item/clothing/suit/costume, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "tTN" = ( @@ -20198,7 +20197,7 @@ /area/skipjack_station/start) "vTt" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/head/philosopher_wig, +/obj/item/clothing/head/collectable/philosopher_wig, /obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; @@ -21486,7 +21485,7 @@ }, /area/wizard_station) "xfC" = ( -/obj/item/clothing/head/xenos, +/obj/item/clothing/head/collectable/xenos, /turf/unsimulated/floor{ icon_state = "asteroid" }, diff --git a/maps/cynosure/submaps/16x11/OldDorms.dmm b/maps/cynosure/submaps/16x11/OldDorms.dmm index 50d487af60..2df43449a1 100644 --- a/maps/cynosure/submaps/16x11/OldDorms.dmm +++ b/maps/cynosure/submaps/16x11/OldDorms.dmm @@ -461,7 +461,7 @@ /obj/structure/closet/cabinet, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/obj/item/clothing/under/dress/maid/sexy, +/obj/item/clothing/under/costume/sexymaid, /obj/item/clothing/head/kitty, /obj/random/maintenance/clean, /turf/simulated/floor/wood, diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index aa11af6c4c..6a749f2ff3 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -677,7 +677,7 @@ "ana" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "anb" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "anc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/security_starboard) -"and" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/bedsheet/rainbow,/obj/item/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/security_starboard) +"and" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/costume/rainbow,/obj/item/bedsheet/rainbow,/obj/item/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/security_starboard) "ane" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "anf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "ang" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index 0f64bb3528..1c76e07af1 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -499,7 +499,7 @@ "jE" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jF" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jG" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jH" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jH" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jI" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/meter,/obj/structure/largecrate/animal/cat,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jJ" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jK" = (/turf/simulated/shuttle/floor/red,/area/syndicate_mothership) @@ -515,7 +515,7 @@ "jU" = (/obj/structure/table/steel_reinforced,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jV" = (/obj/structure/table/steel_reinforced,/obj/item/lipstick/black,/obj/item/lipstick/jade,/obj/item/lipstick/purple,/obj/item/lipstick,/obj/item/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/costume/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/costume/schoolgirl,/obj/item/clothing/under/costume/redcoat,/obj/item/clothing/under/costume/sexymime,/obj/item/clothing/under/costume/sexyclown,/obj/item/clothing/under/costume/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jY" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/suit/hgpirate,/obj/item/clothing/suit/imperium_monk,/obj/item/clothing/suit/leathercoat,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/pirate,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jZ" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/structure/closet/crate/solar,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "ka" = (/turf/space/transit/north,/area/shuttle/escape_pod6/transit) @@ -1984,7 +1984,7 @@ "Mh" = (/turf/simulated/shuttle/wall,/area/centcom/evac) "Mi" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; dir = 8; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/evac) "Mj" = (/obj/structure/table/standard,/obj,/obj,/obj,/obj,/obj,/obj,/obj,/turf/unsimulated/beach/sand,/area/beach) -"Mk" = (/obj/structure/table/standard,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) +"Mk" = (/obj/structure/table/standard,/obj/item/clothing/under/costume/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) "Ml" = (/turf/simulated/shuttle/wall/hard_corner,/area/centcom/evac) "Mm" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/evac) "Mn" = (/turf/simulated/shuttle/plating,/area/centcom/evac) @@ -2657,4 +2657,3 @@ lYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlY afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf "} - diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index c1cd03fa0d..920a26f2d5 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -92611,7 +92611,7 @@ /obj/item/clothing/gloves/rainbow, /obj/item/clothing/head/soft/rainbow, /obj/item/clothing/shoes/rainbow, -/obj/item/clothing/under/color/rainbow, +/obj/item/clothing/under/costume/rainbow, /obj/item/bedsheet/rainbow, /obj/item/pen/crayon/rainbow, /obj/random/crate, diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index c32930dcf2..44129553e4 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -1294,7 +1294,7 @@ "yT" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yU" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yV" = (/obj/machinery/button/remote/blast_door{id = "trade"; name = "Shop Shutters"; pixel_x = 0; pixel_y = -26},/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) -"yW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yX" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "yY" = (/turf/unsimulated/wall,/area/centcom/terminal) "yZ" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) @@ -1302,7 +1302,7 @@ "zb" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zc" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zd" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"ze" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"ze" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/costume/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/costume/schoolgirl,/obj/item/clothing/under/costume/redcoat,/obj/item/clothing/under/costume/sexymime,/obj/item/clothing/under/costume/sexyclown,/obj/item/clothing/under/costume/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zf" = (/obj/machinery/door/airlock/glass{name = "Dock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "zg" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zh" = (/obj/machinery/door/window/northleft{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1662,7 +1662,7 @@ "FX" = (/obj/machinery/teleport/hub,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/shuttle/plating,/area/ninja_dojo/start) "FY" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "FZ" = (/obj/structure/table/standard,/turf/unsimulated/beach/sand,/area/beach) -"Ga" = (/obj/structure/table/standard,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) +"Ga" = (/obj/structure/table/standard,/obj/item/clothing/under/costume/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) "Gb" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "Gc" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'},/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "Gd" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/ninja_dojo/dojo) diff --git a/maps/submaps/surface_submaps/plains/house1.dmm b/maps/submaps/surface_submaps/plains/house1.dmm index b3f1a40eea..6280f10a48 100644 --- a/maps/submaps/surface_submaps/plains/house1.dmm +++ b/maps/submaps/surface_submaps/plains/house1.dmm @@ -22,7 +22,7 @@ "av" = (/obj/structure/table/marble,/obj/random/drinkbottle,/turf/simulated/floor/tiled,/area/submap/house1) "aw" = (/obj/item/flashlight/lantern,/turf/simulated/floor/tiled,/area/submap/house1) "ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/coin/phoron{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/house1) -"ay" = (/obj/item/clothing/head/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) +"ay" = (/obj/item/clothing/head/collectable/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) "az" = (/obj/item/material/harpoon{start_anomalous = 1},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) "aA" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/clothing/accessory/medal/conduct{pixel_y = 6},/turf/simulated/floor/wood,/area/submap/house1) "aB" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/submap/house1) diff --git a/maps/submaps/surface_submaps/plains/house1_arealess.dmm b/maps/submaps/surface_submaps/plains/house1_arealess.dmm index 2e3625ae17..72fa8bce8a 100644 --- a/maps/submaps/surface_submaps/plains/house1_arealess.dmm +++ b/maps/submaps/surface_submaps/plains/house1_arealess.dmm @@ -22,7 +22,7 @@ "av" = (/obj/structure/table/marble,/obj/random/drinkbottle,/turf/simulated/floor/tiled,/area/template_noop) "aw" = (/obj/item/flashlight/lantern,/turf/simulated/floor/tiled,/area/template_noop) "ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/coin/phoron,/turf/simulated/floor/wood,/area/template_noop) -"ay" = (/obj/item/clothing/head/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/template_noop) +"ay" = (/obj/item/clothing/head/collectable/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/template_noop) "az" = (/obj/item/material/harpoon,/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/template_noop) "aA" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/clothing/accessory/medal/conduct{pixel_y = 6},/turf/simulated/floor/wood,/area/template_noop) "aB" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/template_noop) diff --git a/maps/submaps/surface_submaps/plains/methlab.dmm b/maps/submaps/surface_submaps/plains/methlab.dmm index 34ed5adb27..0ba1fa0214 100644 --- a/maps/submaps/surface_submaps/plains/methlab.dmm +++ b/maps/submaps/surface_submaps/plains/methlab.dmm @@ -211,7 +211,7 @@ /obj/item/clothing/shoes/dress{ pixel_y = -9 }, -/obj/item/clothing/mask/demon, +/obj/item/clothing/mask/costume/demon, /obj/structure/curtain/black, /turf/simulated/floor/tiled/techfloor, /area/submap/methlab) @@ -584,7 +584,7 @@ /obj/item/clothing/shoes/dress{ pixel_y = -9 }, -/obj/item/clothing/mask/dolphin, +/obj/item/clothing/mask/costume/dolphin, /obj/structure/curtain/black, /turf/simulated/floor/tiled/techfloor, /area/submap/methlab) @@ -615,7 +615,7 @@ /obj/item/clothing/shoes/dress{ pixel_y = -9 }, -/obj/item/clothing/mask/goblin, +/obj/item/clothing/mask/costume/goblin, /obj/structure/curtain/black, /turf/simulated/floor/tiled/techfloor, /area/submap/methlab) diff --git a/maps/submaps/surface_submaps/plains/priderock.dmm b/maps/submaps/surface_submaps/plains/priderock.dmm index ed00fa26db..518ce1715d 100644 --- a/maps/submaps/surface_submaps/plains/priderock.dmm +++ b/maps/submaps/surface_submaps/plains/priderock.dmm @@ -55,7 +55,7 @@ "VM" = (/obj/structure/loot_pile/maint/trash,/turf/template_noop,/area/submap/priderock) "Wk" = (/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "Xd" = (/obj/structure/cliff/automatic,/obj/structure/railing{dir = 1},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) -"XN" = (/obj/item/clothing/head/bearpelt,/obj/item/binoculars/spyglass,/turf/simulated/floor/outdoors/rocks,/area/submap/priderock) +"XN" = (/obj/item/clothing/head/collectable/bearpelt,/obj/item/binoculars/spyglass,/turf/simulated/floor/outdoors/rocks,/area/submap/priderock) "Yd" = (/obj/effect/decal/cleanable/dirt,/obj/structure/ledge/ledge_stairs{dir = 4},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "YP" = (/turf/simulated/floor/outdoors/rocks,/area/submap/priderock) "Zc" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/structure/ledge/ledge_stairs{dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) diff --git a/maps/submaps/surface_submaps/wilderness/chasm.dmm b/maps/submaps/surface_submaps/wilderness/chasm.dmm index a9223f4136..87a5b393ac 100644 --- a/maps/submaps/surface_submaps/wilderness/chasm.dmm +++ b/maps/submaps/surface_submaps/wilderness/chasm.dmm @@ -95,7 +95,7 @@ "Rz" = (/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "RY" = (/obj/structure/cliff/automatic/corner,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Sc" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Chasm) -"Sj" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/clothing/suit/sexyminer,/turf/simulated/floor/plating,/area/submap/Chasm) +"Sj" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/clothing/suit/costume/sexyminer,/turf/simulated/floor/plating,/area/submap/Chasm) "SA" = (/obj/random/junk,/mob/living/simple_mob/animal/giant_spider/hunter,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "SD" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) "SH" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) diff --git a/polaris.dme b/polaris.dme index 2bf05ed873..b6741a0378 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1714,6 +1714,7 @@ #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" #include "code\modules\clothing\under\color.dm" +#include "code\modules\clothing\under\costume.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm"