From aeecba8089570c3726f5fba2611cab5f4fc51981 Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Wed, 23 Feb 2011 20:32:42 +0000 Subject: [PATCH] Minor Update: - Thermite'd walls and mined minerals no longer fuck over the lighting code. - Power cells now have a different examine-text entry when they fail due to low reliability. - Some R&D console tweaks. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1100 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/mining.dm | 1 + code/game/research/rdconsole.dm | 2 +- code/game/turf.dm | 2 ++ code/modules/power/cell.dm | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 043670568b7..76ce0f2a806 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -1416,6 +1416,7 @@ proc/move_mining_shuttle() */ W.opacity = 1 W.sd_SetOpacity(0) + W.sd_LumReset() W.levelupdate() return W diff --git a/code/game/research/rdconsole.dm b/code/game/research/rdconsole.dm index 07fae104cd1..a59b42cecf7 100644 --- a/code/game/research/rdconsole.dm +++ b/code/game/research/rdconsole.dm @@ -247,7 +247,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) for(var/T in temp_tech) files.UpdateTech(T, temp_tech[T]) - if(linked_destroy.loaded_item.reliability < 100) + if(linked_destroy.loaded_item.reliability < 100 && linked_destroy.loaded_item.crit_fail) files.UpdateDesign(linked_destroy.loaded_item.type) if(linked_lathe) //Also sends salvaged materials to a linked autolathe, if any. linked_lathe.m_amount = min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.m_amt*linked_destroy.decon_mod)) diff --git a/code/game/turf.dm b/code/game/turf.dm index 919763d37c8..2618be77c67 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -343,6 +343,7 @@ F.burn_tile() user << "\red The thermite melts the wall." spawn(100) del(O) + F.sd_LumReset() return if (W:remove_fuel(5,user)) @@ -391,6 +392,7 @@ F.burn_tile() user << "\red The thermite melts the wall." spawn(100) del(O) + F.sd_LumReset() return if (src.d_state == 2) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 4af0196cacd..8fdc989cfbc 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -59,6 +59,8 @@ usr << "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%." else usr << "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!!!\nThe charge meter reads [round(src.percent() )]%." + if(crit_fail) + usr << "\red This power cell seems to be faulty" //Just because someone gets you occasionally with stun gloves doesn't mean you can put in code to kill everyone who tries to make some. /obj/item/weapon/cell/attackby(obj/item/W, mob/user)