cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 15:47:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix

Browse Source 
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
This commit is contained in:
Mloc
2013-11-23 04:02:40 -08:00
parent 0f4c5d9200 e00c6ae21e
commit c5cd3562e3
2 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+9 -1
View File
@@ -296,6 +296,14 @@
if(armor >= 2) return
/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
for(var/L in M.contents)
if(istype(L, /obj/item/weapon/implant/loyalty))
for(var/datum/organ/external/O in M.organs)
if(L in O.implants)
return 1
return 0
/mob/living/carbon/human/attack_slime(mob/living/carbon/slime/M as mob)
if(M.Victim) return // can't attack while eating!
@@ -1257,4 +1265,4 @@ mob/living/carbon/human/yank_out_object()
if(species)
return 1
else
return 0
return 0