shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upload files

Browse Source
This commit is contained in:
SandPoot
2022-02-25 16:58:09 -03:00
parent 87d30e1a4f
commit 5029af901b
206 changed files with 782 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/neck/_neck.dm
+2 -2
View File
@@ -226,7 +226,7 @@
return
/obj/item/clothing/neck/petcollar/locked/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(loc == user && user.get_item_by_slot(SLOT_NECK) && lock != FALSE)
if(loc == user && user.get_item_by_slot(ITEM_SLOT_NECK) && lock != FALSE)
to_chat(user, "<span class='warning'>The collar is locked! You'll need unlock the collar before you can take it off!</span>")
return
..()
@@ -323,7 +323,7 @@
. = ..()
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.get_item_by_slot(SLOT_NECK) == src)
if(C.get_item_by_slot(ITEM_SLOT_NECK) == src)
to_chat(user, "<span class='warning'>You can't untie [src] while wearing it!</span>")
return
if(user.is_holding(src))