A few more, ported, runtime fixes.

This commit is contained in:
Ghommie
2020-01-24 03:02:07 +01:00
parent 14a33ee7dc
commit 721fd108f9
8 changed files with 20 additions and 7 deletions
@@ -30,7 +30,7 @@
underlays.Cut()
var/turf/T = loc
if(level == 2 || !T.intact)
if(level == 2 || (istype(T) && !T.intact))
showpipe = TRUE
plane = GAME_PLANE
else
@@ -336,7 +336,8 @@
if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD
for(var/I in contents)
var/atom/A = I
A.ex_act(severity)
if(!QDELETED(A))
A.ex_act(severity)
gib()
return
else
@@ -207,7 +207,11 @@
switch(add_to)
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()
if(BODY_ZONE_HEAD)
@@ -23,6 +23,8 @@
new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
for(var/C in all_components)
var/obj/item/computer_hardware/H = all_components[C]
if(QDELETED(H))
return
uninstall_component(H)
H.forceMove(newloc)
if(prob(25))
+2 -1
View File
@@ -573,7 +573,8 @@
else if(loc == user)
cooldown = TRUE
call(src,realProc)(user)
addtimer(CALLBACK(src, .proc/cd), cooldownMax)
if(!QDELETED(src))
addtimer(CALLBACK(src, .proc/cd), cooldownMax)
else
to_chat(user, "<span class='notice'>You aren't quite sure what to do with this yet.</span>")