From ac1a7ad6e2d47446ce4a609439b930aca1da23d9 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 4 Jul 2014 03:00:42 -0400 Subject: [PATCH 1/4] Fixes air alarms not updating when area changes alert status --- code/game/area/areas.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 29da2043387..31f3f0cb97b 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -87,6 +87,8 @@ for(var/area/RA in related) for(var/obj/machinery/camera/C in RA) C.network.Remove("Atmosphere Alarms") + for (var/obj/machinery/alarm/AA in RA) + AA.update_icon() for(var/mob/living/silicon/aiPlayer in player_list) aiPlayer.cancelAlarm("Atmosphere", src, src) for(var/obj/machinery/computer/station_alert/a in machines) @@ -99,6 +101,8 @@ for(var/obj/machinery/camera/C in RA) cameras += C C.network.Add("Atmosphere Alarms") + for (var/obj/machinery/alarm/AA in RA) + AA.update_icon() for(var/mob/living/silicon/aiPlayer in player_list) aiPlayer.triggerAlarm("Atmosphere", src, cameras, src) for(var/obj/machinery/computer/station_alert/a in machines) From 25ec90ba268ca94d2ef4212fe9e58044b6144ee2 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Fri, 4 Jul 2014 17:54:25 +0100 Subject: [PATCH 2/4] mob: fix a movement issue Signed-off-by: Mloc-Argent --- code/modules/mob/mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 2b0d1b2c019..e18b44a2bd7 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -780,7 +780,7 @@ note dizziness decrements automatically in the mob's Life() proc. lying = 0 else if (!buckled) lying = !can_stand - //canmove = has_limbs + canmove = has_limbs if(lying) density = 0 From 65b5126147e841caf35d91e702b96265c0069b51 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Fri, 4 Jul 2014 21:36:23 +0200 Subject: [PATCH 3/4] fixes computers eating cards this commit : https://github.com/Baystation12/Baystation12/commit/ea1060ac339c4b4ef1692f446865926cf262dd68 added in machinery's attack_hand() proc, line 238 ``` if(!allowed(user)) user << "\red Access Denied." return 1 ``` to almost all machinery including computers, since they call this proc via their attack_hand() procs. allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id, NOT the card inside the machine, as different machines have different vars and systems handling how they can be accessed. instead of fixing the underlying problem, eject card verbs were added like this one : https://github.com/Baystation12/Baystation12/commit/30385c22371a4e47ac43eac2fc953f7f8854fad4 this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs. --- code/game/machinery/machinery.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 7e5599bff04..e13147f5fb2 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -235,10 +235,6 @@ Class Procs: src.add_fingerprint(user) - if(!allowed(user)) - user << "\red Access Denied." - return 1 - var/area/A = get_area(src) A.master.powerupdate = 1 @@ -286,4 +282,4 @@ Class Procs: I.crit_fail = 1 I.loc = loc del(src) - return 1 \ No newline at end of file + return 1 From 3e95ad9786bca855a2ff26537adc59deac83be03 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Fri, 4 Jul 2014 21:38:39 +0200 Subject: [PATCH 4/4] adds shuttle_control access check to proper place --- code/modules/shuttles/shuttle_console.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 550c667b10b..5b13f0e66b1 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -12,7 +12,10 @@ if(..(user)) return //src.add_fingerprint(user) //shouldn't need fingerprints just for looking at it. - + if(!allowed(user)) + user << "\red Access Denied." + return 1 + ui_interact(user) /obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)