Revert "Refactored, simplified access system a bit. Tested, for once."

This reverts commit a5e65d9b2b.
This commit is contained in:
ZomgPonies
2014-05-20 20:58:23 -04:00
parent 8b85002a24
commit 69725d9466
6 changed files with 55 additions and 71 deletions
@@ -24,7 +24,6 @@
var/atom/movable/following = null
var/medHUD = 0
/mob/dead/observer/New(var/mob/body=null, var/flags=1)
sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
see_invisible = SEE_INVISIBLE_OBSERVER
@@ -1531,14 +1531,3 @@
M.apply_damage(50,BRUTE)
if(M.stat == 2)
M.gib()
// Get ALL accesses available.
/mob/living/carbon/human/GetAccess()
var/list/ACL=list()
var/obj/item/I = get_active_hand()
if(istype(I))
ACL |= I.GetAccess()
if(wear_id)
ACL |= wear_id.GetAccess()
return ACL
@@ -497,10 +497,3 @@
if(!ticker.mode.name == "monkey") return 0
return 1
// Get ALL accesses available.
/mob/living/carbon/monkey/GetAccess()
var/list/ACL=list()
var/obj/item/I = get_active_hand()
if(istype(I))
ACL |= I.GetAccess()
return ACL
+1 -6
View File
@@ -11,12 +11,6 @@
var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
/mob/living/silicon/hasFullAccess()
return 1
/mob/living/silicon/GetAccess()
return get_all_accesses()
/mob/living/silicon/proc/cancelAlarm()
return
@@ -188,6 +182,7 @@
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
// This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
/mob/living/silicon/Stat()
..()
+1 -9
View File
@@ -1204,12 +1204,4 @@ mob/proc/yank_out_object()
if(host)
host.ckey = src.ckey
host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
// Mobs tell access what access levels it has.
/mob/proc/GetAccess()
return list()
// Skip over all the complex list checks.
/mob/proc/hasFullAccess()
return 0
host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"