Merge branch 'master' into upstream-merge-12982

This commit is contained in:
Razgriz
2022-05-18 13:31:31 -07:00
committed by GitHub
19 changed files with 172 additions and 69 deletions
@@ -44,6 +44,10 @@
display_name = "collar, cowbell"
path = /obj/item/clothing/accessory/collar/cowbell
/datum/gear/collar/planet_earth
display_name = "collar, planet"
path = /obj/item/clothing/accessory/collar/collarplanet_earth
/datum/gear/collar/holo
display_name = "collar, holo"
path = /obj/item/clothing/accessory/collar/holo