From 14f3bc752911e9c28804a204b6458efade531825 Mon Sep 17 00:00:00 2001 From: Bone White Date: Sat, 9 Aug 2014 17:45:31 +0100 Subject: [PATCH] Added pda to strip menu PDAs can be stripped off or placed on a uniform now without having to remove the uniform. --- code/modules/mob/living/carbon/human/human.dm | 1 + code/modules/mob/living/carbon/human/inventory.dm | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3793d712ccd..4526189e112 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -460,6 +460,7 @@
(Exo)Suit: [(wear_suit ? wear_suit : "Nothing")]
Back: [(back ? back : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank) && !( internal )) ? text(" Set Internal", src) : "")]
ID: [(wear_id ? wear_id : "Nothing")] +
PDA: [(wear_pda ? wear_pda : "Nothing")]
Suit Storage: [(s_store ? s_store : "Nothing")]
[(handcuffed ? text("Handcuffed") : text("Not Handcuffed"))]
[(legcuffed ? text("Legcuffed") : text(""))] diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 46502b76e15..122d27c2ea4 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -568,6 +568,10 @@ message = "\red [source] is trying to take off [target.wear_id] from [target]'s uniform!" else source << "\blue You try to take off [target.wear_id] from [target]'s uniform!" + if("pda") + target.attack_log += text("\[[time_stamp()]\] Has had their PDA ([target.wear_pda]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) PDA ([target.wear_pda])") + message = "\red [source] is trying to take off [target.wear_pda] from [target]'s uniform!" if("internal") target.attack_log += text("\[[time_stamp()]\] Has had their internals toggled by [source.name] ([source.ckey])") source.attack_log += text("\[[time_stamp()]\] Attempted to toggle [target.name]'s ([target.ckey]) internals") @@ -683,7 +687,7 @@ It can still be worn/put on as normal. slot_to_process = slot_back if (target.back) strip_item = target.back - if("handcuff") + if("handcuff") slot_to_process = slot_handcuffed if (target.handcuffed) strip_item = target.handcuffed