diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 15a5345ad1..525db577e0 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -17,7 +17,7 @@ /obj/item/clothing/mask/gas/examine(mob/user) . = ..() if(flavor_adjust) - . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]." + . += "Alt-click to toggle identity concealment. It's currently [flags_inv & HIDEFACE ? "on" : "off"]." /obj/item/clothing/mask/gas/AltClick(mob/user) . = ..() @@ -143,14 +143,17 @@ "Blanc" = image(icon = src.icon, icon_state = "mime"), "Excité" = image(icon = src.icon, icon_state = "sexymime"), "Triste" = image(icon = src.icon, icon_state = "sadmime"), - "Effrayé" = image(icon = src.icon, icon_state = "scaredmime") + "Effrayé" = image(icon = src.icon, icon_state = "scaredmime"), + "Timid Woman" = image(icon = src.icon, icon_state = "timidwoman"), + "Timid Man" = image(icon = src.icon, icon_state = "timidman") ) /obj/item/clothing/mask/gas/mime/ui_action_click(mob/user) if(!istype(user) || user.incapacitated()) return - var/static/list/options = list("Blanc" = "mime", "Triste" = "sadmime", "Effrayé" = "scaredmime", "Excité" ="sexymime") + var/static/list/options = list("Blanc" = "mime", "Triste" = "sadmime", "Effrayé" = "scaredmime", "Excité" ="sexymime", + "Timid Woman" = "timidwoman", "Timid Man" = "timidman") var/choice = show_radial_menu(user,src, mimemask_designs, custom_check = FALSE, radius = 36, require_near = TRUE) @@ -170,6 +173,20 @@ item_state = "sexymime" actions_types = list() +/obj/item/clothing/mask/gas/timidcostume + name = "timid woman mask" + desc = "Most people who wear these are not really that timid." + clothing_flags = ALLOWINTERNALS + icon_state = "timidwoman" + item_state = "timidwoman" + flags_cover = MASKCOVERSEYES + resistance_flags = FLAMMABLE + +/obj/item/clothing/mask/gas/timidcostume/man + name = "timid man mask" + icon_state = "timidman" + item_state = "timidman" + /obj/item/clothing/mask/gas/monkeymask name = "monkey mask" desc = "A mask used when acting as a monkey." diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index b0d760ebd9..d99d52666b 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -413,6 +413,22 @@ var/wallcharges = 4 var/newlocobject = null +/obj/item/clothing/shoes/timidcostume + name = "timid woman boots" + desc = "Ready to rock your hips back and forth? These boots have a polychromic finish." + icon_state = "timidwoman" + item_state = "timidwoman" + +/obj/item/clothing/shoes/timidcostume/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#0094FF"), 1) + +/obj/item/clothing/shoes/timidcostume/man + name = "timid man shoes" + desc = "Ready to go kart racing? These shoes have a polychromic finish." + icon_state = "timidman" + item_state = "timidman" + /obj/item/clothing/shoes/wallwalkers/equipped(mob/user,slot) . = ..() if(slot == SLOT_SHOES) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6dfcd72c10..a47d55bfcb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1088,6 +1088,36 @@ icon_state = "winterhood_poly" item_state = "winterhood_poly" +/obj/item/clothing/suit/hooded/wintercoat/timidcostume + name = "timid woman hoodie" + desc = "A snug, tight yet warm outfit with belts wrapped around it. Looks to be made of polychromic materials." + icon_state = "timidwoman" + item_state = "timidwoman" + hoodtype = /obj/item/clothing/head/hooded/winterhood/timidcostume + +/obj/item/clothing/suit/hooded/wintercoat/timidcostume/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#EB0C07", "#5E2400", "#CEA100"), 3) + +/obj/item/clothing/head/hooded/winterhood/timidcostume + name = "timid woman hood" + desc = "A hood attached to the hoodie." + icon_state = "timidwoman" + item_state = "timidwoman" + +/obj/item/clothing/suit/hooded/wintercoat/timidcostume/man + name = "timid man hoodie" + desc = "A snug, tight yet warm outfit a belt wrapped around it. Looks to be made of polychromic materials." + icon_state = "timidman" + item_state = "timidman" + hoodtype = /obj/item/clothing/head/hooded/winterhood/timidcostume/man + +/obj/item/clothing/head/hooded/winterhood/timidcostume/man + name = "timid man hood" + icon_state = "timidman" + item_state = "timidman" + + /obj/item/clothing/suit/striped_sweater name = "striped sweater" desc = "Reminds you of someone, but you just can't put your finger on it..." diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm index cd55a17e3c..d4c8ea096a 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm @@ -11,6 +11,11 @@ // please make sure they're sorted alphabetically and categorized +/datum/sprite_accessory/underwear/socks/garter + name = "Garter" + icon_state = "garter" + has_color = TRUE + /datum/sprite_accessory/underwear/socks/socks_knee name = "Knee-high" icon_state = "socks_knee" diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index b4490f715b..264d262a1d 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -120,7 +120,14 @@ /obj/item/clothing/ears/headphones = 2, /obj/item/clothing/head/wig/random = 3, /obj/item/clothing/suit/ran = 2, - /obj/item/clothing/head/ran = 2) + /obj/item/clothing/head/ran = 2, + /obj/item/clothing/mask/gas/timidcostume = 3, + /obj/item/clothing/suit/hooded/wintercoat/timidcostume = 3, + /obj/item/clothing/shoes/timidcostume = 3, + /obj/item/clothing/mask/gas/timidcostume/man = 3, + /obj/item/clothing/suit/hooded/wintercoat/timidcostume/man = 3, + /obj/item/clothing/shoes/timidcostume/man = 3, + ) contraband = list(/obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand = 2, diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 67d1849ef6..227ae83166 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/feet_digi.dmi b/icons/mob/clothing/feet_digi.dmi index f798850ee7..43244e99b9 100644 Binary files a/icons/mob/clothing/feet_digi.dmi and b/icons/mob/clothing/feet_digi.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 4b0c56c4d2..23b981031c 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index ecc6e2dd2c..7d9433525a 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/mask_muzzled.dmi b/icons/mob/clothing/mask_muzzled.dmi index a1404cfbce..8ca05969bf 100644 Binary files a/icons/mob/clothing/mask_muzzled.dmi and b/icons/mob/clothing/mask_muzzled.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 6098b8342a..ae7117d53b 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi index 5c361feb5f..f80cb4a426 100644 Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ diff --git a/icons/mob/clothing/underwear.dmi b/icons/mob/clothing/underwear.dmi index 8cf1144a68..913bbf8830 100644 Binary files a/icons/mob/clothing/underwear.dmi and b/icons/mob/clothing/underwear.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ee6cf90597..9fa3e527ca 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 106195e968..acd64bb424 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index d3e4c0f7e9..42ef740c4a 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 6ddac703a0..ba9f94e67a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ