sync with master

This commit is contained in:
Poojawa
2018-01-31 07:02:55 -06:00
45 changed files with 4136 additions and 317055 deletions
+3 -2
View File
@@ -20,7 +20,7 @@
/obj/item/clothing/under/mankini = 1,
/obj/item/dildo/flared/huge = 1
)
premium = list()
premium = list(/obj/item/device/electropack/shockcollar = 1)
refill_canister = /obj/item/vending_refill/kink
/*
/obj/machinery/vending/nazivend
@@ -84,6 +84,7 @@
/obj/item/vending_refill/kink
machine_name = "KinkMate"
icon = 'modular_citadel/icons/vending_restock.dmi'
icon_state = "refill_kink"
charges = list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium
init_charges = list(8, 5, 0)
@@ -98,4 +99,4 @@
machine_name = "sovietvend"
icon_state = "refill_soviet"
charges = list(47, 7, 0)
init_charges = list(47, 7, 0)
init_charges = list(47, 7, 0)