diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index b7f82cc7285..d87f6f9225d 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -1,6 +1,3 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - - /obj/machinery/cell_charger name = "cell charger" desc = "It charges power cells." @@ -19,13 +16,13 @@ if(charging && !(stat & (BROKEN|NOPOWER)) ) - var/newlevel = round( charging.percent() * 4.0 / 99 ) + var/newlevel = round(charging.percent() * 4.0 / 99) //world << "nl: [newlevel]" if(chargelevel != newlevel) overlays = null - overlays += image('icons/obj/power.dmi', "ccharger-o[newlevel]") + overlays += "ccharger-o[newlevel]" chargelevel = newlevel else @@ -87,7 +84,7 @@ if(!charging || (stat & (BROKEN|NOPOWER)) || !anchored) return - var/added = charging.give(75) - use_power(added / CELLRATE) + use_power(200) //this used to use CELLRATE, but CELLRATE is fucking awful. feel free to fix this properly! + charging.give(175) //inefficiency. updateicon() diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index d386dcae764..31230b7706f 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1111,9 +1111,9 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) else if(M.bodytemperature < 311) - M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2356,7 +2356,7 @@ datum if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1) if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2373,7 +2373,7 @@ datum M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) ..() return @@ -2393,7 +2393,7 @@ datum if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) return space_cola @@ -3684,7 +3684,7 @@ datum color = "#664300" // rgb: 102, 67, 0 on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 270) + if(M.bodytemperature > 270) M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ed8b257ca1e..d52c5226bc2 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -229,10 +229,12 @@ return HasEntered(AM as mob|obj) //Go straight into the chute - if (istype(AM, /obj)) + if(istype(AM, /obj/item/projectile) || istype(AM, /obj/item/weapon/dummy)) return + + if(istype(AM, /obj)) var/obj/O = AM O.loc = src - else if (istype(AM, /mob)) + else if(istype(AM, /mob)) var/mob/M = AM M.loc = src src.flush() @@ -242,7 +244,7 @@ flick("intake-closing", src) var/deliveryCheck = 0 var/obj/structure/disposalholder/H = new() // virtual holder object which actually - // travels through the pipes. + // travels through the pipes. for(var/obj/structure/bigDelivery/O in src) deliveryCheck = 1 if(O.sortTag == 0)