cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11479

Browse Source
This commit is contained in:
Nadyr
2021-08-24 21:27:28 -04:00
committed by GitHub
parent f326dceba1 3c8badc6a2
commit c9afb6b96d
26 changed files with 212 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

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

2
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -620,4 +620,4 @@
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
path = /obj/item/clothing/suit/storage/cmddressjacket
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")

34
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

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