Merge pull request #725 from Erthilo/master

New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
This commit is contained in:
CIB
2012-03-21 13:00:31 -07:00
15 changed files with 3272 additions and 3225 deletions
+7 -4
View File
@@ -308,10 +308,13 @@ proc/analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob)
user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1)
if (M.virus2 || M.reagents.reagent_list.len > 0)
user.show_message(text("\red Unknown substance detected in blood."), 1)
/* for(var/datum/organ/external/E in src)
if (!E.broken <= 0)
user.show_message(text("\red Bone fractures detected."), 1)*/
//If someone can make this work I would be extremely grateful. -Erthilo
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
for(var/name in H.organs)
var/datum/organ/external/e = H.organs[name]
if(e.broken)
user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1)
break
return
/obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob)
+18
View File
@@ -392,4 +392,22 @@ THERMAL GLASSES
M.disabilities &= ~1
..()
/obj/item/clothing/head/helmet/space/rig/engspace_helmet/attack_self()
toggle()
/obj/item/clothing/head/helmet/space/rig/engspace_helmet/verb/toggle()
set category = "Object"
set name = "Toggle Helmet Visor"
if(src.up)
src.up = !src.up
src.see_face = !src.see_face
src.flags |= HEADCOVERSEYES
icon_state = "engspace_helmet"
usr << "You toggle the reflective tint on."
else
src.up = !src.up
src.see_face = !src.see_face
src.flags &= ~HEADCOVERSEYES
icon_state = "engspace_helmet_clear"
usr << "You toggle the reflective tint off."
usr.update_clothing()