aaaaaaaaaaaahhh (#1450)

This commit is contained in:
Azarak
2020-10-27 02:24:14 +00:00
committed by GitHub
parent bd75f38fd6
commit 7cef97067b
26 changed files with 173 additions and 2 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 KiB

After

Width:  |  Height:  |  Size: 422 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 KiB

After

Width:  |  Height:  |  Size: 409 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 116 KiB

@@ -6,6 +6,11 @@
name = "Fingerless Gloves"
path = /obj/item/clothing/gloves/fingerless
/datum/loadout_item/gloves/evening
name = "Colorable Evening Gloves"
path = /obj/item/clothing/gloves/evening
extra_info = LOADOUT_INFO_ONE_COLOR
/datum/loadout_item/gloves/goldring
name = "A gold ring"
path = /obj/item/clothing/gloves/ring
@@ -12,6 +12,11 @@
path = /obj/item/clothing/head/beanie
extra_info = LOADOUT_INFO_ONE_COLOR
/datum/loadout_item/head/beret_white
name = "Colorable beret"
path = /obj/item/clothing/head/beret/white
extra_info = LOADOUT_INFO_ONE_COLOR
/datum/loadout_item/head/beret
name = "Black beret"
path = /obj/item/clothing/head/beret/black
@@ -57,6 +62,32 @@
name = "Mailman's Hat"
path = /obj/item/clothing/head/mailman
/datum/loadout_item/head/whitekepi
name = "White Kepi"
path = /obj/item/clothing/head/kepi
/datum/loadout_item/head/whitekepiold
name = "White Kepi, Old"
path = /obj/item/clothing/head/kepi/old
/datum/loadout_item/head/maidhead
name = "Maid Headband"
path = /obj/item/clothing/head/maid
/datum/loadout_item/head/cardboard
name = "Cardboard Helmet"
path = /obj/item/clothing/head/cardborg
cost = 2
/datum/loadout_item/head/wig
name = "Wig"
path = /obj/item/clothing/head/wig
extra_info = LOADOUT_INFO_ONE_COLOR
/datum/loadout_item/head/wignatural
name = "Natural Wig"
path = /obj/item/clothing/head/wig/natural
//Cowboy Stuff
/datum/loadout_item/head/cowboyhat
name = "Cowboy Hat, Brown"
@@ -9,3 +9,41 @@
/datum/loadout_item/mask/moustache
name = "Fake moustache"
path = /obj/item/clothing/mask/fakemoustache
/datum/loadout_item/mask/bandana_red
name = "Red Bandana"
path = /obj/item/clothing/mask/bandana/red
/datum/loadout_item/mask/bandana_blue
name = "Blue Bandana"
path = /obj/item/clothing/mask/bandana/blue
/datum/loadout_item/mask/bandana_green
name = "Green Bandana"
path = /obj/item/clothing/mask/bandana/green
/datum/loadout_item/mask/bandana_gold
name = "Gold Bandana"
path = /obj/item/clothing/mask/bandana/gold
/datum/loadout_item/mask/bandana_black
name = "Black Bandana"
path = /obj/item/clothing/mask/bandana/black
/datum/loadout_item/mask/bandana_skull
name = "Skull Bandana"
path = /obj/item/clothing/mask/bandana/skull
/datum/loadout_item/mask/gas_glass
name = "Glass Gas Mask"
path = /obj/item/clothing/mask/gas/glass
//JOB RELATED
/datum/loadout_item/mask/job
subcategory = LOADOUT_SUBCATEGORY_JOB
/datum/loadout_item/mask/job/surgical
name = "Sterile Mask"
path = /obj/item/clothing/mask/surgical
restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic", "Psychologist")
restricted_desc = "Medical"
@@ -31,8 +31,9 @@
path = /obj/item/clothing/shoes/sneakers/brown
/datum/loadout_item/shoes/whiteshoes
name = "White shoes"
name = "Colorable shoes"
path = /obj/item/clothing/shoes/sneakers/white
extra_info = LOADOUT_INFO_ONE_COLOR
/datum/loadout_item/shoes/gildedcuffs
name = "Gilded leg wraps"
@@ -50,6 +51,11 @@
name = "Blue leg wraps"
path= /obj/item/clothing/shoes/wraps/blue
/datum/loadout_item/shoes/high_heels
name = "Colorable High Heels"
path = /obj/item/clothing/shoes/high_heels
extra_info = LOADOUT_INFO_ONE_COLOR
/*/datum/loadout_item/shoes/christmasbootsr - it aint christmas!
name = "Red Christmas Boots"
category = SLOT_SHOES
@@ -23,6 +23,11 @@
name = "Ian Shirt"
path = /obj/item/clothing/suit/ianshirt
/datum/loadout_item/suit/wornshirt
name = "Colorable Worn Shirt"
path = /obj/item/clothing/suit/wornshirt
extra_info = LOADOUT_INFO_ONE_COLOR
//COATS
/datum/loadout_item/suit/coat
subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
@@ -22,6 +22,12 @@
name = "Kilt"
path = /obj/item/clothing/under/costume/kilt
/datum/loadout_item/uniform/poly_kilt
name = "Polychromic Kilt"
path = /obj/item/clothing/under/misc/poly_kilt
extra_info = LOADOUT_INFO_THREE_COLORS
cost = 3
/datum/loadout_item/uniform/poly_button_up
name = "Polychromic Button Up Shirt"
path = /obj/item/clothing/under/misc/poly_shirt
@@ -72,6 +72,9 @@
/obj/item/clothing/under/rank/civilian/head_of_personnel/skirt
mutant_variants = NONE
/obj/item/clothing/under/rank/security/head_of_security/skirt
mutant_variants = NONE
/obj/item/clothing/under/rank/security/head_of_security/alt/skirt
mutant_variants = NONE
@@ -0,0 +1,11 @@
/obj/item/clothing/gloves/evening
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/gloves.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/hands.dmi'
name = "evening gloves"
desc = "Thin, pretty gloves intended for use in regal feminine attire, but knowing Space China these are just for some maid fetish."
icon_state = "evening"
strip_delay = 40
equip_delay_other = 20
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
@@ -44,3 +44,30 @@
desc = "A security cowboy hat, perfect for any true lawman"
icon_state = "cowboyhat_sec"
inhand_icon_state= "cowboyhat_sec"
/obj/item/clothing/head/kepi
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi'
name = "kepi"
desc = "A white cap with visor. Oui oui, mon capitane!"
icon_state = "kepi"
mutant_variants = NONE
/obj/item/clothing/head/kepi/old
icon_state = "kepi_old"
desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
/obj/item/clothing/head/maid
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi'
name = "maid headband"
desc = "Maid in China."
icon_state = "maid"
dynamic_hair_suffix = ""
mutant_variants = NONE
/obj/item/clothing/head/beret/white
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/head.dmi'
name = "beret"
icon_state = "beret_white"
@@ -2,4 +2,12 @@
desc = "A close-fitting mask that can be connected to an air supply. This one's got an easily accessible feeding port to be more suitable for the Vox crewmembers."
name = "vox breath mask"
actions_types = list()
flags_cover = 0
flags_cover = NONE
/obj/item/clothing/mask/gas/glass
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/masks.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/mask.dmi'
name = "glass gas mask"
desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however."
icon_state = "gas_clear"
flags_inv = HIDEEYES
@@ -33,3 +33,9 @@
desc = "A pair of black cowboy boots, pretty easy to scuff up."
icon_state = "cowboyboots_black"
/obj/item/clothing/shoes/high_heels
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/shoes.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/feet.dmi'
name = "high heels"
desc = "A fancy pair of high heels. Won't compensate for your below average height that much."
icon_state = "heels"
@@ -0,0 +1,9 @@
/obj/item/clothing/suit/wornshirt
name = "worn shirt"
desc = "A worn out (or perhaps just baggy), curiously comfortable t-shirt."
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi'
icon_state = "wornshirt"
inhand_icon_state = "labcoat"
body_parts_covered = CHEST|GROIN
mutant_variants = NONE
@@ -31,6 +31,7 @@
icon_state = "cheong"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutant_variants = NONE
/obj/item/clothing/under/costume/cheongsam/white
name = "white cheongsam"
@@ -33,3 +33,16 @@
icon_state = "gear_harness"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
/obj/item/clothing/under/misc/poly_kilt
name = "polychromic kilt"
desc = "It's not a skirt!"
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi'
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi'
icon_state = "polykilt"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
mutant_variants = NONE
/obj/item/clothing/under/misc/poly_kilt/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, list("FFF", "F88", "FFF"))
+2
View File
@@ -3353,6 +3353,7 @@
#include "modular_skyrat\modules\customization\modules\client\loadout\donator\personal\donator_personal.dm"
#include "modular_skyrat\modules\customization\modules\clothing\clothing.dm"
#include "modular_skyrat\modules\customization\modules\clothing\ears\ears.dm"
#include "modular_skyrat\modules\customization\modules\clothing\hands\hands.dm"
#include "modular_skyrat\modules\customization\modules\clothing\hands\rings.dm"
#include "modular_skyrat\modules\customization\modules\clothing\head\head.dm"
#include "modular_skyrat\modules\customization\modules\clothing\masks\breath.dm"
@@ -3361,6 +3362,7 @@
#include "modular_skyrat\modules\customization\modules\clothing\shoes\shoes.dm"
#include "modular_skyrat\modules\customization\modules\clothing\suits\armor.dm"
#include "modular_skyrat\modules\customization\modules\clothing\suits\coats.dm"
#include "modular_skyrat\modules\customization\modules\clothing\suits\misc.dm"
#include "modular_skyrat\modules\customization\modules\clothing\under\costumes.dm"
#include "modular_skyrat\modules\customization\modules\clothing\under\misc.dm"
#include "modular_skyrat\modules\customization\modules\clothing\under\pants.dm"