cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update air_alarm.dm

Browse Source
This commit is contained in:
Razgriz
2021-07-03 16:55:14 -07:00
committed by GitHub
parent ca63950725
commit 394da8e205
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/air_alarm.dm
View File

@@ -27,16 +27,8 @@
/obj/machinery/alarm /obj/machinery/alarm
name = "alarm" name = "alarm"
desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area." desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area."
<<<<<<< HEAD
icon = 'icons/obj/monitors_vr.dmi' //CHOMPEdit: Continues using new air alarm sprite, contrary to YW
icon_state = "alarm0"
||||||| parent of 6b49911ada... Merge pull request #10842 from VOREStation/Arokha/moreglow
icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - Other icons
icon_state = "alarm0"
=======
icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - Other icons icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - Other icons
icon_state = "alarm_0" icon_state = "alarm_0"
>>>>>>> 6b49911ada... Merge pull request #10842 from VOREStation/Arokha/moreglow
layer = ABOVE_WINDOW_LAYER layer = ABOVE_WINDOW_LAYER
vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature
anchored = 1 anchored = 1