mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #13150 from Heroman3003/runtime-2
Fixes more runtimes
This commit is contained in:
@@ -368,6 +368,9 @@ var/list/global_huds = list(
|
||||
toggle_hud_vis(full)
|
||||
|
||||
/mob/proc/toggle_hud_vis(full)
|
||||
if(!client)
|
||||
return FALSE
|
||||
|
||||
if(hud_used.hud_shown)
|
||||
hud_used.hud_shown = 0
|
||||
if(hud_used.adding)
|
||||
@@ -405,7 +408,8 @@ var/list/global_huds = list(
|
||||
return TRUE
|
||||
|
||||
/mob/living/carbon/human/toggle_hud_vis(full)
|
||||
..()
|
||||
if(!(. = ..()))
|
||||
return FALSE
|
||||
|
||||
// Prevents humans from hiding a few hud elements
|
||||
if(!hud_used.hud_shown) // transitioning to hidden
|
||||
|
||||
@@ -145,6 +145,9 @@ SUBSYSTEM_DEF(throwing)
|
||||
|
||||
AM.Move(step, get_dir(AM, step))
|
||||
|
||||
if (!AM) // Us moving somehow destroyed us?
|
||||
return
|
||||
|
||||
if (!AM.throwing) // we hit something during our move
|
||||
finalize(hit = TRUE)
|
||||
return
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
var/who = null
|
||||
if(isobserver(candidate))
|
||||
var/mob/observer/dead/ghost = candidate
|
||||
who = ghost
|
||||
who = ghost.name
|
||||
im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text))
|
||||
else if(istype(candidate, /obj/item/device/communicator))
|
||||
var/obj/item/device/communicator/comm = candidate
|
||||
|
||||
@@ -364,6 +364,8 @@
|
||||
pai_fold_display.icon_state = "unfolded"
|
||||
|
||||
/mob/living/silicon/pai/toggle_hud_vis(full)
|
||||
if(!client)
|
||||
return FALSE
|
||||
|
||||
if(hud_used.hud_shown)
|
||||
hud_used.hud_shown = 0
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
else if(M.CanStumbleVore(src))
|
||||
visible_message("<span class='warning'>[M] flops carlessly into [src]!</span>")
|
||||
perform_the_nom(M,src,M,M.vore_selected,1)
|
||||
else if(S.species.lightweight == 1)
|
||||
else if(istype(S) && S.species.lightweight == 1)
|
||||
visible_message("<span class='warning'>[M] carelessly bowls [src] over!</span>")
|
||||
M.forceMove(get_turf(src))
|
||||
M.apply_damage(0.5, BRUTE)
|
||||
|
||||
Reference in New Issue
Block a user