From 85b670b59983de8df43184d66978998a267245cb Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Fri, 25 Aug 2023 17:15:29 +0200
Subject: [PATCH] Fixes a flowering kudzu runtime (#22082)
* Wooooo
* Lewc review
* Tiny
---
code/game/objects/structures/aliens.dm | 3 +++
.../simple_animal/hostile/venus_human_trap.dm | 26 +++++++++----------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index b400bf6a4ba..091ea9aa8c6 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -52,9 +52,12 @@
canSmoothWith = list(SMOOTH_GROUP_ALIEN_RESIN)
max_integrity = 200
var/resintype = null
+ var/is_alien = TRUE
/obj/structure/alien/resin/Initialize(mapload)
air_update_turf(1)
+ if(!is_alien)
+ return ..()
for(var/obj/structure/alien/weeds/node/W in get_turf(src))
qdel(W)
if(locate(/obj/structure/alien/weeds) in get_turf(src))
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index a2982fb88e4..9c8e33e5a94 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -10,14 +10,15 @@
canSmoothWith = null
smoothing_flags = NONE
var/growth_time = 120 SECONDS
+ is_alien = FALSE
-/obj/structure/alien/resin/flower_bud_enemy/New()
- ..()
+/obj/structure/alien/resin/flower_bud_enemy/Initialize(mapload)
+ . = ..()
var/list/anchors = list()
- anchors += locate(x-2,y+2,z)
- anchors += locate(x+2,y+2,z)
- anchors += locate(x-2,y-2,z)
- anchors += locate(x+2,y-2,z)
+ anchors += locate(x - 2, y + 2, z)
+ anchors += locate(x + 2, y + 2, z)
+ anchors += locate(x - 2, y - 2, z)
+ anchors += locate(x + 2, y - 2, z)
for(var/turf/T in anchors)
var/datum/beam/B = Beam(T, "vine", time=INFINITY, maxdistance=5, beam_type=/obj/effect/ebeam/vine)
@@ -37,13 +38,12 @@
/obj/effect/ebeam/vine/Crossed(atom/movable/AM, oldloc)
- if(isliving(AM))
- var/mob/living/L = AM
- if(!("vines" in L.faction))
- L.adjustBruteLoss(5)
- to_chat(L, "You cut yourself on the thorny vines.")
-
-
+ if(!isliving(AM))
+ return
+ var/mob/living/L = AM
+ if(!("vines" in L.faction))
+ L.adjustBruteLoss(5)
+ to_chat(L, "You cut yourself on the thorny vines.")
/mob/living/simple_animal/hostile/venus_human_trap
name = "venus human trap"