From 982998d08de72d6477e135bb2089f6ccd15a4be8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 3 Jan 2015 06:53:29 +1030 Subject: [PATCH] Fixes #7636 --- code/game/turfs/simulated/walls.dm | 2 +- code/modules/hydroponics/hydro_tray.dm | 2 +- code/modules/mob/living/simple_animal/constructs.dm | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 64e30c8f78a..5561d9cfbd6 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -467,7 +467,7 @@ else if(istype(W,/obj/item/weapon/rcd)) //I bitterly resent having to write this. ~Z return - + else return attack_hand(user) return diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 10be361c17e..eafff17b073 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -12,7 +12,7 @@ var/draw_warnings = 1 //Set to 0 to stop it from drawing the alert lights. // Plant maintenance vars. - var/waterlevel = 10 // Water (max 10) + var/waterlevel = 100 // Water (max 100) var/nutrilevel = 10 // Nutrient (max 10) var/pestlevel = 0 // Pests (max 10) var/weedlevel = 0 // Weeds (max 10) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 24b556649a6..79295a9b5bf 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -40,6 +40,17 @@ ghostize() del src + +/mob/living/simple_animal/construct/attack_generic(var/mob/user) + if(istype(user, /mob/living/simple_animal/construct/builder)) + if(health < maxHealth) + adjustBruteLoss(-5) + user.visible_message("\The [user] mends some of \the [src]'s wounds.") + else + user << "\The [src] is undamaged." + return + return ..() + /mob/living/simple_animal/construct/examine(mob/user) ..(user) var/msg = ""