anti-kudzu measures for centcom + goat fix (#4759)

* anti-kudzu measures for centcom + goat fix * marked the edits --------- Co-authored-by: SirNightKnight <=>
Monkestation · Jan 3, 2025 · 6461431 · 6461431
1 parent 257dbe5
commit 6461431
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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