shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Random Fixes + Dildos (#268)

Browse Source 
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
This commit is contained in:
TalkingCactus
2017-03-10 12:51:16 -05:00
committed by GitHub
parent 906b8e59d0
commit 09ec454325
21 changed files with 221 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending.dm
+5 -3
View File
@@ -1168,11 +1168,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
products = list(
/obj/item/clothing/under/maid = 5,
/obj/item/clothing/under/stripper_pink = 5,
/obj/item/clothing/under/stripper_green = 5
/obj/item/clothing/under/stripper_green = 5,
/obj/item/weapon/dildo/custom = 5
)
contraband = list(/obj/item/weapon/restraints/handcuffs/fake/kinky = 5,
/obj/item/clothing/neck/petcollar=5,
/obj/item/clothing/under/mankini = 1
/obj/item/clothing/neck/petcollar = 5,
/obj/item/clothing/under/mankini = 1,
/obj/item/weapon/dildo/flared/huge = 1
)
premium = list()
refill_canister = /obj/item/weapon/vending_refill/kink
code/game/objects/items/weapons/vending_items.dm
+2 -2
View File
@@ -75,8 +75,8 @@
/obj/item/weapon/vending_refill/kink
machine_name = "KinkMate"
icon_state = "refill_kink"
charges = list(6, 4, 0)// of 30 standard, 0 contraband, 15 premium
init_charges = list(6, 4, 0)
charges = list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium
init_charges = list(8, 5, 0)
/obj/item/weapon/vending_refill/nazi
machine_name = "nazivend"