Various Life Refactor Fixes (#13536)

* Disposal Movement Fix

* guardian fix

* SSD fix

* blob mobs

* wizard teleport fix
This commit is contained in:
Fox McCloud
2020-06-05 16:38:45 -06:00
committed by GitHub
parent ce83660145
commit 77ffb3f102
5 changed files with 20 additions and 17 deletions
+6 -4
View File
@@ -51,7 +51,8 @@
speak_emote = list("pulses")
var/obj/structure/blob/factory/factory = null
var/list/human_overlays = list()
var/is_zombie = 0
var/mob/living/carbon/human/oldguy
var/is_zombie = FALSE
/mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
@@ -102,6 +103,7 @@
human_overlays = H.overlays
update_icons()
H.forceMove(src)
oldguy = H
visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")
/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
@@ -130,9 +132,9 @@
if(factory)
factory.spores -= src
factory = null
if(contents)
for(var/mob/M in contents)
M.loc = get_turf(src)
if(oldguy)
oldguy.forceMove(get_turf(src))
oldguy = null
return ..()
@@ -162,7 +162,7 @@
if(loc == summoner)
forceMove(get_turf(summoner))
new /obj/effect/temp_visual/guardian/phase(loc)
src.client.eye = loc
reset_perspective()
cooldown = world.time + 30
/mob/living/simple_animal/hostile/guardian/proc/Recall(forced = FALSE)
+1 -1
View File
@@ -100,7 +100,7 @@
break
if(!success)
user.loc = pick(L)
user.forceMove(pick(L))
smoke.start()
src.uses -= 1
+4 -3
View File
@@ -336,6 +336,10 @@
AdjustHallucinate(-2)
// Keep SSD people asleep
if(player_logged)
Sleeping(2)
/mob/living/carbon/handle_sleeping()
if(..())
if(mind?.vampire)
@@ -363,9 +367,6 @@
if(prob(10) && health && hal_screwyhud != SCREWYHUD_CRIT)
emote("snore")
// Keep SSD people asleep
if(player_logged)
Sleeping(2)
return sleeping
/mob/living/carbon/update_health_hud(shown_health_amount)
+8 -8
View File
@@ -582,7 +582,7 @@
D.expel(src) // no trunk connected, so expel immediately
return
loc = D.trunk
forceMove(D.trunk)
active = 1
dir = DOWN
spawn(1)
@@ -746,9 +746,9 @@
if(H2 && !H2.active)
H.merge(H2)
H.loc = P
H.forceMove(P)
else // if wasn't a pipe, then set loc to turf
H.loc = T
H.forceMove(T)
return null
return P
@@ -790,7 +790,7 @@
if(T.density) // dense ouput turf, so stop holder
H.active = 0
H.loc = src
H.forceMove(src)
return
if(T.intact && istype(T,/turf/simulated/floor)) //intact floor, pop the tile
var/turf/simulated/floor/F = T
@@ -1069,9 +1069,9 @@
var/obj/structure/disposalholder/H2 = locate() in P
if(H2 && !H2.active)
H.merge(H2)
H.loc = P
H.forceMove(P)
else // if wasn't a pipe, then set loc to turf
H.loc = T
H.forceMove(T)
return null
return P
@@ -1128,9 +1128,9 @@
if(H2 && !H2.active)
H.merge(H2)
H.loc = P
H.forceMove(P)
else // if wasn't a pipe, then set loc to turf
H.loc = T
H.forceMove(T)
return null
return P