From 3f6f4555d7f3633e26e117f6e8d4fe575dbb3485 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Mon, 1 Apr 2019 23:51:41 +0200 Subject: [PATCH] Minor Lavaland item fixes --- _maps/map_files/generic/Lavaland.dmm | 6 +++--- code/game/objects/items/weapons/storage/belt.dm | 2 +- code/modules/mining/equipment_locker.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 1a294ed6c72..7f09faa048d 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -141,7 +141,7 @@ "cK" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/mine/production) "cL" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/mine/production) "cM" = (/turf/simulated/wall,/area/mine/living_quarters) -"cN" = (/obj/machinery/mineral/equipment_vendor,/obj/effect/turf_decal/tile/brown{dir = 2},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/simulated/floor/plasteel,/area/mine/production) +"cN" = (/obj/machinery/mineral/equipment_vendor/lavaland,/obj/effect/turf_decal/tile/brown{dir = 2},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/simulated/floor/plasteel,/area/mine/production) "cO" = (/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{pixel_y = 24},/obj/effect/turf_decal/loading_area{dir = 8},/turf/simulated/floor/plasteel,/area/mine/production) "cP" = (/obj/structure/closet/crate,/obj/machinery/alarm{pixel_y = 23},/obj/effect/turf_decal/bot,/turf/simulated/floor/plasteel,/area/mine/production) "cQ" = (/turf/simulated/wall/r_wall,/area/mine/maintenance) @@ -165,7 +165,7 @@ "di" = (/obj/machinery/telecomms/relay/preset/mining,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/dark,/area/mine/maintenance) "dj" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/plasteel/dark,/area/mine/maintenance) "dk" = (/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 1},/turf/simulated/floor/bluegrid,/area/mine/maintenance) -"dl" = (/obj/machinery/mineral/equipment_vendor,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/production) +"dl" = (/obj/machinery/mineral/equipment_vendor/lavaland,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/simulated/floor/plasteel,/area/mine/production) "dm" = (/obj/effect/turf_decal/loading_area,/turf/simulated/floor/plasteel,/area/mine/production) "dn" = (/obj/effect/turf_decal/loading_area{dir = 4},/turf/simulated/floor/plasteel,/area/mine/production) "do" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"},/turf/simulated/floor/plating,/area/mine/living_quarters) @@ -272,7 +272,7 @@ "fl" = (/obj/effect/turf_decal/loading_area{dir = 8},/turf/simulated/floor/plasteel,/area/mine/production) "fm" = (/obj/machinery/conveyor{dir = 8; id = "mining_internal"},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/simulated/floor/plating,/area/mine/production) "fn" = (/obj/machinery/conveyor{dir = 10; id = "mining_internal"},/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/stripes/corner{dir = 1},/turf/simulated/floor/plating,/area/mine/production) -"fo" = (/obj/machinery/mineral/equipment_vendor,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/simulated/floor/plasteel,/area/mine/living_quarters) +"fo" = (/obj/machinery/mineral/equipment_vendor/lavaland,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/simulated/floor/plasteel,/area/mine/living_quarters) "fp" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/plasteel,/area/mine/living_quarters) "fq" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/simulated/floor/plating/airless/catwalk{layer = 2.2},/area/lavaland/surface/outdoors) "fr" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/carpet,/area/mine/living_quarters) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index e5232343936..54b48082bf0 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -773,6 +773,6 @@ /obj/item/storage/bag/plants, /obj/item/stack/marker_beacon) -/obj/item/storage/belt/bluespace/sandbox/New() +/obj/item/storage/belt/mining/New() ..() new /obj/item/survivalcapsule(src) \ No newline at end of file diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index f0c942f08b1..cf5d3c2b054 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -671,7 +671,7 @@ . = ..() if(istype(AM, /obj/item/card/id) && proximity) var/obj/item/card/id/I = AM - access=list(access_mining, access_mining_station, access_mineral_storeroom, access_cargo) + I.access |= list(access_mining, access_mining_station, access_mineral_storeroom, access_cargo) to_chat(user, "You upgrade [I] with mining access.") qdel(src)