shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14092 from BlueWildrose/Timidwomen

Browse Source 
Adds Timid wo/man costumes
This commit is contained in:
silicons
2021-01-20 15:21:06 -07:00
committed by GitHub
parent c786eb48ce 88c21942d0
commit 718cb3f501
17 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/clothing/masks/gasmask.dm
View File

@@ -17,7 +17,7 @@
/obj/item/clothing/mask/gas/examine(mob/user)
. = ..()
if(flavor_adjust)
. += "<span class='info'>Alt-click to toggle identity concealment. it's currently <b>[flags_inv & HIDEFACE ? "on" : "off"]</b>.</span>"
. += "<span class='info'>Alt-click to toggle identity concealment. It's currently <b>[flags_inv & HIDEFACE ? "on" : "off"]</b>.</span>"
/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."

16
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -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)

30
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -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..."

5
code/modules/mob/dead/new_player/sprite_accessories/socks.dm
View File

@@ -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"

9
code/modules/vending/autodrobe.dm
View File

@@ -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,