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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

Browse Source
This commit is contained in:
Ghommie
2020-05-12 20:06:59 +02:00
parent b2a20d5438 0b03958136
commit 7fb96ab0cf
557 changed files with 283936 additions and 4436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
+1
View File
@@ -123,6 +123,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
var/extended_inventory
///Are we checking the users ID
var/scan_id = TRUE
var/obj/item/coin/coin
///Default price of items if not overridden
var/default_price = 25
///Default price of premium items if not overridden
code/modules/vending/assist.dm
+1 -1
View File
@@ -19,7 +19,7 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
refill_canister = /obj/item/vending_refill/assist
resistance_flags = FIRE_PROOF
default_price = 100
default_price = 50
extra_price = 100
payment_department = NO_FREEBIES
code/modules/vending/autodrobe.dm
-3
View File
@@ -147,9 +147,6 @@
. = ..()
cost_multiplier_per_dept = list("[ACCESS_THEATRE]" = 0)
/obj/machinery/vending/autodrobe/all_access
desc = "A vending machine for costumes. This model appears to have no access restrictions."
/obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
return (I.type in products)
code/modules/vending/youtool.dm
+4 -3
View File
@@ -15,14 +15,15 @@
/obj/item/flashlight/glowstick/red = 6,
/obj/item/flashlight = 7)
contraband = list(/obj/item/weldingtool/largetank = 4,
/obj/item/clothing/gloves/color/fyellow = 4)
/obj/item/clothing/gloves/color/fyellow = 4,
/obj/item/multitool = 2)
premium = list(/obj/item/clothing/gloves/color/yellow = 2,
/obj/item/weldingtool/hugetank = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
refill_canister = /obj/item/vending_refill/tool
resistance_flags = FIRE_PROOF
default_price = 125
extra_price = 350
default_price = 50
extra_price = 300
payment_department = ACCOUNT_ENG
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)