Skip to content

Commit

Permalink
Adjusts Alarms on Shuttles
Browse files Browse the repository at this point in the history
  • Loading branch information
@Captain277
Captain277 committed Nov 8, 2023
1 parent 366c16f commit c062043
Show file tree
Hide file tree
Showing 3 changed files with 228 additions and 238 deletions.
40 changes: 18 additions & 22 deletions maps/templates/shuttles/overmaps/generic/curashuttle.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@
/obj/machinery/computer/ship/sensors{
dir = 4
},
/obj/machinery/firealarm{
dir = 8;
pixel_x = -29
},
/obj/machinery/light{
dir = 8
},
/obj/machinery/firealarm/alarms_hidden{
dir = 8;
pixel_x = -26
},
/turf/simulated/floor/carpet/bcarpet,
/area/shuttle/curabitur/curashuttle/cockpit)
"aF" = (
Expand Down Expand Up @@ -599,16 +599,15 @@
/area/shuttle/curabitur/curashuttle/med)
"bi" = (
/obj/machinery/suit_cycler/medical,
/obj/machinery/air_alarm{
pixel_y = 25
/obj/machinery/light{
dir = 1
},
/obj/machinery/firealarm{
dir = 4;
layer = 3.3;
/obj/machinery/air_alarm/alarms_hidden{
pixel_y = 26
},
/obj/machinery/light{
dir = 1
/obj/machinery/firealarm{
dir = 4;
pixel_x = 26
},
/turf/simulated/floor/tiled,
/area/shuttle/curabitur/curashuttle/med)
Expand Down Expand Up @@ -985,11 +984,6 @@
/area/shuttle/curabitur/curashuttle/hangar)
"bT" = (
/obj/structure/handrail,
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_y = 28
},
/obj/structure/cable{
icon_state = "0-8"
},
Expand All @@ -999,6 +993,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
/obj/machinery/power/apc/alarms_hidden/north_bump,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/curabitur/curashuttle/eng)
"bU" = (
Expand Down Expand Up @@ -1247,6 +1242,10 @@
/obj/machinery/computer/ship/engines{
dir = 1
},
/obj/machinery/air_alarm/alarms_hidden{
dir = 1;
pixel_y = -26
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/curabitur/curashuttle/eng)
"cy" = (
Expand All @@ -1263,20 +1262,17 @@
/area/shuttle/curabitur/curashuttle/med)
"cA" = (
/obj/structure/cable,
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -28
},
/obj/structure/handrail{
dir = 1
},
/obj/machinery/power/apc/alarms_hidden/south_bump,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/curabitur/curashuttle/hangar)
"cB" = (
/obj/machinery/light,
/obj/machinery/air_alarm{
/obj/machinery/air_alarm/alarms_hidden{
dir = 1;
pixel_y = -32
pixel_y = -26
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/curabitur/curashuttle/hangar)
Expand Down
64 changes: 29 additions & 35 deletions maps/templates/shuttles/overmaps/generic/mercship.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/plating,
/area/ship/mercenary/engine1)
Expand Down Expand Up @@ -520,9 +519,8 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/barracks)
Expand Down Expand Up @@ -604,9 +602,8 @@
/obj/machinery/button/remote/blast_door{
id = "mercblast"
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/bridge)
Expand Down Expand Up @@ -1305,9 +1302,9 @@
/area/ship/mercenary/hangar)
"cL" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/med1)
Expand Down Expand Up @@ -2089,12 +2086,11 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 9
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
},
/obj/fiftyspawner/uranium,
/obj/fiftyspawner/uranium,
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/engineeringcntrl)
"ep" = (
Expand Down Expand Up @@ -2650,9 +2646,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/plating,
/area/ship/mercenary/engine)
Expand Down Expand Up @@ -2696,9 +2692,9 @@
dir = 9
},
/obj/machinery/meter,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/atmos)
Expand Down Expand Up @@ -3232,9 +3228,8 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/hall2)
Expand Down Expand Up @@ -3357,9 +3352,9 @@
dir = 8
},
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/hall1)
Expand All @@ -3379,9 +3374,9 @@
dir = 4
},
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/white,
/area/ship/mercenary/fighter)
Expand Down Expand Up @@ -3429,9 +3424,8 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
/obj/machinery/firealarm/alarms_hidden{
pixel_y = 23
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/engineering)
Expand Down Expand Up @@ -3465,9 +3459,9 @@
dir = 5
},
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/white,
/area/ship/mercenary/armoury)
Expand Down Expand Up @@ -3621,9 +3615,9 @@
/area/ship/mercenary/engineering)
"hp" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/hangar)
Expand Down Expand Up @@ -3749,9 +3743,9 @@
icon_state = "4-8"
},
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/firealarm{
/obj/machinery/firealarm/alarms_hidden{
dir = 1;
pixel_y = -24
pixel_y = -26
},
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/med)
Expand Down
Loading

0 comments on commit c062043

Please sign in to comment.