From 121a8f78e078157ccb81717e5d585659611ed804 Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Thu, 6 Sep 2012 00:03:23 +0000 Subject: [PATCH] Fixes issue 836 - Bomb admin logs now tell what type of device (if any) was attached to the bomb Fixes issue 873 - Fat people can now use their slots properly (thanks to erro for pointing out the cause of the bug) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4630 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items.dm | 11 ++++++----- code/game/objects/items/devices/transfer_valve.dm | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9bd96fb50ca..0bf16666a79 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -360,11 +360,12 @@ //START HUMAN var/mob/living/carbon/human/H = M - if(FAT in H.mutations) - if(!(flags & ONESIZEFITSALL)) - if(!disable_warning) - H << "\red You're too fat to wear the [name]." - return 0 + if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit)) + if(FAT in H.mutations) + if(!(flags & ONESIZEFITSALL)) + if(!disable_warning) + H << "\red You're too fat to wear the [name]." + return 0 switch(slot) if(slot_l_hand) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index d906c6bd881..05705c3a357 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -157,7 +157,7 @@ valve_open = 1 var/turf/bombturf = get_turf(src) var/bombarea = bombturf.loc.name - var/log_str = "Bomb valve opened in [bombarea] with device attacher: [attacher]. Last touched by: [src.fingerprintslast]" + var/log_str = "Bomb valve opened in [bombarea] with [attached_device ? attached_device : "no device"] attacher: [attacher]. Last touched by: [src.fingerprintslast]" bombers += log_str message_admins(log_str) log_game(log_str)