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

Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit

Browse Source
This commit is contained in:
Trilbyspaceclone
2019-06-23 01:52:59 -04:00
committed by GitHub
parent 7f4d60ae25 2f96e40120
commit 4278284e7b
141 changed files with 4724 additions and 4097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+7 -1
View File
@@ -397,4 +397,10 @@ datum/gear/darksabresheath
name = "Kimono"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/kimono
ckeywhitelist = list("sfox63")
ckeywhitelist = list("sfox63")
/datum/gear/commjacket
name = "Dusty Commisar's Cloak"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/commjacket
ckeywhitelist = list("sadisticbatter")
modular_citadel/code/modules/client/loadout/_medical.dm
+27
View File
@@ -1,5 +1,32 @@
/datum/gear/stethoscope
name = "Medical Briefcase"
category = SLOT_HANDS
path = /obj/item/storage/briefcase/medical
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
/datum/gear/stethoscope
name = "Stethoscope"
category = SLOT_NECK
path = /obj/item/clothing/neck/stethoscope
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
/datum/gear/bluescrubs
name = "Blue Scrubs"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/medical/blue
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
restricted_desc = "Medical"
/datum/gear/greenscrubs
name = "Green Scrubs"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/medical/green
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
restricted_desc = "Medical"
/datum/gear/purplescrubs
name = "Purple Scrubs"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/medical/purple
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
restricted_desc = "Medical"
modular_citadel/code/modules/client/loadout/head.dm
+5
View File
@@ -54,6 +54,11 @@
path = /obj/item/clothing/head/flakhelm
cost = 2
/datum/gear/bunnyears
name = "Bunny Ears"
category = SLOT_HEAD
path = /obj/item/clothing/head/rabbitears
//trek fancy Hats!
/datum/gear/trekcap
name = "Federation Officer's Cap (White)"
modular_citadel/code/modules/client/loadout/uniform.dm
+6 -1
View File
@@ -93,6 +93,11 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/schoolgirl/orange
/datum/gear/stripeddress
name = "Striped Dress"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/stripeddress
/datum/gear/kilt
name = "Kilt"
category = SLOT_W_UNIFORM
@@ -304,7 +309,7 @@
restricted_desc = "Engineering and Security"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//memes
//Memes
/datum/gear/gear_harnesses
name = "Gear Harness"
category = SLOT_W_UNIFORM