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

Merge pull request #15669 from SandPoot/sneak-100

Browse Source 
Fix strip_mod and strip_silence
This commit is contained in:
deathride58
2022-06-11 01:04:13 -04:00
committed by GitHub
parent 2cf0fbea9a 884fcc46c8
commit 0a60a4bcbc
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/strippable.dm
+18 -7
View File
@@ -136,13 +136,19 @@
if (isnull(item))
return FALSE
source.visible_message(
span_warning("[user] tries to remove [source]'s [item.name]."),
span_userdanger("[user] tries to remove your [item.name]."),
ignored_mobs = user,
)
var/strip_silence
var/obj/item/clothing/gloves/gloves = user.get_item_by_slot(ITEM_SLOT_GLOVES)
if(istype(gloves))
strip_silence = gloves.strip_silence
to_chat(user, span_danger("You try to remove [source]'s [item]..."))
if(!strip_silence)
source.visible_message(
span_warning("[user] tries to remove [source]'s [item.name]."),
span_userdanger("[user] tries to remove your [item.name]."),
ignored_mobs = user,
)
to_chat(user, strip_silence ? span_danger("You try to remove [source]'s [item]...") : span_notice("You try to remove [source]'s [item]..."))
user.log_message("[key_name(source)] is being stripped of [item] by [key_name(user)]", LOG_ATTACK, color="red")
source.log_message("[key_name(source)] is being stripped of [item] by [key_name(user)]", LOG_VICTIM, color="red", log_globally=FALSE)
item.add_fingerprint(source)
@@ -284,7 +290,12 @@
/// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob.
/proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay)
if (!do_mob(user, source, strip_delay || item.strip_delay, ignorehelditem = TRUE))
var/strip_mod = 1
var/obj/item/clothing/gloves/gloves = user.get_item_by_slot(ITEM_SLOT_GLOVES)
if(istype(gloves))
strip_mod = gloves.strip_mod
if (!do_mob(user, source, (strip_delay || item.strip_delay) / strip_mod, ignorehelditem = TRUE))
return FALSE
return TRUE