diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 9753da9d69e..676b74c7325 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9009,7 +9009,7 @@ }, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/suit/suspenders, +/obj/item/clothing/suit/toggle/suspenders, /obj/effect/spawner/lootdrop/costume, /obj/effect/turf_decal/tile/red{ dir = 1 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 56cc017d64a..21d9df1450b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -13696,7 +13696,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/clothing/suit/suspenders, +/obj/item/clothing/suit/toggle/suspenders, /obj/item/clothing/head/papersack/smiley, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 59b8280b9c0..8d1905f2b7b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2247,7 +2247,7 @@ /obj/item/clothing/gloves/color/white, /obj/item/clothing/mask/gas/mime, /obj/item/clothing/head/frenchberet, - /obj/item/clothing/suit/suspenders, + /obj/item/clothing/suit/toggle/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/item/storage/backpack/mime) crate_name = "standard costume crate" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 347b4c69985..5e6a471a784 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -106,12 +106,13 @@ //Mime -/obj/item/clothing/suit/suspenders +/obj/item/clothing/suit/toggle/suspenders name = "suspenders" desc = "They suspend the illusion of the mime's play." icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here + togglename = "straps" //Security /obj/item/clothing/suit/security/officer @@ -165,7 +166,7 @@ item_state = "techpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/techpriest - + /obj/item/clothing/head/hooded/techpriest name = "techpriest's hood" desc = "A hood for those who REALLY love their toasters." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b0d2189b556..6ae9d40e035 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -703,3 +703,33 @@ w_class = WEIGHT_CLASS_TINY flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR alternate_worn_layer = UNDER_HEAD_LAYER + +/obj/item/clothing/suit/toggle/suspenders/blue + name = "blue suspenders" + desc = "The symbol of hard labor and dirty jobs." + icon = 'icons/obj/clothing/belts.dmi' + icon_state = "suspenders_blue" + +/obj/item/clothing/suit/toggle/suspenders/gray + name = "gray suspenders" + desc = "The symbol of hard labor and dirty jobs." + icon = 'icons/obj/clothing/belts.dmi' + icon_state = "suspenders_gray" + +/obj/item/clothing/suit/hooded/mysticrobe + name = "mystic's robe" + desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. " + icon_state = "mysticrobe" + item_state = "mysticrobe" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + allowed = list(/obj/item/spellbook, /obj/item/storage/book/bible) + flags_inv = HIDEJUMPSUIT + hoodtype = /obj/item/clothing/head/hooded/mysticrobe + +/obj/item/clothing/head/hooded/mysticrobe + name = "mystic's hood" + desc = "The balance of reality tips towards order." + icon_state = "mystichood" + item_state = "mystichood" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 318cb0c8e7f..fcdbb544ff4 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -31,7 +31,7 @@ mask = /obj/item/clothing/mask/gas/mime gloves = /obj/item/clothing/gloves/color/white head = /obj/item/clothing/head/frenchberet - suit = /obj/item/clothing/suit/suspenders + suit = /obj/item/clothing/suit/toggle/suspenders backpack_contents = list(/obj/item/book/mimery=1, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1) backpack = /obj/item/storage/backpack/mime diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index f6df2da8895..88250bd6ff0 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -136,7 +136,8 @@ /obj/item/shield/riot/roman/fake = 1, /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, /obj/item/clothing/head/clownmitre = 1, - /obj/item/skub = 1) + /obj/item/skub = 1, + /obj/item/clothing/suit/hooded/mysticrobe = 1) refill_canister = /obj/item/vending_refill/autodrobe /obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index a68530df61f..6db189b1088 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -106,7 +106,9 @@ /obj/item/clothing/shoes/cowboy/black = 2, /obj/item/clothing/suit/jacket/miljacket = 1, /obj/item/clothing/suit/apron/purple_bartender = 2, - /obj/item/clothing/under/rank/civilian/bartender/purple = 2) + /obj/item/clothing/under/rank/civilian/bartender/purple = 2, + /obj/item/clothing/suit/toggle/suspenders/blue = 2, + /obj/item/clothing/suit/toggle/suspenders/gray = 2) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/under/syndicate/tacticool/skirt = 1, /obj/item/clothing/mask/balaclava = 1, diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 90191b28746..dba6a1a5e2f 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 4710b9bd3c2..9a74e6505a9 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index d444ac037c5..56bfaf7178b 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 7dbb6e4725e..1c3f09b6294 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 787024d7c69..398add03fc9 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ee5e0db0749..97774e1d27d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b7e65f00c0d..211ca4551fc 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ