Adds Kinkmate back into the server (#231)

* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds in the kinkmate back in.

Its fairly barebones at the moment, cause dildo/onahole code is getting
ported.

Shoutouts to Cactus for literally giving me the code over discord.

* a

a

* Fixed stuff

Made the vending code more in-line with the citadel master and fixed the
gitignore.

* Fixes up the vending_items

Also adds dog collars to the contraband section to the kinkmate.

* A learning experience

Why did TG making map coding so difficult, anyway?

* aaaaaa

I hate life sometimes.
This commit is contained in:
TaxMaster
2017-02-16 18:59:45 -06:00
committed by TalkingCactus
parent 51a8dfe5db
commit a5e688b25d
4 changed files with 19 additions and 7 deletions
+12 -2
View File
@@ -623,7 +623,6 @@
*/
/*
/obj/machinery/vending/[vendors name here] // --vending machine template :)
name = ""
desc = ""
@@ -632,7 +631,6 @@
products = list()
contraband = list()
premium = list()
IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY CANISTER CHARGES in vending_items.dm
*/
@@ -1098,6 +1096,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
refill_canister = /obj/item/weapon/vending_refill/clothing
/obj/machinery/vending/kink
name = "KinkMate"
desc = "A vending machine for all your unmentionable desires."
icon_state = "kink"
product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
vend_reply = "Have fun, you shameless pervert!"
products = list(/obj/item/clothing/under/maid = 5, /obj/item/clothing/under/stripper_pink = 5, /obj/item/clothing/under/stripper_green = 5)
contraband = list(/obj/item/weapon/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar=5, /obj/item/clothing/under/mankini = 1)
premium = list()
refill_canister = /obj/item/weapon/vending_refill/kink
#undef STANDARD_CHARGE
#undef CONTRABAND_CHARGE
#undef COIN_CHARGE
@@ -71,3 +71,9 @@
icon_state = "refill_clothes"
charges = list(35, 13, 4)// of 101 standard, 12 contraband, 10 premium(?)
init_charges = list(35, 13, 4)
/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)