Langserver fixes, vol 2 (#7401)

This commit is contained in:
Erki
2019-11-15 23:42:25 +02:00
committed by Werner
parent 444c0d5ea5
commit ff41b92e97
39 changed files with 100 additions and 159 deletions
+4 -7
View File
@@ -73,7 +73,7 @@ var/list/diona_banned_languages = list(
apply_radiation(-2)
DS.stored_energy += 2
apply_radiation(-0.5) //Radiation is gradually wasted if its not used for something
if(total_radiation < 0)
total_radiation = null
@@ -90,7 +90,7 @@ var/list/diona_banned_languages = list(
if (DS.nutrient_organ)
if (DS.nutrient_organ.is_broken())
return 0
if (consume_nutrition_from_air && (nutrition / max_nutrition > 0.25))
to_chat(src, span("notice", "You feel like you have replanished enough of nutrition to stay alive. Consuming more makes you feel gross."))
consume_nutrition_from_air = !consume_nutrition_from_air
@@ -324,13 +324,13 @@ var/list/diona_banned_languages = list(
return
DS.regen_limb_progress = 0
diona_regen_progress(DS)
visible_message("<span class='warning'>[src] begins to shift and quiver.</span>",
"<span class='warning'>You begin to shift and quiver, feeling a stirring within your trunk</span>")
DS.regening_organ = TRUE
to_chat(src, "<span class='notice'>You are trying to regrow a lost limb, this is a long and complicated process!</span>")
var/list/special_case = list(
/obj/item/organ/external/arm/diona = /obj/item/organ/external/hand/diona,
/obj/item/organ/external/arm/right/diona = /obj/item/organ/external/hand/right/diona,
@@ -660,9 +660,6 @@ var/list/diona_banned_languages = list(
nutrient_organ = null
return ..()
#undef FLASHLIGHT_STRENGTH
#undef PDALIGHT_STRENGTH
#undef DIONA_MAX_LIGHT
#undef TEMP_REGEN_STOP
#undef TEMP_REGEN_NORMAL
#undef TEMP_INCREASE_REGEN_DOUBLE
+1 -1
View File
@@ -41,7 +41,7 @@ calculate text size per text.
tastes[taste_desc] += taste_amount
else
tastes[taste_desc] = taste_amount
if(!(R.default_temperature in (T0C + 15 to T0C + 25)))
if(R.default_temperature >= (T0C + 15) && R.default_temperature <= (T0C + 25))
lukewarm = 1
//deal with percentages
+2 -2
View File
@@ -65,7 +65,7 @@
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
//Being hit while using a cloaking device
var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
var/obj/item/weapon/cloaking_device/C = locate(/obj/item/weapon/cloaking_device) in src
if(C && C.active)
C.attack_self(src)//Should shut it off
update_icons()
@@ -401,4 +401,4 @@
client.screen += hud_used.hide_actions_toggle
#undef MOB_FIRE_LIGHT_RANGE //These control the intensity and range of light given off by a mob which is on fire
#undef MOB_FIRE_LIGHT_POWER
#undef MOB_FIRE_LIGHT_POWER