mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-15 01:54:52 +01:00
allows non-prisoners to access sustenance vendor in catwalk bridge (#92273)
## About The Pull Request Allows non-prisoners to access vendors with access requirements, adds command access requirement to bridge catwalk sustenance vendor ## Why It's Good For The Game fixes #92185 ## Changelog 🆑 fix: Command can now use their sustenance vendor on Catwalk Station /🆑
This commit is contained in:
@@ -29027,6 +29027,15 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/engine/hull/air,
|
||||
/area/station/construction/storage_wing)
|
||||
"iBz" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/vending/sustenance{
|
||||
req_access = list("command")
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/light/small/directional/north,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/central)
|
||||
"iBG" = (
|
||||
/obj/structure/broken_flooring/singular/directional/south,
|
||||
/turf/open/floor/plating,
|
||||
@@ -57386,22 +57395,6 @@
|
||||
/obj/effect/landmark/start/hangover,
|
||||
/turf/open/floor/grass,
|
||||
/area/station/hallway/primary/central)
|
||||
"qTQ" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/hug/plushes{
|
||||
pixel_x = -11;
|
||||
pixel_y = 16
|
||||
},
|
||||
/obj/item/toy/figure/mime{
|
||||
pixel_x = -6;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/toy/figure/clown{
|
||||
pixel_x = 4;
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/open/floor/eighties,
|
||||
/area/station/construction/storage_wing)
|
||||
"qTX" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/machinery/computer/security{
|
||||
@@ -64179,13 +64172,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/commons/dorms)
|
||||
"sVj" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/vending/sustenance,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/light/small/directional/north,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/central)
|
||||
"sVn" = (
|
||||
/obj/effect/turf_decal/trimline/yellow/filled/line{
|
||||
dir = 9
|
||||
@@ -73608,6 +73594,22 @@
|
||||
/obj/structure/disposalpipe/junction,
|
||||
/turf/open/floor/iron/large,
|
||||
/area/station/hallway/primary/central)
|
||||
"vJP" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/hug/plushes{
|
||||
pixel_x = -11;
|
||||
pixel_y = 16
|
||||
},
|
||||
/obj/item/toy/figure/mime{
|
||||
pixel_x = -6;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/toy/figure/clown{
|
||||
pixel_x = 4;
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/open/floor/eighties,
|
||||
/area/station/construction/storage_wing)
|
||||
"vJV" = (
|
||||
/obj/machinery/door/airlock/external,
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
@@ -166912,7 +166914,7 @@ nlm
|
||||
nlm
|
||||
nlm
|
||||
rDv
|
||||
qTQ
|
||||
vJP
|
||||
rDv
|
||||
rDv
|
||||
rDv
|
||||
@@ -182628,7 +182630,7 @@ uWi
|
||||
uWi
|
||||
uWi
|
||||
nNj
|
||||
sVj
|
||||
iBz
|
||||
uyn
|
||||
jni
|
||||
nNj
|
||||
|
||||
@@ -41,11 +41,19 @@
|
||||
displayed_currency_name = " LP"
|
||||
|
||||
/obj/machinery/vending/sustenance/interact(mob/user)
|
||||
if(isliving(user))
|
||||
var/mob/living/living_user = user
|
||||
if(!(machine_stat & NOPOWER) && !istype(living_user.get_idcard(TRUE), /obj/item/card/id/advanced/prisoner))
|
||||
if(!isliving(user))
|
||||
return ..()
|
||||
var/mob/living/living_user = user
|
||||
if(!is_operational)
|
||||
to_chat(user, span_warning("Machine does not respond to your ID swipe"))
|
||||
return
|
||||
if(!istype(living_user.get_idcard(TRUE), /obj/item/card/id/advanced/prisoner))
|
||||
if(!req_access)
|
||||
speak("No valid prisoner account found. Vending is not permitted.")
|
||||
return
|
||||
if(!allowed(user))
|
||||
speak("No valid permissions. Vending is not permitted.")
|
||||
return
|
||||
return ..()
|
||||
|
||||
/obj/machinery/vending/sustenance/labor_camp/proceed_payment(obj/item/card/id/paying_id_card, mob/living/mob_paying, datum/data/vending_product/product_to_vend, price_to_use)
|
||||
|
||||
Reference in New Issue
Block a user