cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and small modifications mostly. Nothing too important.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1852 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-07-14 22:55:39 +00:00
parent f2eddf2e62
commit 01c8b11a97
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/PDA.dm
+2 -1
View File
@@ -691,7 +691,8 @@
user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1)
user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1)
for(var/datum/disease/D in C.viruses)
user.show_message(text("\red <b>Warning Virus Detected.</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
if(!D.hidden[SCANNER])
user.show_message(text("\red <b>Warning Virus Detected.</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
if(2)
if (!istype(C:dna, /datum/dna) || !isnull(C:gloves))
code/game/objects/devices/scanners.dm
+2 -1
View File
@@ -174,7 +174,8 @@ MASS SPECTROMETER
if (M.cloneloss)
user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1)
for(var/datum/disease/D in M.viruses)
user.show_message(text("\red <b>Warning: Virus Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
if(!D.hidden[SCANNER])
user.show_message(text("\red <b>Warning: Virus Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1)
if (M.brainloss >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
code/game/objects/items/weapons/guns_new.dm
+2 -2
View File
@@ -115,7 +115,7 @@ var/const/PROJECTILE_DART = 8
if(istype(src, /obj/item/projectile/freeze))
var/obj/item/projectile/freeze/F = src
F.Freeze(A)
if(istype(src, /obj/item/projectile/plasma))
else if(istype(src, /obj/item/projectile/plasma))
var/obj/item/projectile/plasma/P = src
P.Heat(A)
else
@@ -864,7 +864,7 @@ var/const/PROJECTILE_DART = 8
name = "plasma gun"
icon_state = "plasmagun"
fire_sound = 'pulse3.ogg'
desc = "A gun that fires super heated plasma at targets, thus increasing their overal body temparature and also harming them."
desc = "A gun that fires super heated plasma at targets, thus increasing their overall body temparature and also harming them."
var/temperature = T20C
var/current_temperature = T20C
charge_cost = 100