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
This commit is contained in:
quartz235@gmail.com
2012-09-06 00:03:23 +00:00
parent 6117b5d02f
commit 121a8f78e0
2 changed files with 7 additions and 6 deletions
+6 -5
View File
@@ -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)
@@ -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)