From 8ae9dfd947a0917067db689a2c358922e5e62e19 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Sun, 25 Nov 2012 04:01:54 +0000 Subject: [PATCH] Removed the MASKINTERNALS from /obj/item/clothing/mask flags. There is no reason for -every- mask to act as internals. Added an issilicon() check to the PDA's remove id/pen verbs so that the AI can no longer be rendered helpless if they happen to click the 'Remove Pen' verb. Fixes issue 1124. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5186 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/devices/PDA/PDA.dm | 6 ++++++ code/modules/clothing/clothing.dm | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index b7cc8fd9fe2..7721c6f7c02 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -782,6 +782,9 @@ var/global/list/obj/item/device/pda/PDAs = list() set name = "Remove id" set src in usr + if(issilicon(usr)) + return + if ( !(usr.stat || usr.restrained()) ) if(id) remove_id() @@ -796,6 +799,9 @@ var/global/list/obj/item/device/pda/PDAs = list() set name = "Remove pen" set src in usr + if(issilicon(usr)) + return + if ( !(usr.stat || usr.restrained()) ) var/obj/item/weapon/pen/O = locate() in src if(O) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a623a8500a6..bce450f3b7b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -70,7 +70,6 @@ BLIND // can't see anything icon = 'icons/obj/clothing/masks.dmi' body_parts_covered = HEAD slot_flags = SLOT_MASK - flags = MASKINTERNALS //Shoes /obj/item/clothing/shoes