From 65b5126147e841caf35d91e702b96265c0069b51 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Fri, 4 Jul 2014 21:36:23 +0200 Subject: [PATCH] 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 7e5599bff0..e13147f5fb 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