Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit

This commit is contained in:
Trilbyspaceclone
2019-06-23 01:52:59 -04:00
committed by GitHub
141 changed files with 4724 additions and 4097 deletions
@@ -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