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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-09-27 18:00:49 -04:00
committed by GitHub
parent 842c76a9c1
commit a268fc233d
1 changed files with 1 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -55
View File
@@ -425,60 +425,6 @@
display_name = "sweater, grey"
path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
<<<<<<< HEAD
/datum/gear/uniform/brandsuit/aether
display_name = "jumpsuit, aether"
path = /obj/item/clothing/under/aether
/datum/gear/uniform/brandsuit/focal
display_name = "jumpsuit, focal"
path = /obj/item/clothing/under/focal
/datum/gear/uniform/mbill
display_name = "outfit, major bill's"
path = /obj/item/clothing/under/mbill
/datum/gear/uniform/pcrc
display_name = "uniform, PCRC (Security)"
path = /obj/item/clothing/under/pcrc
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
path = /obj/item/clothing/under/grayson
/datum/gear/uniform/brandsuit/wardt
display_name = "jumpsuit, ward-takahashi"
path = /obj/item/clothing/under/wardt
||||||| parent of 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
/datum/gear/uniform/brandsuit/aether
display_name = "jumpsuit, aether"
path = /obj/item/clothing/under/aether
/datum/gear/uniform/brandsuit/focal
display_name = "jumpsuit, focal"
path = /obj/item/clothing/under/focal
/datum/gear/uniform/mbill
display_name = "outfit, major bill's"
path = /obj/item/clothing/under/mbill
/datum/gear/uniform/pcrc
display_name = "uniform, PCRC (Security)"
path = /obj/item/clothing/under/pcrc
allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
path = /obj/item/clothing/under/grayson
/datum/gear/uniform/brandsuit/wardt
display_name = "jumpsuit, ward-takahashi"
path = /obj/item/clothing/under/wardt
=======
>>>>>>> 0085a5bd10... Adds more clothing from Polaris and various sources (#11546)
/datum/gear/uniform/frontier
display_name = "outfit, frontier"
path = /obj/item/clothing/under/frontier
@@ -823,4 +769,4 @@
/datum/gear/uniform/brandsuit/kaleidoscope
display_name = "outfit, kaleidoscope (Science)"
path = /obj/item/clothing/under/corp/kaleidoscope
allowed_roles = list("Research Director","Scientist","Xenobiologist")
allowed_roles = list("Research Director","Scientist","Xenobiologist")