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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware

Browse Source
This commit is contained in:
TrilbySpaceClone
2020-01-13 11:54:14 -05:00
parent 0ff6b2c2dc 2be5756a6e
commit 04eab97058
106 changed files with 205 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/head.dm
+2 -3
View File
@@ -93,6 +93,7 @@
restricted_desc = "Engineering, Security, and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
/*Commenting out Until next Christmas or made automatic
/datum/gear/santahatr
name = "Red Santa Hat"
category = SLOT_HEAD
@@ -102,6 +103,7 @@
name = "Green Santa Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/christmashatg
*/
/datum/gear/cowboyhat
name = "Cowboy Hat, Brown"
@@ -129,6 +131,3 @@
path = /obj/item/clothing/head/cowboyhat/sec
restricted_desc = "Security"
restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
modular_citadel/code/modules/client/loadout/uniform.dm
+2
View File
@@ -390,6 +390,7 @@
path = /obj/item/clothing/under/gear_harness
//Christmas
/*Commenting out Until next Christmas or made automatic
/datum/gear/christmasmaler
name = "Red Masculine Christmas Suit"
category = SLOT_W_UNIFORM
@@ -415,6 +416,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/stripper_pink
cost = 3
*/
/datum/gear/greenstripper
name = "Green stripper outfit"