cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes fire alarms going off when not detecting and keycards (#18875)

Browse Source 
* Fixes #18874

Fixes fire alarms going off when not detecting if fire is on the turf

* Fixes keycard authenticators from giving infinite frames

Fixes #18873
This commit is contained in:
Cameron Lennox
2025-12-09 23:17:18 +01:00
committed by GitHub
parent bf0ac8d376
commit 48833342fc
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/kitchen/cooking_machines/_appliance.dm
+5 -3
View File
@@ -655,9 +655,11 @@
smoke.start()
// Set off fire alarms!
var/obj/machinery/firealarm/FA = locate() in get_area(src)
if(FA)
FA.alarm()
var/area/area_to_check = get_area(src)
for(var/obj/machinery/firealarm/FA in area_to_check.get_contents())
if(FA && FA.detecting)
FA.alarm()
break
/obj/machinery/appliance/attack_hand(var/mob/user)
if(..())
code/modules/security levels/keycard authentication.dm
+27 -23
View File
@@ -23,13 +23,39 @@
power_channel = ENVIRON
/obj/machinery/keycard_auth/attack_ai(mob/user)
to_chat (user, span_warning("A firewall prevents you from interfacing with this device!"))
to_chat(user, span_warning("A firewall prevents you from interfacing with this device!"))
return
/obj/machinery/keycard_auth/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_SCREWDRIVER))
to_chat(user, "You begin removing the faceplate from the [src]")
playsound(src, W.usesound, 50, 1)
if(do_after(user, 1 SECOND * W.toolspeed, target = src))
to_chat(user, "You remove the faceplate from the [src]")
var/obj/structure/frame/A = new /obj/structure/frame(loc)
A.circuit = circuit
A.frame_type = circuit.board_type
circuit = null
A.need_circuit = FALSE
A.pixel_x = pixel_x
A.pixel_y = pixel_y
A.set_dir(dir)
A.anchored = TRUE
for(var/obj/C in src)
if(istype(C, /obj/item/circuitboard))
C.forceMove(A)
continue
C.forceMove(loc)
A.forensic_data = forensic_data //carry crime data over.
A.state = FRAME_WIRED
A.update_icon()
qdel(src)
return
if(stat & (NOPOWER|BROKEN))
to_chat(user, "This device is not powered.")
return
if(istype(W,/obj/item/card/id))
var/obj/item/card/id/ID = W
if(ACCESS_KEYCARD_AUTH in ID.GetAccess())
@@ -42,28 +68,6 @@
event_triggered_by = user
broadcast_request(user) //This is the device making the initial event request. It needs to broadcast to other devices
if(W.has_tool_quality(TOOL_SCREWDRIVER))
to_chat(user, "You begin removing the faceplate from the [src]")
playsound(src, W.usesound, 50, 1)
if(do_after(user, 1 SECOND * W.toolspeed, target = src))
to_chat(user, "You remove the faceplate from the [src]")
var/obj/structure/frame/A = new /obj/structure/frame(loc)
var/obj/item/circuitboard/M = new circuit(A)
A.frame_type = M.board_type
A.need_circuit = 0
A.pixel_x = pixel_x
A.pixel_y = pixel_y
A.set_dir(dir)
A.circuit = M
A.anchored = TRUE
for (var/obj/C in src)
C.forceMove(loc)
A.state = 3
A.update_icon()
M.deconstruct(src)
qdel(src)
return
/obj/machinery/keycard_auth/power_change()
..()
if(stat &NOPOWER)