Skip to content

Commit

Permalink
Merge pull request #5932 from Trilbyspaceclone/misc_map_fixes
Browse files Browse the repository at this point in the history
fixes a light switch and extra air alarm
  • Loading branch information
Trilbyspaceclone authored Jan 22, 2025
2 parents 18c9f97 + 6b0dc94 commit 6937009
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions maps/__Nadezhda/map/_Nadezhda_Colony.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2499,9 +2499,6 @@
/obj/item/ammo_magazine/rifle_75,
/obj/item/ammo_magazine/rifle_75,
/obj/item/ammo_magazine/rifle_75,
/obj/machinery/light_switch{
pixel_y = 32
},
/turf/simulated/floor/tiled/dark/gray_platform,
/area/nadezhda/command/armory)
"azl" = (
Expand Down Expand Up @@ -8456,13 +8453,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/steel,
/area/nadezhda/rnd/xenobiology/xenoflora)
"bGn" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 32
},
/turf/simulated/wall,
/area/nadezhda/maintenance/undergroundfloor2west)
"bGq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
Expand Down Expand Up @@ -71278,19 +71268,28 @@
/obj/machinery/button/remote/airlock{
id = "psychcell3";
name = "Cell 3 Door Bolts";
pixel_y = -5
pixel_y = -5;
specialfunctions = 4;
req_one_access = list(5,45);
req_access = newlist()
},
/obj/machinery/button/remote/airlock{
id = "psychcell2";
name = "Cell 2 Door Bolts";
pixel_x = 6;
pixel_y = 6
pixel_y = 6;
specialfunctions = 4;
req_one_access = list(5,45);
req_access = newlist()
},
/obj/machinery/button/remote/airlock{
id = "psychcell1";
name = "Cell 1 Door Bolts";
pixel_x = -6;
pixel_y = 6
pixel_y = 6;
specialfunctions = 4;
req_one_access = list(5,45);
req_access = newlist()
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/white,
Expand Down Expand Up @@ -83753,6 +83752,9 @@
/obj/item/ammo_magazine/smg_35,
/obj/item/ammo_magazine/smg_35,
/obj/random/pouch/low_chance,
/obj/machinery/light_switch{
pixel_y = 32
},
/turf/simulated/floor/tiled/dark/gray_platform,
/area/nadezhda/command/armory)
"pSz" = (
Expand Down Expand Up @@ -179263,7 +179265,7 @@ tvc
tvc
tvc
tvc
bGn
tvc
tvc
tvc
tvc
Expand Down

0 comments on commit 6937009

Please sign in to comment.