From 6461431864ca1612722acb95ba2f6732830e2ff4 Mon Sep 17 00:00:00 2001 From: NightKnight <88754494+SirNightKnight@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:12:49 -0500 Subject: [PATCH] anti-kudzu measures for centcom + goat fix (#4759) * anti-kudzu measures for centcom + goat fix * marked the edits --------- Co-authored-by: SirNightKnight <=> --- code/modules/events/space_vines/vine_structure.dm | 7 +++++++ code/modules/mob/living/basic/farm_animals/goat/_goat.dm | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/events/space_vines/vine_structure.dm b/code/modules/events/space_vines/vine_structure.dm index 21616ae4f656..2adeaacb6e18 100644 --- a/code/modules/events/space_vines/vine_structure.dm +++ b/code/modules/events/space_vines/vine_structure.dm @@ -30,6 +30,13 @@ /obj/structure/spacevine/Initialize(mapload) . = ..() + //MONKESTATION EDIT START + var/area/area = get_area(src) + if(istype(area, /area/centcom)) + do_sparks(rand(3, 4), FALSE, src) + visible_message(span_warning("AUTOMATIC BLUESPACE HEDGE TRIMMING PROTOCOL ACTIVATED!")) + qdel(src) + //MONKESTATION EDIT STOP add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), diff --git a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm index 742187d29e3f..9ae9c2a226c3 100644 --- a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm +++ b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm @@ -125,7 +125,7 @@ /// Proc that handles dealing with the various types of plants we might eat. Assumes that a valid list of type(s) will be passed in. /mob/living/basic/goat/proc/eat_plant(list/plants) - if(health == 0) //monkestation edit + if(health <= 0) //monkestation edit return var/eaten = FALSE