Merge remote-tracking branch 'origin/slaveImplant' into slaveImplant

This commit is contained in:
Unknown
2020-09-05 00:12:08 -05:00
2 changed files with 10 additions and 0 deletions
+3
View File
@@ -23,7 +23,10 @@
/obj/item/electropack/shockcollar/security = 5,
/obj/item/storage/belt/slut = 5,
/obj/item/clothing/mask/gas/sechailer/slut = 5,
<<<<<<< HEAD
/obj/item/bdsm_whip/ridingcrop = 3,
=======
>>>>>>> slaveImplant
/obj/item/dildo/flared/gigantic = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,