Merge pull request #10687 from Ghommie/Ghommie-cit523

A few more, ported, runtime fixes.
This commit is contained in:
kevinz000
2020-01-25 05:54:03 -07:00
committed by GitHub
8 changed files with 20 additions and 7 deletions

View File

@@ -146,6 +146,8 @@
/datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform) /datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform)
if(!C)
return
C.parallax_animate_timer = FALSE C.parallax_animate_timer = FALSE
for(var/thing in C.parallax_layers) for(var/thing in C.parallax_layers)
var/obj/screen/parallax_layer/L = thing var/obj/screen/parallax_layer/L = thing
@@ -167,7 +169,7 @@
/datum/hud/proc/update_parallax() /datum/hud/proc/update_parallax()
var/client/C = mymob.client var/client/C = mymob.client
var/turf/posobj = get_turf(C.eye) var/turf/posobj = get_turf(C.eye)
if(!posobj) if(!posobj)
return return
var/area/areaobj = posobj.loc var/area/areaobj = posobj.loc

View File

@@ -48,6 +48,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
holder = atom holder = atom
/datum/effect_system/proc/start() /datum/effect_system/proc/start()
if(QDELETED(src))
return
for(var/i in 1 to number) for(var/i in 1 to number)
if(total_effects > 20) if(total_effects > 20)
return return
@@ -69,7 +71,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/j in 1 to steps_amt) for(var/j in 1 to steps_amt)
sleep(5) sleep(5)
step(E,direction) step(E,direction)
addtimer(CALLBACK(src, .proc/decrement_total_effect), 20) if(!QDELETED(src))
addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
/datum/effect_system/proc/decrement_total_effect() /datum/effect_system/proc/decrement_total_effect()
total_effects-- total_effects--

View File

@@ -97,7 +97,7 @@
icon_state = "guillotine_raised" icon_state = "guillotine_raised"
/obj/structure/guillotine/proc/drop_blade(mob/user) /obj/structure/guillotine/proc/drop_blade(mob/user)
if (buckled_mobs.len && blade_sharpness) if (has_buckled_mobs() && blade_sharpness)
var/mob/living/carbon/human/H = buckled_mobs[1] var/mob/living/carbon/human/H = buckled_mobs[1]
if (!H) if (!H)

View File

@@ -30,7 +30,7 @@
underlays.Cut() underlays.Cut()
var/turf/T = loc var/turf/T = loc
if(level == 2 || !T.intact) if(level == 2 || (istype(T) && !T.intact))
showpipe = TRUE showpipe = TRUE
plane = GAME_PLANE plane = GAME_PLANE
else else

View File

@@ -336,7 +336,8 @@
if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD
for(var/I in contents) for(var/I in contents)
var/atom/A = I var/atom/A = I
A.ex_act(severity) if(!QDELETED(A))
A.ex_act(severity)
gib() gib()
return return
else else

View File

@@ -207,7 +207,11 @@
switch(add_to) switch(add_to)
if("collar") if("collar")
add_collar(usr.get_active_held_item(), usr) var/obj/item/clothing/neck/petcollar/P = usr.get_active_held_item()
if(!istype(P))
to_chat(usr,"<span class='warning'>That's not a collar.</span>")
return
add_collar(P, usr)
update_corgi_fluff() update_corgi_fluff()
if(BODY_ZONE_HEAD) if(BODY_ZONE_HEAD)

View File

@@ -23,6 +23,8 @@
new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2)) new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
for(var/C in all_components) for(var/C in all_components)
var/obj/item/computer_hardware/H = all_components[C] var/obj/item/computer_hardware/H = all_components[C]
if(QDELETED(H))
return
uninstall_component(H) uninstall_component(H)
H.forceMove(newloc) H.forceMove(newloc)
if(prob(25)) if(prob(25))

View File

@@ -573,7 +573,8 @@
else if(loc == user) else if(loc == user)
cooldown = TRUE cooldown = TRUE
call(src,realProc)(user) call(src,realProc)(user)
addtimer(CALLBACK(src, .proc/cd), cooldownMax) if(!QDELETED(src))
addtimer(CALLBACK(src, .proc/cd), cooldownMax)
else else
to_chat(user, "<span class='notice'>You aren't quite sure what to do with this yet.</span>") to_chat(user, "<span class='notice'>You aren't quite sure what to do with this yet.</span>")