cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

Browse Source 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
This commit is contained in:
bgobandit
2016-05-18 03:13:37 -04:00
parent eaf93e34cd 5c5e671c57
commit b94ce1968b
72 changed files with 3039 additions and 2958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+1 -1
View File
@@ -301,7 +301,7 @@ MASS SPECTROMETER
else
user << "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>"
if(bz_concentration > 0.005)
if(bz_concentration > 0.01)
user << "<span class='alert'>Hallucinogen: [round(plasma_concentration*100, 0.01)] %</span>"
else
user << "<span class='info'>Hallucinogen: [round(plasma_concentration*100, 0.01)] %</span>"
code/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -72,7 +72,7 @@ effective or pretty fucking useless.
name = "health analyzer"
icon_state = "health"
item_state = "analyzer"
desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3