cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes where the floor cluwne checks for humans; some minor text changes

Browse Source
This commit is contained in:
Citinited
2018-12-02 15:03:11 +00:00
parent decdac4426
commit ef3e311e99
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+6 -4
View File
@@ -71,10 +71,13 @@
/mob/living/simple_animal/hostile/floor_cluwne/Life(seconds, times_fired)
if(!ishuman(current_victim)) //Just in case a nonhuman is accidentally chosen. A human will then be chosen later on in Acquire_Victim()
current_victim = null
do_jitter_animation(1000)
pixel_y = 8
if(is_type_in_typecache(get_area(src.loc), invalid_area_typecache))
if(is_type_in_typecache(get_area(loc), invalid_area_typecache))
var/area = pick(teleportlocs)
var/area/tp = teleportlocs[area]
forceMove(pick(get_area_turfs(tp.type)))
@@ -153,7 +156,7 @@
if(specific)
H = specific
if((!H || H.stat == DEAD) && smiting)//safety check, target somehow DIED after we sent a smite
message_admins("Smiting Floor Cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
message_admins("Smiting floor cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
qdel(src)
return
if(H.stat != DEAD && !isLivingSSD(H) && H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
@@ -165,8 +168,7 @@
interest = 0
return target = current_victim
message_admins("Floor Cluwne was deleted due to a lack of valid targets, if this was a manually targeted instance please re-evaluate your choice.")
message_admins("Floor cluwne was deleted due to a lack of valid targets[specific ? ", if you spawned this with a specific target please choose another person" : null].")
qdel(src)
/mob/living/simple_animal/hostile/floor_cluwne/proc/Manifest()//handles disappearing and appearance anim