cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make air alarms start with the correct default state when placing the… (#21635)

Browse Source 
* Make air alarms start with the correct default state when placing the frame

* Update code/game/objects/items/mountable_frames/air_alarm_frame.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* undefs to allow CI passing

* define moment

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
benjicoots
2023-08-12 19:27:42 +01:00
committed by GitHub
co-authored by Luc S34N
parent 0b5a3e692f
commit cc13c52fed
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/machines.dm
+4
View File
@@ -71,3 +71,7 @@
#define TURRET_PREASSESS_VALID 1
#define TURRET_PREASSESS_INVALID 0
#define AIR_ALARM_FRAME 0
#define AIR_ALARM_UNWIRED 1
#define AIR_ALARM_READY 2
code/game/objects/items/mountable_frames/air_alarm_frame.dm
+3 -1
View File
@@ -14,5 +14,7 @@ Code shamelessly copied from apc_frame
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
/obj/item/mounted/frame/alarm_frame/do_build(turf/on_wall, mob/user)
new /obj/machinery/alarm(get_turf(src), get_dir(on_wall, user), 1)
var/obj/machinery/alarm/A = new/obj/machinery/alarm(get_turf(src), get_dir(on_wall, user), 1)
A.buildstage = AIR_ALARM_FRAME // Set the build stage to the initial state
A.update_icon()
qdel(src)
code/modules/atmospherics/machinery/airalarm.dm
-9
View File
@@ -57,10 +57,6 @@
#define MAX_TEMPERATURE 363.15 // 90C
#define MIN_TEMPERATURE 233.15 // -40C
#define AIR_ALARM_FRAME 0
#define AIR_ALARM_UNWIRED 1
#define AIR_ALARM_READY 2
//all air alarms in area are connected via magic
/area
var/obj/machinery/alarm/master_air_alarm
@@ -1176,8 +1172,3 @@ Just an object used in constructing air alarms
origin_tech = "engineering=2;programming=1"
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
#undef AIR_ALARM_FRAME
#undef AIR_ALARM_UNWIRED
#undef AIR_ALARM_READY