From 6fd407bc17849bd8c720c745d6622d9846f523d4 Mon Sep 17 00:00:00 2001 From: unusualcrow Date: Mon, 26 Dec 2016 10:39:43 -0500 Subject: [PATCH] jesus --- code/game/objects/items/devices/traitordevices.dm | 2 +- code/game/objects/structures/spirit_board.dm | 4 ++-- code/modules/hydroponics/hydroponics.dm | 4 ++-- code/modules/mob/living/carbon/human/species_types.dm | 4 ++-- code/modules/mob/living/simple_animal/hostile/statue.dm | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 82d07c4f4c..62aa7a266b 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -218,7 +218,7 @@ effective or pretty fucking useless. var/turf/T = get_turf(src) if(on) var/lumcount = T.get_lumcount() - if(lumcount > 3) + if(lumcount > 0.3) charge = max(0,charge - 25)//Quick decrease in light else charge = min(max_charge,charge + 50) //Charge in the dark diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index dfef2c730c..4e03f71d8a 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -58,7 +58,7 @@ light_amount = T.get_lumcount() - if(light_amount > 2) + if(light_amount > 0.2) M << "It's too bright here to use [src.name]!" return 0 @@ -75,4 +75,4 @@ M << "There aren't enough people to use the [src.name]!" return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 6a00b9fa11..6eb795f81e 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -152,10 +152,10 @@ var/turf/currentTurf = loc var/lightAmt = currentTurf.get_lumcount() if(myseed.plant_type == PLANT_MUSHROOM) - if(lightAmt < 2) + if(lightAmt < 0.2) adjustHealth(-1 / rating) else // Non-mushroom - if(lightAmt < 4) + if(lightAmt < 0.4) adjustHealth(-2 / rating) //Water////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index e5340e98bc..a9f80f41a4 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -114,7 +114,7 @@ var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing if(isturf(H.loc)) //else, there's considered to be no light var/turf/T = H.loc - light_amount = min(10,T.get_lumcount()) - 5 + light_amount = min(10,T.get_lumcount() * 100) - 5 H.nutrition += light_amount if(H.nutrition > NUTRITION_LEVEL_FULL) H.nutrition = NUTRITION_LEVEL_FULL @@ -177,7 +177,7 @@ if(light_amount > 2) //if there's enough light, start dying H.take_overall_damage(1,1) - else if (light_amount < 2) //heal in the dark + else if (light_amount < 0.2) //heal in the dark H.heal_overall_damage(1,1) /* diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index b196579524..5c81c29e39 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -111,7 +111,7 @@ // Check for darkness var/turf/T = get_turf(loc) if(T && destination) - if((T.get_lumcount())<1 && (destination.get_lumcount())<1) // No one can see us in the darkness, right? + if((T.get_lumcount())<0.1 && (destination.get_lumcount())<0.1) // No one can see us in the darkness, right? return null if(T == destination) destination = null