cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-09 18:03:34 -04:00
committed by GitHub
parent 709d86f6bb
commit ad6386385a
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
code/game/machinery/vending_machines_vr.dm
View File

@@ -1029,7 +1029,8 @@
premium = list(/obj/item/clothing/under/color/rainbow = 1)
contraband = list(/obj/item/clothing/under/rank/clown = 1)
<<<<<<< HEAD
//////////////////START OF CHIPS CO. VENDORS//////////////////
/obj/machinery/vending/loadout/gadget
name = "Chips Co."
desc = "A special vendor for devices and gadgets."
@@ -1087,8 +1088,7 @@
premium = list(/obj/item/device/perfect_tele/one_beacon = 1)
contraband = list(/obj/item/weapon/disk/nifsoft/compliance = 1)
||||||| parent of 0714cf04d9... Merge pull request #10597 from klaasjared/Chips-Co.-fix
/obj/machinery/vending/loadout/gadget
/obj/machinery/vending/event/gadget //FOR FACILITATING AND EQUIPPING EVENTS, DO NOT PLACE ON THE NORMAL MAP//
name = "Chips Co."
desc = "A special vendor for devices and gadgets."
product_ads = "You can't RESIST our great deals!;Feeling disconnected? We have a gadget for you!;You know you have the capacity to buy our capacitors!;FILL THAT HOLE IN YOUR HEART WITH OUR PLASTIC DISTRACTIONS!!!;Devices for everyone! Chips Co.!;ROBUST INVENTORY, GREAT PRICES! ;DON'T FORGET THE oyPAD 13s PRO! ON SALE NOW, ONLY ONE THOUSAND THALERS!"
@@ -1114,35 +1114,12 @@
/obj/item/device/flashlight = 5,
/obj/item/device/laser_pointer = 3,
/obj/item/clothing/glasses/omnihud = 10,
/obj/item/instrument/piano_synth/headphones = 2, // You're making a subsystem do work, I don't want it TOO busy
/obj/item/instrument/piano_synth/headphones/spacepods = 2)
prices = list(/obj/item/clothing/suit/circuitry = 100,
/obj/item/clothing/head/circuitry = 100,
/obj/item/clothing/shoes/circuitry = 100,
/obj/item/clothing/gloves/circuitry = 100,
/obj/item/clothing/under/circuitry = 100,
/obj/item/clothing/glasses/circuitry = 100,
/obj/item/clothing/ears/circuitry = 100,
/obj/item/device/text_to_speech = 300,
/obj/item/device/paicard = 100,
/obj/item/device/communicator = 100,
/obj/item/device/communicator/watch = 100,
/obj/item/device/radio = 100,
/obj/item/device/camera = 100,
/obj/item/device/taperecorder = 100,
/obj/item/modular_computer/tablet/preset/custom_loadout/cheap = 1000,
/obj/item/device/pda = 50,
/obj/item/device/radio/headset = 50,
/obj/item/device/flashlight = 100,
/obj/item/device/laser_pointer = 200,
/obj/item/clothing/glasses/omnihud = 100,
/obj/item/instrument/piano_synth/headphones = 200,
/obj/item/instrument/piano_synth/headphones/spacepods = 600)
premium = list(/obj/item/device/perfect_tele/one_beacon = 1)
contraband = list(/obj/item/weapon/disk/nifsoft/compliance = 1)
/obj/item/device/perfect_tele/one_beacon = 1,
/obj/item/weapon/disk/nifsoft/compliance = 1,
/obj/item/device/perfect_tele/alien = 10)
//////////////////END OF CHIPS CO. VENDORS//////////////////
=======
>>>>>>> 0714cf04d9... Merge pull request #10597 from klaasjared/Chips-Co.-fix
/obj/machinery/vending/loadout/loadout_misc
name = "Bits and Bobs"
desc = "A special vendor for things and also stuff!"