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-cit765

Browse Source
This commit is contained in:
Ghommie
2020-06-23 00:13:14 +02:00
parent 9a9e76664f a0a4007332
commit de77b7139c
727 changed files with 240611 additions and 242127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
+146 -5
View File
@@ -105,6 +105,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
///Last world tick we sent a slogan message out
var/last_slogan
var/last_shopper
var/tilted = FALSE
var/tiltable = TRUE
var/squish_damage = 75
var/forcecrit = 0
var/num_shards = 7
var/list/pinned_mobs = list()
///How many ticks until we can send another
var/slogan_delay = 6000
///Icon when vending an item to the user
@@ -372,6 +378,7 @@ GLOBAL_LIST_EMPTY(vending_products)
..()
if(panel_open)
default_unfasten_wrench(user, I, time = 60)
unbuckle_all_mobs(TRUE)
return TRUE
/obj/machinery/vending/screwdriver_act(mob/living/user, obj/item/I)
@@ -435,6 +442,133 @@ GLOBAL_LIST_EMPTY(vending_products)
updateUsrDialog()
else
. = ..()
if(tiltable && !tilted && I.force)
switch(rand(1, 100))
if(1 to 5)
freebie(user, 3)
if(6 to 15)
freebie(user, 2)
if(16 to 25)
freebie(user, 1)
if(76 to 90)
tilt(user)
if(91 to 100)
tilt(user, crit=TRUE)
/obj/machinery/vending/proc/freebie(mob/fatty, freebies)
visible_message("<span class='notice'>[src] yields [freebies > 1 ? "several free goodies" : "a free goody"]!</span>")
for(var/i in 1 to freebies)
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
for(var/datum/data/vending_product/R in shuffle(product_records))
if(R.amount <= 0) //Try to use a record that actually has something to dump.
continue
var/dump_path = R.product_path
if(!dump_path)
continue
R.amount--
new dump_path(get_turf(src))
break
/obj/machinery/vending/proc/tilt(mob/fatty, crit=FALSE)
visible_message("<span class='danger'>[src] tips over!</span>")
tilted = TRUE
layer = ABOVE_MOB_LAYER
var/crit_case
if(crit)
crit_case = rand(1,5)
if(forcecrit)
crit_case = forcecrit
if(in_range(fatty, src))
for(var/mob/living/L in get_turf(fatty))
var/mob/living/carbon/C = L
if(istype(C))
var/crit_rebate = 0 // lessen the normal damage we deal for some of the crits
if(crit_case != 5) // the head asplode case has its own description
C.visible_message("<span class='danger'>[C] is crushed by [src]!</span>", \
"<span class='userdanger'>You are crushed by [src]!</span>")
switch(crit_case) // only carbons can have the fun crits
if(1) // shatter their legs and bleed 'em
crit_rebate = 60
C.bleed(150)
var/obj/item/bodypart/l_leg/l = C.get_bodypart(BODY_ZONE_L_LEG)
if(l)
l.receive_damage(brute=200, updating_health=TRUE)
var/obj/item/bodypart/r_leg/r = C.get_bodypart(BODY_ZONE_R_LEG)
if(r)
r.receive_damage(brute=200, updating_health=TRUE)
if(l || r)
C.visible_message("<span class='danger'>[C]'s legs shatter with a sickening crunch!</span>", \
"<span class='userdanger'>Your legs shatter with a sickening crunch!</span>")
if(2) // pin them beneath the machine until someone untilts it
forceMove(get_turf(C))
buckle_mob(C, force=TRUE)
C.visible_message("<span class='danger'>[C] is pinned underneath [src]!</span>", \
"<span class='userdanger'>You are pinned down by [src]!</span>")
if(3) // glass candy
crit_rebate = 50
for(var/i = 0, i < num_shards, i++)
var/obj/item/shard/shard = new /obj/item/shard(get_turf(C))
shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=1, pain_chance=5)
shard.updateEmbedding()
C.hitby(shard, skipcatch = TRUE, hitpush = FALSE)
shard.embedding = list()
shard.updateEmbedding()
if(4) // paralyze this binch
// the new paraplegic gets like 4 lines of losing their legs so skip them
visible_message("<span class='danger'>[C]'s spinal cord is obliterated with a sickening crunch!</span>", ignored_mobs = list(C))
C.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic)
if(5) // skull squish!
var/obj/item/bodypart/head/O = C.get_bodypart(BODY_ZONE_HEAD)
if(O)
C.visible_message("<span class='danger'>[O] explodes in a shower of gore beneath [src]!</span>", \
"<span class='userdanger'>Oh f-</span>")
O.dismember()
O.drop_organs()
qdel(O)
new /obj/effect/gibspawner/human/bodypartless(get_turf(C))
C.apply_damage(max(0, squish_damage - crit_rebate), forced=TRUE, spread_damage=TRUE)
C.AddElement(/datum/element/squish, 18 SECONDS)
else
L.visible_message("<span class='danger'>[L] is crushed by [src]!</span>", \
"<span class='userdanger'>You are crushed by [src]!</span>")
L.apply_damage(squish_damage, forced=TRUE)
if(crit_case)
L.apply_damage(squish_damage, forced=TRUE)
L.Paralyze(60)
L.emote("scream")
playsound(L, 'sound/effects/blobattack.ogg', 40, TRUE)
playsound(L, 'sound/effects/splat.ogg', 50, TRUE)
var/matrix/M = matrix()
M.Turn(pick(90, 270))
transform = M
if(get_turf(fatty) != get_turf(src))
throw_at(get_turf(fatty), 1, 1, spin=FALSE)
/obj/machinery/vending/proc/untilt(mob/user)
user.visible_message("<span class='notice'>[user] rights [src].", \
"<span class='notice'>You right [src].")
unbuckle_all_mobs(TRUE)
tilted = FALSE
layer = initial(layer)
var/matrix/M = matrix()
M.Turn(0)
transform = M
/obj/machinery/vending/proc/loadingAttempt(obj/item/I, mob/user)
. = TRUE
@@ -447,6 +581,12 @@ GLOBAL_LIST_EMPTY(vending_products)
to_chat(user, "<span class='notice'>You insert [I] into [src]'s input compartment.</span>")
loaded_items++
/obj/machinery/vending/unbuckle_mob(mob/living/buckled_mob, force=FALSE)
if(!force)
return
. = ..()
/**
* Is the passed in user allowed to load this vending machines compartments
*
@@ -511,12 +651,13 @@ GLOBAL_LIST_EMPTY(vending_products)
if(seconds_electrified && !(stat & NOPOWER))
if(shock(user, 100))
return
if(tilted && !user.buckled && !isAI(user))
to_chat(user, "<span class='notice'>You begin righting [src].")
if(do_after(user, 50, target=src))
untilt(user)
return
return ..()
/obj/machinery/vending/ui_base_html(html)
var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/vending)
. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())
/obj/machinery/vending/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -922,7 +1063,7 @@ GLOBAL_LIST_EMPTY(vending_products)
C = H.get_idcard(TRUE)
if(C?.registered_account)
private_a = C.registered_account
say("\The [src] has been linked to [C].")
say("[src] has been linked to [C].")
if(compartmentLoadAccessCheck(user))
if(istype(I, /obj/item/pen))
code/modules/vending/assist.dm
+5 -4
View File
@@ -14,14 +14,15 @@
/obj/item/stock_parts/cell/upgraded = 2)
premium = list(/obj/item/stock_parts/cell/upgraded/plus = 2,
/obj/item/flashlight/lantern = 2,
/obj/item/beacon = 2)
/obj/item/beacon = 2,
/obj/item/airlock_painter/decal = 5)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
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 = 50
extra_price = 100
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_ALMOST_CHEAP
payment_department = NO_FREEBIES
/obj/item/vending_refill/assist
icon_state = "refill_engi"
icon_state = "refill_engi"
code/modules/vending/autodrobe.dm
+2 -2
View File
@@ -139,8 +139,8 @@
/obj/item/clothing/under/costume/drfreeze = 1)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = 180
extra_price = 360
default_price = PRICE_ALMOST_CHEAP
extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
/obj/machinery/vending/autodrobe/Initialize()
code/modules/vending/boozeomat.dm
+2 -2
View File
@@ -40,8 +40,8 @@
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
refill_canister = /obj/item/vending_refill/boozeomat
default_price = 120
extra_price = 100
default_price = PRICE_ALMOST_CHEAP
extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
code/modules/vending/cartridge.dm
+9 -6
View File
@@ -10,16 +10,19 @@
/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,
/obj/item/cartridge/signal/toxins = 10,
/obj/item/pda/heads = 10,
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
/obj/item/pda/heads = 10)
premium = list(/obj/item/cartridge/captain = 2,
/obj/item/cartridge/quartermaster = 2)
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/cart
resistance_flags = FIRE_PROOF
default_price = 250
extra_price = 500
default_price = PRICE_ALMOST_EXPENSIVE
extra_price = PRICE_ALMOST_ONE_GRAND
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
/obj/machinery/vending/cart/Initialize()
. = ..()
cost_multiplier_per_dept = list("[ACCESS_CHANGE_IDS]" = 0)
/obj/item/vending_refill/cart
icon_state = "refill_pda"
code/modules/vending/cigarette.dm
+2 -2
View File
@@ -20,8 +20,8 @@
/obj/item/storage/fancy/cigarettes/cigars/havana = 1,
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1)
refill_canister = /obj/item/vending_refill/cigarette
default_price = 75
extra_price = 250
default_price = PRICE_ALMOST_CHEAP
extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_SRV
/obj/machinery/vending/cigarette/syndicate
code/modules/vending/clothesmate.dm
+2 -2
View File
@@ -173,8 +173,8 @@
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 5,
/obj/item/clothing/suit/hooded/wintercoat/polychromic = 5)
refill_canister = /obj/item/vending_refill/clothing
default_price = 60
extra_price = 120
default_price = PRICE_CHEAP
extra_price = PRICE_BELOW_NORMAL
payment_department = NO_FREEBIES
/obj/machinery/vending/clothing/canLoadItem(obj/item/I,mob/user)
code/modules/vending/coffee.dm
+3 -4
View File
@@ -8,14 +8,13 @@
/obj/item/reagent_containers/food/drinks/mug/tea = 25,
/obj/item/reagent_containers/food/drinks/mug/coco = 25)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
premium = list(/obj/item/reagent_containers/food/snacks/chocolatebar = 3,
/obj/item/reagent_containers/food/condiment/milk = 2,
premium = list(/obj/item/reagent_containers/food/condiment/milk = 2,
/obj/item/reagent_containers/food/drinks/bottle/cream = 2,
/obj/item/reagent_containers/food/condiment/sugar = 1)
refill_canister = /obj/item/vending_refill/coffee
default_price = 45
extra_price = 150
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_PRETTY_CHEAP
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/coffee
code/modules/vending/cola.dm
+2 -2
View File
@@ -21,8 +21,8 @@
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1)
refill_canister = /obj/item/vending_refill/cola
default_price = 45
extra_price = 200
default_price = PRICE_CHEAP_AS_FREE
extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cola
code/modules/vending/dinnerware.dm
+2 -2
View File
@@ -27,8 +27,8 @@
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/dinnerware
resistance_flags = FIRE_PROOF
default_price = 50
extra_price = 250
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
code/modules/vending/engineering.dm
+2 -2
View File
@@ -28,7 +28,7 @@
/obj/item/stock_parts/manipulator = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
default_price = 450
extra_price = 500
default_price = PRICE_NORMAL
extra_price = PRICE_NORMAL
payment_department = ACCOUNT_ENG
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
code/modules/vending/engivend.dm
+4 -3
View File
@@ -15,6 +15,7 @@
/obj/item/electronics/airalarm = 10,
/obj/item/electronics/firealarm = 10,
/obj/item/electronics/firelock = 10,
/obj/item/airlock_painter/decal = 5,
/obj/item/rcd_ammo = 3
)
contraband = list(/obj/item/stock_parts/cell/potato = 3,
@@ -29,10 +30,10 @@
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/engivend
resistance_flags = FIRE_PROOF
default_price = 450
extra_price = 500
default_price = PRICE_ALMOST_EXPENSIVE
extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_ENG
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/engivend
icon_state = "refill_engi"
icon_state = "refill_engi"
code/modules/vending/games.dm
+2 -2
View File
@@ -12,8 +12,8 @@
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
default_price = 50
extra_price = 250
default_price = PRICE_CHEAP
extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
code/modules/vending/kinkmate.dm
+7 -3
View File
@@ -20,7 +20,11 @@
/obj/item/clothing/under/misc/gear_harness = 10,
/obj/item/dildo/custom = 5,
/obj/item/electropack/shockcollar = 3,
/obj/item/assembly/signaler = 3
/obj/item/assembly/signaler = 3,
/obj/item/clothing/under/shorts/polychromic/pantsu,
/obj/item/clothing/under/misc/poly_bottomless,
/obj/item/clothing/under/misc/poly_tanktop,
/obj/item/clothing/under/misc/poly_tanktop/female
)
contraband = list(
/obj/item/clothing/neck/petcollar/locked = 2,
@@ -40,8 +44,8 @@
/obj/item/clothing/under/pants/chaps = 5
)
refill_canister = /obj/item/vending_refill/kink
default_price = 80
extra_price = 250
default_price = PRICE_CHEAP
extra_price = PRICE_BELOW_NORMAL
payment_department = NO_FREEBIES
/obj/item/vending_refill/kink
code/modules/vending/liberation.dm
+2 -2
View File
@@ -28,6 +28,6 @@
/obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
default_price = 150
extra_price = 500
default_price = PRICE_ABOVE_NORMAL
extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_SEC
code/modules/vending/liberation_toy.dm
+2 -2
View File
@@ -25,8 +25,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
default_price = 150
extra_price = 300
default_price = PRICE_ABOVE_NORMAL
extra_price = PRICE_EXPENSIVE
payment_department = NO_FREEBIES
/obj/machinery/vending/toyliberationstation/Initialize()
code/modules/vending/magivend.dm
+2 -2
View File
@@ -16,6 +16,6 @@
contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100)
resistance_flags = FIRE_PROOF
default_price = 250
extra_price = 500
default_price = PRICE_EXPENSIVE
extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_SRV
code/modules/vending/medical.dm
+2 -2
View File
@@ -46,8 +46,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
default_price = 200
extra_price = 250
default_price = PRICE_ALMOST_CHEAP
extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_MED
cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
code/modules/vending/medical_wall.dm
+3 -2
View File
@@ -18,10 +18,11 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/wallmed
default_price = 0
extra_price = 100
default_price = PRICE_FREE
extra_price = PRICE_NORMAL
payment_department = ACCOUNT_MED
cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
tiltable = FALSE
/obj/item/vending_refill/wallmed
machine_name = "NanoMed"
code/modules/vending/megaseed.dm
+2 -2
View File
@@ -58,8 +58,8 @@
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/hydroseeds
resistance_flags = FIRE_PROOF
default_price = 100
extra_price = 350
default_price = PRICE_ALMOST_CHEAP
extra_price = PRICE_NORMAL
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
code/modules/vending/nutrimax.dm
+2 -2
View File
@@ -19,8 +19,8 @@
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/hydronutrients
resistance_flags = FIRE_PROOF
default_price = 100
extra_price = 250
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_CHEAP
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
code/modules/vending/plasmaresearch.dm
+2 -2
View File
@@ -11,7 +11,7 @@
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
contraband = list(/obj/item/assembly/health = 3)
default_price = 400
extra_price = 600
default_price = PRICE_EXPENSIVE
extra_price = PRICE_REALLY_EXPENSIVE
payment_department = ACCOUNT_SCI
cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
code/modules/vending/robotics.dm
+1 -1
View File
@@ -20,6 +20,6 @@
/obj/item/crowbar = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
default_price = 600
default_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SCI
cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
code/modules/vending/security.dm
+7 -4
View File
@@ -15,18 +15,21 @@
/obj/item/secbat = 5)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/fancy/donut_box = 2,
/obj/item/ssword_kit = 1)
/obj/item/ssword_kit = 1,
/obj/item/storage/bag/ammo = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
/obj/item/clothing/gloves/tackler = 5,
/obj/item/ssword_kit = 1)
/obj/item/grenade/stingbang = 1,
/obj/item/ssword_kit = 1,
/obj/item/storage/bag/ammo = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/security
default_price = 650
extra_price = 700
default_price = PRICE_ALMOST_EXPENSIVE
extra_price = PRICE_REALLY_EXPENSIVE
payment_department = ACCOUNT_SEC
cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
code/modules/vending/snack.dm
+2 -2
View File
@@ -27,8 +27,8 @@
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
default_price = 60
extra_price = 160
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_ALMOST_CHEAP
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
input_display_header = "Chef's Food Selection"
code/modules/vending/sovietsoda.dm
+2 -2
View File
@@ -7,6 +7,6 @@
contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
default_price = 1
extra_price = 1
default_price = PRICE_FREE
extra_price = PRICE_FREE
payment_department = NO_FREEBIES
code/modules/vending/sovietvend.dm
+2 -2
View File
@@ -23,8 +23,8 @@
premium = list()
refill_canister = /obj/item/vending_refill/soviet
default_price = 1
extra_price = 1
default_price = PRICE_FREE
extra_price = PRICE_FREE
payment_department = NO_FREEBIES
/obj/item/vending_refill/soviet
code/modules/vending/sustenance.dm
+3 -3
View File
@@ -5,7 +5,7 @@
product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!"
icon_state = "sustenance"
products = list(/obj/item/reagent_containers/food/snacks/tofu = 24,
/obj/item/reagent_containers/food/drinks/ice = 12,
/obj/item/reagent_containers/food/drinks/ice/sustanance = 12,
/obj/item/reagent_containers/food/snacks/candy_corn = 6)
contraband = list(/obj/item/kitchen/knife = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
@@ -14,8 +14,8 @@
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/sustenance
resistance_flags = FIRE_PROOF
default_price = 0
extra_price = 0
default_price = PRICE_FREE
extra_price = PRICE_FREE
payment_department = NO_FREEBIES
/obj/item/vending_refill/sustenance
code/modules/vending/toys.dm
+2 -2
View File
@@ -25,8 +25,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
default_price = 150
extra_price = 300
default_price = PRICE_ABOVE_NORMAL
extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/donksoft
code/modules/vending/wardrobes.dm
+6 -2
View File
@@ -2,8 +2,8 @@
icon_state = "refill_clothes"
/obj/machinery/vending/wardrobe
default_price = 350
extra_price = 400
default_price = PRICE_NORMAL
extra_price = PRICE_EXPENSIVE
payment_department = NO_FREEBIES
input_display_header = "Returned Clothing"
@@ -33,6 +33,8 @@
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
payment_department = ACCOUNT_SEC
cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
default_price = PRICE_ABOVE_NORMAL
extra_price = PRICE_EXPENSIVE
/obj/item/vending_refill/wardrobe/sec_wardrobe
machine_name = "SecDrobe"
@@ -480,6 +482,8 @@
/obj/item/clothing/gloves/color/captain = 1)
refill_canister = /obj/item/vending_refill/wardrobe/cap_wardrobe
payment_department = ACCOUNT_CIV
default_price = PRICE_ALMOST_EXPENSIVE
extra_price = PRICE_ABOVE_EXPENSIVE
/obj/machinery/vending/wardrobe/cap_wardrobe/Initialize()
. = ..()
code/modules/vending/youtool.dm
+5 -4
View File
@@ -18,14 +18,15 @@
/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)
/obj/item/weldingtool/hugetank = 2,
/obj/item/airlock_painter/decal = 3)
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 = 50
extra_price = 300
default_price = PRICE_REALLY_CHEAP
extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_ENG
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/tool
icon_state = "refill_engi"
icon_state = "refill_engi"