From 737a1575ff7fb1410458dbe36fb6f3fdaf850c2b Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 19 Mar 2018 01:44:48 -0400 Subject: [PATCH] NYAH --- .../living/carbon/human/species/station.dm | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index c05e0c04a95..24fd38eeb73 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -83,7 +83,6 @@ /datum/species/unathi/handle_post_spawn(var/mob/living/carbon/human/H) - lash.Grant(H) ..() @@ -95,7 +94,7 @@ /datum/action/innate/tail_lash/Activate() var/mob/living/carbon/human/user = owner if(!user.restrained() || !user.buckled) - to_chat(user, "You need freedom of movment to tail lash!") + to_chat(user, "You need freedom of movement to tail lash!") return if(user.getStaminaLoss() >= 50) to_chat(user, "Rest before tail lashing again!") @@ -104,7 +103,7 @@ var/obj/item/organ/external/E = C.get_organ(pick("l_leg", "r_leg", "l_foot", "r_foot", "groin")) if(E) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message(" [src] smacks [C] in [E] with their tail! ", "You hit [C] in [E] with your tail!") + user.visible_message("[src] smacks [C] in [E] with their tail! ", "You hit [C] in [E] with your tail!") user.adjustStaminaLoss(15) C.apply_damage(5, BRUTE, E) user.spin(20, 1) @@ -814,7 +813,7 @@ unarmed_type = /datum/unarmed_attack/diona //primitive_form = "Nymph" slowdown = 5 - hunger_drain = 0.6 + hunger_drain = 0.4 remains_type = /obj/effect/decal/cleanable/ash @@ -893,13 +892,13 @@ /datum/species/diona/water_act(var/mob/living/carbon/C, volume, temperature, source) ..() - C.nutrition = min(C.nutrition + volume, NUTRITION_LEVEL_WELL_FED+10) + C.nutrition = min(C.nutrition + volume, NUTRITION_LEVEL_WELL_FED + 10) /datum/species/diona/handle_life(var/mob/living/carbon/human/H) H.radiation = Clamp(H.radiation, 0, 100) //We have to clamp this first, then decrease it, or there's a few edge cases of massive heals if we clamp and decrease at the same time. var/rads = H.radiation / 25 H.radiation = max(H.radiation - rads, 0) - H.nutrition = min(H.nutrition + rads, NUTRITION_LEVEL_WELL_FED+10) + H.nutrition = min(H.nutrition + rads, NUTRITION_LEVEL_WELL_FED + 10) H.adjustBruteLoss(-(rads)) H.adjustToxLoss(-(rads)) @@ -914,11 +913,11 @@ H.throw_alert("nolight", /obj/screen/alert/nolight) H.nutrition -= 20 - if((light_amount >= 5 && H.nutrition >= NUTRITION_LEVEL_FED ) && !H.suiciding) //if there's enough light, heal - H.adjustBruteLoss(-(light_amount/2)) - H.adjustFireLoss(-(light_amount/4)) - if(H.nutrition < NUTRITION_LEVEL_STARVING+50) - H.take_overall_damage(10,0) + if((light_amount >= 5 && H.nutrition >= NUTRITION_LEVEL_FED) && !H.suiciding) //if there's enough light, heal + H.adjustBruteLoss(-(light_amount / 2)) + H.adjustFireLoss(-(light_amount / 4)) + if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) + H.take_overall_damage(10, 0) ..() /datum/species/machine