diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index fe8ed4bbb8..5ad51389ce 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -23,7 +23,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r /obj/machinery/newscaster - name = "Newscaster" + name = "newscaster" desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" icon = 'icons/obj/terminals.dmi' icon_state = "newscaster_normal" @@ -665,7 +665,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r //######################################################################################################################## /obj/item/weapon/newspaper - name = "Newspaper" + name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." icon_state = "newspaper" w_class = 2 //Let's make it fit in trashbags! diff --git a/code/game/objects/crates.dm b/code/game/objects/crates.dm index e2bb02b474..7ccff26263 100644 --- a/code/game/objects/crates.dm +++ b/code/game/objects/crates.dm @@ -235,19 +235,8 @@ /obj/structure/closet/crate/open() playsound(src.loc, 'click.ogg', 15, 1, -3) - var/itemcount = 0 - for(var/obj/O in src) - if(itemcount >= storage_capacity) - break O.loc = get_turf(src) - itemcount++ - - for(var/mob/M in src) - if(itemcount >= storage_capacity) - break - M.loc = get_turf(src) - itemcount++ icon_state = icon_opened src.opened = 1 @@ -255,9 +244,14 @@ /obj/structure/closet/crate/close() playsound(src.loc, 'click.ogg', 15, 1, -3) + var/itemcount = 0 + for(var/obj/O in get_turf(src)) + if(itemcount >= storage_capacity) + break if(O.density || O.anchored || O == src) continue O.loc = src + itemcount++ icon_state = icon_closed src.opened = 0 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index f174edb64e..b008e11669 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1098,9 +1098,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) + M.bodytemperature = max(310, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) else if(M.bodytemperature < 311) - M.bodytemperature = min(310, M.bodytemperature+20) + M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -1747,17 +1747,17 @@ datum if(!data) data = 1 switch(data) if(1 to 15) - M.bodytemperature += 5 + M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("frostoil")) holder.remove_reagent("frostoil", 5) if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(5,20) if(15 to 25) - M.bodytemperature += 10 + M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(10,20) if(25 to INFINITY) - M.bodytemperature += 15 + M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(15,20) data++ @@ -1833,17 +1833,17 @@ datum if(!data) data = 1 switch(data) if(1 to 15) - M.bodytemperature -= 5 + M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("capsaicin")) holder.remove_reagent("capsaicin", 5) if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(5,20) if(15 to 25) - M.bodytemperature -= 10 + M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(10,20) if(25 to INFINITY) - M.bodytemperature -= 15 + M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT if(prob(1)) M.emote("shiver") if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(15,20) @@ -1892,7 +1892,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature+5) + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.nutrition += nutriment_factor ..() return @@ -2046,7 +2046,7 @@ datum on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature+10) + M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2060,7 +2060,7 @@ datum on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor - M.bodytemperature += 10 + M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -2303,7 +2303,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) + M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) if(holder.has_reagent("frostoil")) holder.remove_reagent("frostoil", 5) @@ -2326,7 +2326,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) + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2343,7 +2343,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) + M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) ..() return @@ -2363,7 +2363,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) + M.bodytemperature = min(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) return space_cola @@ -2376,7 +2376,7 @@ datum on_mob_life(var/mob/living/M as mob) M.drowsyness = max(0,M.drowsyness-5) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.nutrition += 1 ..() return @@ -2395,7 +2395,7 @@ datum M.drowsyness = 0 M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.nutrition += 1 ..() return @@ -2411,7 +2411,7 @@ datum M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-1) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) M.nutrition += 1 ..() @@ -2428,7 +2428,7 @@ datum M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) M.nutrition += 1 if(!data) data = 1 @@ -2452,7 +2452,7 @@ datum on_mob_life(var/mob/living/M as mob) M.drowsyness = max(0,M.drowsyness-6) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) //310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 M.nutrition += 1 ..() return @@ -2466,7 +2466,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-8) //310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 M.nutrition += 1 ..() return @@ -2480,7 +2480,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-8) //310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 M.nutrition += 1 ..() return @@ -2697,7 +2697,7 @@ datum M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2785,7 +2785,7 @@ datum M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -2798,7 +2798,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.bodytemperature -= 5 + M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -3145,7 +3145,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature+15) //310 is the normal bodytemp. 310.055 + M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ M.dizziness +=3 @@ -3414,7 +3414,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature+20) //310 is the normal bodytemp. 310.055 + M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ M.dizziness +=3 @@ -3538,7 +3538,7 @@ datum else if(data >= 165 && prob(33)) M.confused = max(M.confused+2,0) if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature-5) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() return @@ -3572,7 +3572,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 360) - M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055 + M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ M.dizziness +=6 @@ -3654,7 +3654,7 @@ datum on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 270) - M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055 + M.bodytemperature = min(270, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 if(!data) data = 1 data++ M.make_dizzy(3) @@ -3759,7 +3759,7 @@ datum M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature+5) + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) M.nutrition++ @@ -3779,7 +3779,7 @@ datum M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature+5) + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) M.nutrition++ diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ab5dbdfb7a..e631eb2375 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -610,9 +610,9 @@ discomfort *= 4 if(mutantrace == "plant") - discomfort *= 3 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist + discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT * 2 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist else - discomfort *= 1.5 //Dangercon 2011 - Upping damage by use of magic numbers - Errorage + discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT //Dangercon 2011 - now with less magic numbers! //world <<"[discomfort]" switch(body_part) diff --git a/code/setup.dm b/code/setup.dm index d4fd98917c..138de75623 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -28,6 +28,8 @@ #define WARNING_LOW_PRESSURE 50 //This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE) #define HAZARD_LOW_PRESSURE 20 //This is when the black ultra-low pressure icon is displayed. (This one is set as a constant) +#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 //This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount. + #define PRESSURE_DAMAGE_COEFFICIENT 5 //The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE #define MAX_PRESSURE_DAMAGE 7 //This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :(