mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 05:51:56 +01:00
Remove holder access (#1906)
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:
@@ -15,9 +15,9 @@
|
||||
/datum/controller/process/scheduler/doWork()
|
||||
while (head && !PSCHED_CHECK_TICK)
|
||||
if (head.destroyed)
|
||||
head.kill()
|
||||
head = head.next
|
||||
tasks -= head
|
||||
head.kill()
|
||||
continue
|
||||
if (head.trigger_time >= world.time)
|
||||
return // Nothing after this will be ready to fire.
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user