cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into travis-cleanup

Browse Source
This commit is contained in:
AffectedArc07
2020-04-23 15:43:24 +01:00
parent 218807afd4 dcee2df0ac
commit a09dbeb473
10 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -594,7 +594,7 @@
toggle_ai(initial(AIStatus))
/mob/living/simple_animal/proc/add_collar(obj/item/clothing/accessory/petcollar/P, mob/user)
if(QDELETED(P) || pcollar)
if(!istype(P) || QDELETED(P) || pcollar)
return
if(user && !user.unEquip(P))
return