cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove holder access (#1906)

Browse Source 
changes:

Mob holders no longer grant that mob's access.
Fix bug where wrong task was killed on invalid head in scheduler.
Fixes #1785
This commit is contained in:
Lohikar
2017-03-12 12:18:09 +02:00
committed by skull132
parent a337279c86
commit 7cc68feeb4
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/holder.dm
+1 -14
View File
@@ -36,23 +36,10 @@ var/list/holder_mob_icon_cache = list()
if (contained)
contained.examine(user)
/obj/item/weapon/holder/GetID()
for(var/mob/M in contents)
var/obj/item/I = M.GetIdCard()
if(I)
return I
return null
/obj/item/weapon/holder/GetAccess()
var/obj/item/I = GetID()
return I ? I.GetAccess() : ..()
/obj/item/weapon/holder/attack_self()
for(var/mob/M in contents)
M.show_inv(usr)
//Mob specific holders.
/obj/item/weapon/holder/diona
origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5)
@@ -573,4 +560,4 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/pai/rabbit
icon_state = "rabbit_rest"
item_state = "rabbit"
item_state = "rabbit"