From 8d487ea7ad78f121f8f80e21d27c647ed554dc84 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 7 Oct 2018 14:48:45 -0300 Subject: [PATCH] Bugfixes: constructs, simple animals falling down and airlock runtimes (#5380) -fixes #5370 -fixes simple animals ignoring ladders and other things when falling down -fixes a runtime when forcing airlocks open --- code/game/machinery/doors/airlock.dm | 2 +- .../modules/mob/living/simple_animal/constructs/constructs.dm | 4 ++-- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1c9b10c7fc8..2a1b535fe82 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -798,7 +798,7 @@ About the new airlock wires panel: src.do_animate("spark") src.stat |= BROKEN var/check = src.open(1) - src.visible_message("\The [H] slices \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You slice \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You hear something sparking.") + H.visible_message("\The [H] slices \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You slice \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You hear something sparking.") return if(src.p_open) user.set_machine(src) diff --git a/code/modules/mob/living/simple_animal/constructs/constructs.dm b/code/modules/mob/living/simple_animal/constructs/constructs.dm index 98ca49ced73..ec02500f297 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs.dm @@ -197,8 +197,8 @@ health_prefix = "artificer" response_harm = "viciously beaten" harm_intent_damage = 5 - melee_damage_lower = 5 - melee_damage_upper = 5 + melee_damage_lower = 10 + melee_damage_upper = 10 attacktext = "rammed" speed = 0 environment_smash = 1 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index eec47baf736..a836e6fb341 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -668,8 +668,8 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) /mob/living/simple_animal/can_fall() if (stat != DEAD && flying) return FALSE - else - return TRUE + + return ..() /mob/living/simple_animal/can_ztravel() if (stat != DEAD && flying)