mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style.
This commit is contained in:
@@ -40,6 +40,10 @@
|
||||
display_name = "collar, pink"
|
||||
path = /obj/item/clothing/accessory/collar/pink
|
||||
|
||||
/datum/gear/collar/cowbell
|
||||
display_name = "collar, cowbell"
|
||||
path = /obj/item/clothing/accessory/collar/cowbell
|
||||
|
||||
/datum/gear/collar/holo
|
||||
display_name = "collar, holo"
|
||||
path = /obj/item/clothing/accessory/collar/holo
|
||||
|
||||
@@ -615,4 +615,15 @@
|
||||
|
||||
/datum/gear/suit/miscellaneous/cardigan/New()
|
||||
..()
|
||||
<<<<<<< HEAD
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
||||||| parent of e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
=======
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
|
||||
/datum/gear/suit/cmddressjacket
|
||||
display_name = "command dress jacket"
|
||||
path = /obj/item/clothing/suit/storage/cmddressjacket
|
||||
allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary")
|
||||
>>>>>>> e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah
|
||||
|
||||
@@ -648,4 +648,36 @@
|
||||
|
||||
/datum/gear/uniform/countess
|
||||
display_name = "countess dress"
|
||||
path = /obj/item/clothing/under/dress/countess
|
||||
path = /obj/item/clothing/under/dress/countess
|
||||
|
||||
/datum/gear/uniform/verglasdress
|
||||
display_name = "verglas dress"
|
||||
path = /obj/item/clothing/under/verglasdress
|
||||
|
||||
/datum/gear/uniform/fashionminiskirt
|
||||
display_name = "fashionable miniskirt"
|
||||
path = /obj/item/clothing/under/fashionminiskirt
|
||||
|
||||
/datum/gear/uniform/fashionminiskirt/New()
|
||||
..()
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
|
||||
/datum/gear/uniform/paramedunidark
|
||||
display_name = "paramedic uniform - dark"
|
||||
path = /obj/item/clothing/under/rank/paramedunidark
|
||||
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
|
||||
|
||||
/datum/gear/uniform/parameduniskirtdark
|
||||
display_name = "paramedic skirt - dark"
|
||||
path = /obj/item/clothing/under/rank/parameduniskirtdark
|
||||
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
|
||||
|
||||
/datum/gear/uniform/paramedunilight
|
||||
display_name = "paramedic uniform - light"
|
||||
path = /obj/item/clothing/under/rank/paramedunilight
|
||||
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
|
||||
|
||||
/datum/gear/uniform/parameduniskirtlight
|
||||
display_name = "paramedic skirt - light"
|
||||
path = /obj/item/clothing/under/rank/parameduniskirtlight
|
||||
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
|
||||
@@ -34,6 +34,12 @@
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||
flags_inv = HIDEHOLSTER
|
||||
|
||||
//Command
|
||||
/obj/item/clothing/suit/storage/cmddressjacket
|
||||
name = "command dress jacket"
|
||||
desc = "A fancy dress jacket made for command staff. Makes you feel in charge."
|
||||
icon_state = "cmddressjacket"
|
||||
|
||||
//Chaplain
|
||||
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie
|
||||
name = "chaplain hoodie"
|
||||
|
||||
@@ -282,6 +282,14 @@
|
||||
item_state = "collar_pnk"
|
||||
overlay_state = "collar_pnk"
|
||||
|
||||
/obj/item/clothing/accessory/collar/cowbell
|
||||
name = "cowbell collar"
|
||||
desc = "A collar for your little pets... or the big ones."
|
||||
icon_state = "collar_cowbell"
|
||||
item_state = "collar_cowbell_overlay"
|
||||
overlay_state = "collar_cowbell_overlay"
|
||||
|
||||
|
||||
/obj/item/clothing/accessory/collar/holo
|
||||
name = "Holo-collar"
|
||||
desc = "An expensive holo-collar for the modern day pet."
|
||||
|
||||
@@ -174,6 +174,34 @@
|
||||
icon_state = "scrubs"
|
||||
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
|
||||
|
||||
/obj/item/clothing/under/rank/paramedunidark
|
||||
name = "dark paramedic uniform"
|
||||
desc = "A dark jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
|
||||
icon_state = "paramedicdark"
|
||||
rolled_down = -1
|
||||
rolled_sleeves = -1
|
||||
|
||||
/obj/item/clothing/under/rank/parameduniskirtdark
|
||||
name = "dark paramedic uniskirt"
|
||||
desc = "A dark jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
|
||||
icon_state = "paramedicdark_skirt"
|
||||
rolled_down = -1
|
||||
rolled_sleeves = -1
|
||||
|
||||
/obj/item/clothing/under/rank/paramedunilight
|
||||
name = "light paramedic uniform"
|
||||
desc = "A light jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
|
||||
icon_state = "paramediclight"
|
||||
rolled_down = -1
|
||||
rolled_sleeves = -1
|
||||
|
||||
/obj/item/clothing/under/rank/parameduniskirtlight
|
||||
name = "light paramedic uniskirt"
|
||||
desc = "A light jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
|
||||
icon_state = "paramediclight_skirt"
|
||||
rolled_down = -1
|
||||
rolled_sleeves = -1
|
||||
|
||||
/obj/item/clothing/under/rank/psych
|
||||
desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
|
||||
name = "psychiatrist's jumpsuit"
|
||||
@@ -186,7 +214,6 @@
|
||||
icon_state = "psychturtle"
|
||||
item_state_slots = list(slot_r_hand_str = "psyche", slot_l_hand_str = "psyche")
|
||||
rolled_sleeves = 0
|
||||
|
||||
/*
|
||||
* Medsci, unused (i think) stuff
|
||||
*/
|
||||
|
||||
@@ -565,6 +565,11 @@
|
||||
desc = "A red and black dress fit for a countess."
|
||||
icon_state = "countess"
|
||||
|
||||
/obj/item/clothing/under/verglasdress
|
||||
name = "verglas dress"
|
||||
desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void."
|
||||
icon_state = "verglas_dress"
|
||||
|
||||
/*
|
||||
* wedding stuff
|
||||
*/
|
||||
@@ -884,6 +889,10 @@ Uniforms and such
|
||||
desc = "A flowery skirt that comes in a variety of colors."
|
||||
icon_state = "flowerskirt"
|
||||
|
||||
/obj/item/clothing/under/fashionminiskirt
|
||||
name = "fashionable miniskirt"
|
||||
desc = "An impractically short miniskirt allegedly making waves through the local fashion scene."
|
||||
icon_state = "miniskirt_fashion"
|
||||
/*
|
||||
* swimsuit
|
||||
*/
|
||||
@@ -946,6 +955,12 @@ Uniforms and such
|
||||
desc = "No honest man would wear this abomination"
|
||||
icon_state = "mankini"
|
||||
|
||||
/obj/item/clothing/under/swimsuit/cowbikini
|
||||
name = "cow print bikini"
|
||||
desc = "A rather skimpy cow patterned swimsuit."
|
||||
icon_state = "swim_cow"
|
||||
|
||||
|
||||
/*
|
||||
* pyjamas
|
||||
*/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -286,6 +286,10 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit.
|
||||
name = "Medical Swimsuit capsule"
|
||||
has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical)
|
||||
|
||||
/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini
|
||||
name = "Cow Bikini Swimsuit capsule"
|
||||
has_items = list(/obj/item/clothing/under/swimsuit/cowbikini)
|
||||
|
||||
//Monkey boxes for the new primals we have
|
||||
/obj/item/weapon/storage/box/monkeycubes/sobakacubes
|
||||
name = "sobaka cube box"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 442 KiB After Width: | Height: | Size: 444 KiB |
Reference in New Issue
Block a user