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

Revert "Vending machine changes+Warehouse fix"

Browse Source 
This reverts commit 8779e1b1d4.
This commit is contained in:
RadiantFlash7
2020-01-12 02:46:18 -05:00
parent 8779e1b1d4
commit 0be2f5c98e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/vending.dm
View File

@@ -769,7 +769,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 2)
//VOREStation Edit End
/obj/machinery/vending/cola
name = "Robust Softdrinks"
desc = "A softdrink vendor provided by Robust Industries, LLC."
@@ -812,7 +812,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5,
/obj/item/weapon/reagent_containers/pill/diet = 25,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //YWre-adds price to this. Seems like an over sight
///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5,
/obj/item/weapon/towel/random = 20)
//VOREStation Edit End
@@ -920,7 +920,7 @@
icon_deny = "sec-deny"
req_access = list(access_security)
products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/weapon/gun/energy/taser =3,/obj/item/weapon/gun/projectile/sec =3)
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/box/donut = 2)
req_log_access = access_armory
has_logs = 1

6
maps/yw/cryogaia-05-main.dmm
View File

@@ -3011,7 +3011,7 @@
"bfU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bfV" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bfW" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green,/obj/effect/floor_decal/corner/brown{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/delivery)
"bfX" = (/obj/machinery/button/remote/blast_door{id = "warehouse"; name = "Warehouse Door Control"; pixel_x = -26; pixel_y = -38; req_access = list(31)},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
"bfX" = (/obj/machinery/button/remote/blast_door{id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -26; pixel_y = -38; req_access = list(31)},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
"bfY" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/quartermaster/warehouse)
"bfZ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
"bga" = (/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
@@ -3133,7 +3133,7 @@
"bim" = (/turf/simulated/wall,/area/quartermaster/office)
"bin" = (/obj/machinery/door/airlock/glass_mining{id_tag = "cargodoor"; name = "Cargo Office"; req_access = list(31); req_one_access = list()},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/office)
"bio" = (/obj/machinery/door/blast/shutters{dir = 2; id = "qm_warehouse"; name = "Warehouse Shutters"},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/warehouse)
"bip" = (/obj/machinery/door/blast/shutters{dir = 2; id = "warehouse"; name = "Warehouse Shutters"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/warehouse)
"bip" = (/obj/machinery/door/blast/shutters{dir = 2; id = "qm_warehouse"; name = "Warehouse Shutters"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/warehouse)
"biq" = (/obj/effect/floor_decal/corner_steel_grid{dir = 6},/turf/simulated/floor/outdoors/snow/plating/cryogaia,/area/borealis2/outdoors/grounds)
"bir" = (/obj/effect/floor_decal/industrial/warning/dust/corner,/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/obj/machinery/light/flamp/noshade,/turf/simulated/floor/outdoors/snow/plating/cryogaia,/area/borealis2/outdoors/grounds)
"bis" = (/obj/effect/floor_decal/industrial/warning/dust,/obj/structure/railing{dir = 1},/turf/simulated/floor/outdoors/snow/plating/cryogaia,/area/borealis2/outdoors/grounds)
@@ -3211,7 +3211,7 @@
"bjM" = (/obj/machinery/navbeacon/delivery/south{location = "QM #2"},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjN" = (/obj/machinery/navbeacon/delivery/south{location = "QM #3"},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjO" = (/obj/structure/closet/emcloset,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; listening = 1; name = "Common Channel"; pixel_y = 21},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjP" = (/obj/machinery/button/remote/blast_door{id = "warehouse"; name = "Warehouse Door Control"; pixel_x = 6; pixel_y = 26; req_access = list(31)},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjP" = (/obj/machinery/button/remote/blast_door{id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 6; pixel_y = 26; req_access = list(31)},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjR" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/storage)
"bjS" = (/obj/structure/closet/emcloset,/obj/machinery/status_display/supply_display{pixel_y = 32},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/quartermaster/storage)