cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pickpocket gloves (#25074)

Browse Source 
* yes this is really how it works

* dies of death

* undo
This commit is contained in:
Contrabang
2024-04-12 18:44:28 +00:00
committed by GitHub
parent d88e03c297
commit f9b23a1029
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_stripping.dm
+12 -8
View File
@@ -42,11 +42,13 @@
var/obj/item/organ/internal/headpocket/pocket = H.get_int_organ(/obj/item/organ/internal/headpocket)
if(!pocket.held_item)
return
user.visible_message("<span class='danger'>[user] is trying to remove something from [source]'s head!</span>",
"<span class='danger'>You start to dislodge whatever's inside [source]'s headpocket!</span>")
if(!in_thief_mode(user))
user.visible_message("<span class='danger'>[user] is trying to remove something from [source]'s head!</span>",
"<span class='danger'>You start to dislodge whatever's inside [source]'s headpocket!</span>")
if(do_mob(user, source, POCKET_STRIP_DELAY))
user.visible_message("<span class='danger'>[user] has dislodged something from [source]'s head!</span>",
"<span class='danger'>You have dislodged everything from [source]'s headpocket!</span>")
if(!in_thief_mode(user))
user.visible_message("<span class='danger'>[user] has dislodged something from [source]'s head!</span>",
"<span class='danger'>You have dislodged everything from [source]'s headpocket!</span>")
pocket.empty_contents()
add_attack_logs(user, source, "Stripped of headpocket items", isLivingSSD(source) ? null : ATKLOG_ALL)
return
@@ -61,8 +63,9 @@
to_chat(user, "You lack the ability to manipulate the lock.")
return
muzzle.visible_message("<span class='danger'>[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name].</span>", \
"<span class='userdanger'>[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name].</span>")
if(!in_thief_mode(user))
muzzle.visible_message("<span class='danger'>[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name].</span>", \
"<span class='userdanger'>[user] tries to [muzzle.locked ? "unlock" : "lock"] [source]'s [muzzle.name].</span>")
if(!do_mob(user, source, POCKET_STRIP_DELAY))
return
@@ -74,8 +77,9 @@
if(!success)
return
muzzle.visible_message("<span class='danger'>[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name].</span>", \
"<span class='userdanger'>[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name].</span>")
if(!in_thief_mode(user))
muzzle.visible_message("<span class='danger'>[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name].</span>", \
"<span class='userdanger'>[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name].</span>")
/datum/strippable_item/mob_item_slot/handcuffs
code/modules/mob/living/carbon/human/human_stripping.dm
-6
View File
@@ -166,12 +166,6 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
/datum/strippable_item/mob_item_slot/pocket/proc/warn_owner(atom/owner)
to_chat(owner, "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>")
/datum/strippable_item/mob_item_slot/pocket/finish_unequip(atom/source, mob/user)
var/obj/item/item = get_item(source)
. = ..()
if(in_thief_mode(user))
INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), item)
/datum/strippable_item/mob_item_slot/pocket/left
key = STRIPPABLE_ITEM_LPOCKET
item_slot = SLOT_HUD_LEFT_STORE