mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Add the new capture crystal to the "Bits and Bobs" vendor.
Also fixed a typo in the crystals description.
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
/obj/item/capture_crystal/cheap
|
/obj/item/capture_crystal/cheap
|
||||||
name = "cheap capture crystal"
|
name = "cheap capture crystal"
|
||||||
desc = "A silent, unassuming crystal in what appears to be some kind of steel housing. This one seems to be cheapley made and can only handle a willing mind."
|
desc = "A silent, unassuming crystal in what appears to be some kind of steel housing. This one seems to be cheaply made and can only handle a willing mind."
|
||||||
icon = 'icons/obj/capture_crystal_vr.dmi'
|
icon = 'icons/obj/capture_crystal_vr.dmi'
|
||||||
|
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
bound_mob = M
|
bound_mob = M
|
||||||
bound_mob.capture_caught = TRUE
|
bound_mob.capture_caught = TRUE
|
||||||
persist_storable = FALSE
|
persist_storable = FALSE
|
||||||
desc = "A silent, unassuming crystal in what appears to be some kind of steel housing. This one seems to be cheapley made and can only handle a willing mind."
|
desc = "A silent, unassuming crystal in what appears to be some kind of steel housing. This one seems to be cheaply made and can only handle a willing mind."
|
||||||
|
|
||||||
|
|
||||||
/obj/item/capture_crystal/cheap/activate(mob/living/user, target)
|
/obj/item/capture_crystal/cheap/activate(mob/living/user, target)
|
||||||
|
|||||||
29
modular_chomp/code/modules/economy/vending_machines_vr.dm
Normal file
29
modular_chomp/code/modules/economy/vending_machines_vr.dm
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
/obj/machinery/vending/loadout/loadout_misc
|
||||||
|
products = list(/obj/item/weapon/cane = 5,
|
||||||
|
/obj/item/weapon/pack/cardemon = 25,
|
||||||
|
/obj/item/weapon/deck/holder = 5,
|
||||||
|
/obj/item/weapon/deck/cah = 5,
|
||||||
|
/obj/item/weapon/deck/cah/black = 5,
|
||||||
|
/obj/item/weapon/deck/tarot = 5,
|
||||||
|
/obj/item/weapon/deck/cards = 5,
|
||||||
|
/obj/item/weapon/pack/spaceball = 10,
|
||||||
|
/obj/item/weapon/storage/pill_bottle/dice = 5,
|
||||||
|
/obj/item/weapon/storage/pill_bottle/dice_nerd = 5,
|
||||||
|
/obj/item/weapon/melee/umbrella/random = 10,
|
||||||
|
/obj/item/weapon/deck/schnapsen = 5,
|
||||||
|
/obj/item/weapon/deck/egy = 5,
|
||||||
|
/obj/item/capture_crystal/cheap = 5)
|
||||||
|
prices = list(/obj/item/weapon/cane = 100,
|
||||||
|
/obj/item/weapon/pack/cardemon = 100,
|
||||||
|
/obj/item/weapon/deck/holder = 100,
|
||||||
|
/obj/item/weapon/deck/cah = 100,
|
||||||
|
/obj/item/weapon/deck/cah/black = 100,
|
||||||
|
/obj/item/weapon/deck/tarot = 100,
|
||||||
|
/obj/item/weapon/deck/cards = 100,
|
||||||
|
/obj/item/weapon/pack/spaceball = 100,
|
||||||
|
/obj/item/weapon/storage/pill_bottle/dice = 100,
|
||||||
|
/obj/item/weapon/storage/pill_bottle/dice_nerd = 100,
|
||||||
|
/obj/item/weapon/melee/umbrella/random = 100,
|
||||||
|
/obj/item/weapon/deck/schnapsen = 100,
|
||||||
|
/obj/item/weapon/deck/egy = 100,
|
||||||
|
/obj/item/capture_crystal/cheap = 100)
|
||||||
@@ -4587,6 +4587,7 @@
|
|||||||
#include "modular_chomp\code\modules\datums\supplypacks\medical.dm"
|
#include "modular_chomp\code\modules\datums\supplypacks\medical.dm"
|
||||||
#include "modular_chomp\code\modules\datums\supplypacks\munitions.dm"
|
#include "modular_chomp\code\modules\datums\supplypacks\munitions.dm"
|
||||||
#include "modular_chomp\code\modules\datums\supplypacks\science.dm"
|
#include "modular_chomp\code\modules\datums\supplypacks\science.dm"
|
||||||
|
#include "modular_chomp\code\modules\economy\vending_machines_vr.dm"
|
||||||
#include "modular_chomp\code\modules\emotes\definitions\audiable.dm"
|
#include "modular_chomp\code\modules\emotes\definitions\audiable.dm"
|
||||||
#include "modular_chomp\code\modules\emotes\definitions\audible_pain.dm"
|
#include "modular_chomp\code\modules\emotes\definitions\audible_pain.dm"
|
||||||
#include "modular_chomp\code\modules\food\drinkgglass\metaglass.dm"
|
#include "modular_chomp\code\modules\food\drinkgglass\metaglass.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user