Skip to content

Commit 5305f85

Browse files
authored
Alarm fixes, minor map changes (#47)
1 parent 341e3d4 commit 5305f85

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

code/modules/supermatter/supermatter.dm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,6 @@ obj/machinery/power/supermatter/Destroy()
296296
var/turf/T = get_turf(M)
297297
if(T && (T.z in GLOB.using_map.station_levels) && !istype(M,/mob/new_player) && !isdeaf(M))
298298
sound_to(M, 'sound/misc/alert24.mp3')
299-
spawn(2 SECONDS)
300-
sound_to(M, 'sound/misc/alert24.mp3')
301-
spawn(2 SECONDS)
302-
sound_to(M, 'sound/misc/alert24.mp3')
303-
spawn(2 SECONDS)
304-
sound_to(M, 'sound/misc/alert24.mp3')
305-
spawn(2 SECONDS)
306-
sound_to(M, 'sound/misc/alert24.mp3')
307299

308300
if(damage > emergency_point)
309301
alert_msg = emergency_alert + alert_msg

maps/torch/torch6_bridge.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10282,9 +10282,9 @@
1028210282
"wE" = (
1028310283
/obj/structure/sign/double/icarus/solgovflag/right{
1028410284
dir = 1;
10285+
pixel_y = -32;
1028510286
pixel_z = -32
1028610287
},
10287-
/obj/machinery/photocopier,
1028810288
/turf/simulated/floor/carpet/blue2,
1028910289
/area/crew_quarters/heads/office/sgr)
1029010290
"wG" = (
@@ -29026,7 +29026,7 @@ hV
2902629026
eP
2902729027
jy
2902829028
hn
29029-
HC
29029+
hn
2903029030
hn
2903129031
dW
2903229032
eP

sound/misc/alert24.mp3

86.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)