Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-07-02 17:54:29 +01:00
165 changed files with 5924 additions and 1774 deletions
@@ -30,6 +30,11 @@
display_name = "collar, holo"
path = /obj/item/clothing/accessory/collar/holo
//TFF 17/6/19 - public loadout addition: Indigestible Holocollar
/datum/gear/collar/holo/indigestible
display_name = "collar, holo (indigestible)"
path = /obj/item/clothing/accessory/collar/holo/indigestible
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP, Exploration)"
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder")