Merge branch 'master' into cargonia-is-glorious!

This commit is contained in:
deathride58
2018-02-06 02:54:58 +00:00
committed by GitHub
67 changed files with 80268 additions and 68192 deletions
+4 -4
View File
@@ -1,9 +1,9 @@
/datum/supply_pack/misc/kinkmate
name = "Kinkmate supply Crate"
name = "Kinkmate construction kit"
cost = 2000
contraband = TRUE
contains = list(/obj/item/vending_refill/kink)
crate_name = "Kinkmate supply crate"
contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate)
crate_name = "Kinkmate construction kit"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Miscellaneous ///////////////////////////////////
@@ -13,4 +13,4 @@
name = "Disco Ball"
cost = 1000000
contains = list(/obj/machinery/disco)
crate_name = "Disco Ball"
crate_name = "Disco Ball"