Merge remote-tracking branch 'upstream/master' into infinidorms-hotel-update

This commit is contained in:
ariaworld
2024-01-12 23:44:22 +01:00
parent bd5f3a8312
commit 6d1dc09ca7
8 changed files with 31 additions and 16 deletions
@@ -104,12 +104,16 @@
name = "Towel"
path = /obj/item/reagent_containers/rag/towel
/datum/gear/backpack/hugbox
name = "Box of Hugs"
path = /obj/item/storage/box/hug
/datum/gear/backpack/shockcollar
name = "Shock Collar Kit"
path = /obj/item/storage/box/shockcollar
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
cost = 3
/datum/gear/backpack/standard_chastity_box
name = "Chastity Box"
path = /obj/item/storage/box/chastity_cage