From e83fada8c118d621f46923d0f28767f8e8581d92 Mon Sep 17 00:00:00 2001 From: Giacomand Date: Thu, 6 Jun 2013 08:17:53 +0100 Subject: [PATCH 1/3] Emptying someone's pockets won't display a message anymore. This allows people to pickpocket if their victim stands still long enough. --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- html/changelog.html | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 67242b6527e..5e94d2aab9f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -481,8 +481,8 @@ //strip panel if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr)) if(href_list["pockets"]) - visible_message("[usr] tries to empty [src]'s pockets.", \ - "[usr] tries to empty [src]'s pockets.") + //visible_message("[usr] tries to empty [src]'s pockets.", \ + "[usr] tries to empty [src]'s pockets.") // Pickpocketing! if(do_mob(usr, src, STRIP_DELAY * 0.5)) u_equip(r_store) u_equip(l_store) diff --git a/html/changelog.html b/html/changelog.html index ead9bb503ce..9b9e9af221c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -51,7 +51,17 @@ should be listed in the changelog upon commit tho. Thanks. --> - + + +
+

6 June 2013

+

Giacom updated:

+ +
+ +

25 May 2013

Ikarrus updated:

From 8fee615d85d3617a389cc5a61c60d6e2e851db32 Mon Sep 17 00:00:00 2001 From: Giacomand Date: Thu, 6 Jun 2013 14:15:19 +0100 Subject: [PATCH 2/3] * Added a message to the user. --- code/modules/mob/living/carbon/human/human.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5e94d2aab9f..1b69c8cc308 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -483,6 +483,7 @@ if(href_list["pockets"]) //visible_message("[usr] tries to empty [src]'s pockets.", \ "[usr] tries to empty [src]'s pockets.") // Pickpocketing! + usr << "You try to empty [src]'s pockets." if(do_mob(usr, src, STRIP_DELAY * 0.5)) u_equip(r_store) u_equip(l_store) From be550b196ef5b46a30bbbfe64b8c0ee3a97b1531 Mon Sep 17 00:00:00 2001 From: Giacomand Date: Thu, 6 Jun 2013 18:01:14 +0100 Subject: [PATCH 3/3] The victim will now get a message if the user empties their pockets and gets interrupted. (Victim moving, user being stunned, etc..) --- code/modules/mob/living/carbon/human/human.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1b69c8cc308..5bb52636b7c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -487,6 +487,9 @@ if(do_mob(usr, src, STRIP_DELAY * 0.5)) u_equip(r_store) u_equip(l_store) + else + // Display a warning if the user mocks up + src << "You feel your pockets being fumbled with!" if(href_list["criminal"]) if(istype(usr, /mob/living/carbon/human))