cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofResearchAndPrototypes

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
This commit is contained in:
Kelenius
2015-05-25 20:35:46 +03:00
parent 5be2bd6a1b b934258adc
commit ea12fc664f
113 changed files with 2503 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+1 -1
View File
@@ -93,7 +93,7 @@ REAGENT SCANNER
return
user.visible_message("<span class='notice'> [user] has analyzed [M]'s vitals.","<span class='notice'> You have analyzed [M]'s vitals.")
if (!istype(M, /mob/living/carbon) || (ishuman(M) && (M:species.flags & IS_SYNTHETIC)))
if (!istype(M, /mob/living/carbon) || ishuman(M))
//these sensors are designed for organic life
user.show_message("\blue Analyzing Results for ERROR:\n\t Overall Status: ERROR")
user.show_message("\t Key: <font color='blue'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font>", 1)