mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-24 00:51:46 +00:00
Merge pull request #5965 from Mechoid/Organs_Remove_Verbs_Properly
Fix Organs not removing their verbs properly.
This commit is contained in:
@@ -428,7 +428,7 @@ var/list/organ_cache = list()
|
||||
all_organs |= owner.internal_organs
|
||||
|
||||
for(var/obj/item/organ/O in all_organs)
|
||||
if(O.status & ORGAN_DEAD && O.organ_verbs)
|
||||
if(!(O.status & ORGAN_DEAD) && O.organ_verbs)
|
||||
for(var/verb_type in O.organ_verbs)
|
||||
if(verb_type in organ_verbs)
|
||||
save_verbs |= verb_type
|
||||
@@ -438,7 +438,8 @@ var/list/organ_cache = list()
|
||||
owner.verbs |= verb_path
|
||||
else if(organ_verbs)
|
||||
for(var/verb_path in organ_verbs)
|
||||
owner.verbs -= verb_path
|
||||
if(!(verb_path in save_verbs))
|
||||
owner.verbs -= verb_path
|
||||
return
|
||||
|
||||
/obj/item/organ/proc/handle_organ_proc_special() // Called when processed.
|
||||
|
||||
Reference in New Issue
Block a user