cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverts #7692 (#8331)

Browse Source
This commit is contained in:
YakumoChen
2021-10-13 20:35:18 +01:00
committed by GitHub
parent 4e23159fdc
commit 063d4b7948
2 changed files with 8 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+1 -53
View File
@@ -106,7 +106,7 @@
icon_state = "venus_human_trap"
health_doll_icon = "venus_human_trap"
mob_biotypes = MOB_ORGANIC | MOB_PLANT
layer = ABOVE_ALL_MOB_LAYER //SKYRAT EDIT CHANGE Venus should be able to hide within the vines...
layer = SPACEVINE_MOB_LAYER
health = 60 //SKYRAT EDIT CHANGE
maxHealth = 60 //SKYRAT EDIT CHANGE
ranged = TRUE
@@ -141,21 +141,9 @@
ghost_controllable = TRUE //SKYRAT EDIT ADDITION
COOLDOWN_DECLARE(help_grow)
COOLDOWN_DECLARE(attack_cooldown)
/mob/living/simple_animal/hostile/venus_human_trap/Life(delta_time = SSMOBS_DT, times_fired)
. = ..()
pull_vines()
//SKYRAT EDIT CHANGE
var/turf/src_turf = get_turf(src)
var/obj/structure/spacevine/find_vine = locate() in src_turf.contents
if(!find_vine)
adjustHealth(maxHealth * 0.05)
else
adjustHealth(maxHealth * -0.05)
//SKYRAT EDIT CHANGE
/mob/living/simple_animal/hostile/venus_human_trap/Moved(atom/OldLoc, Dir)
. = ..()
@@ -255,44 +243,4 @@
for(var/i in vines)
qdel(i)
return ..()
/mob/living/simple_animal/hostile/venus_human_trap/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
if(!istype(attack_target, /obj/structure/spacevine))
return ..()
if(!proximity_flag)
return
var/obj/structure/spacevine/attacked_spacevine = attack_target
if(COOLDOWN_FINISHED(src, help_grow))
COOLDOWN_START(src, help_grow, 1 SECONDS)
if(attacked_spacevine.energy >= 2)
attacked_spacevine.spread()
to_chat(src, span_notice("You help [attacked_spacevine] expand..."))
else
attacked_spacevine.grow()
to_chat(src, span_notice("You help [attacked_spacevine] grow..."))
if(!COOLDOWN_FINISHED(src, attack_cooldown))
return
COOLDOWN_START(src, attack_cooldown, 1 SECONDS)
var/turf/vine_turf = get_turf(attack_target)
var/static/list/break_list = typecacheof(list(
/obj/machinery/door,
/obj/structure/table,
/obj/structure/window,
/obj/structure/girder,
/obj/structure/grille,
/obj/structure/rack,
/obj/structure/door_assembly,
/obj/structure/closet,
))
for(var/check_contents in vine_turf.contents)
if(isliving(check_contents) && !istype(check_contents, /mob/living/simple_animal/hostile/venus_human_trap))
UnarmedAttack(check_contents)
if(is_type_in_typecache(check_contents, break_list))
UnarmedAttack(check_contents)
/mob/living/simple_animal/hostile/venus_human_trap/start_pulling(atom/movable/AM, state, force, supress_message)
if(isliving(AM))
to_chat(src, span_warning("You are unable to pull living creatures, they are too heavy!"))
return FALSE
return ..()
//SKYRAT EDIT END