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:
@@ -192,7 +192,7 @@ var/list/global_huds = list(
|
|||||||
var/icon/ui_style
|
var/icon/ui_style
|
||||||
var/ui_color
|
var/ui_color
|
||||||
var/ui_alpha
|
var/ui_alpha
|
||||||
|
|
||||||
// TGMC Ammo HUD Port
|
// TGMC Ammo HUD Port
|
||||||
var/list/obj/screen/ammo_hud_list = list()
|
var/list/obj/screen/ammo_hud_list = list()
|
||||||
|
|
||||||
@@ -368,6 +368,9 @@ var/list/global_huds = list(
|
|||||||
toggle_hud_vis(full)
|
toggle_hud_vis(full)
|
||||||
|
|
||||||
/mob/proc/toggle_hud_vis(full)
|
/mob/proc/toggle_hud_vis(full)
|
||||||
|
if(!client)
|
||||||
|
return FALSE
|
||||||
|
|
||||||
if(hud_used.hud_shown)
|
if(hud_used.hud_shown)
|
||||||
hud_used.hud_shown = 0
|
hud_used.hud_shown = 0
|
||||||
if(hud_used.adding)
|
if(hud_used.adding)
|
||||||
@@ -405,7 +408,8 @@ var/list/global_huds = list(
|
|||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
/mob/living/carbon/human/toggle_hud_vis(full)
|
/mob/living/carbon/human/toggle_hud_vis(full)
|
||||||
..()
|
if(!(. = ..()))
|
||||||
|
return FALSE
|
||||||
|
|
||||||
// Prevents humans from hiding a few hud elements
|
// Prevents humans from hiding a few hud elements
|
||||||
if(!hud_used.hud_shown) // transitioning to hidden
|
if(!hud_used.hud_shown) // transitioning to hidden
|
||||||
@@ -466,7 +470,7 @@ var/list/global_huds = list(
|
|||||||
|
|
||||||
/mob/new_player/add_click_catcher()
|
/mob/new_player/add_click_catcher()
|
||||||
return
|
return
|
||||||
|
|
||||||
/* TGMC Ammo HUD Port
|
/* TGMC Ammo HUD Port
|
||||||
* These procs call to screen_objects.dm's respective procs.
|
* These procs call to screen_objects.dm's respective procs.
|
||||||
* All these do is manage the amount of huds on screen and set the HUD.
|
* All these do is manage the amount of huds on screen and set the HUD.
|
||||||
|
|||||||
@@ -145,6 +145,9 @@ SUBSYSTEM_DEF(throwing)
|
|||||||
|
|
||||||
AM.Move(step, get_dir(AM, step))
|
AM.Move(step, get_dir(AM, step))
|
||||||
|
|
||||||
|
if (!AM) // Us moving somehow destroyed us?
|
||||||
|
return
|
||||||
|
|
||||||
if (!AM.throwing) // we hit something during our move
|
if (!AM.throwing) // we hit something during our move
|
||||||
finalize(hit = TRUE)
|
finalize(hit = TRUE)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
var/who = null
|
var/who = null
|
||||||
if(isobserver(candidate))
|
if(isobserver(candidate))
|
||||||
var/mob/observer/dead/ghost = 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))
|
im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text))
|
||||||
else if(istype(candidate, /obj/item/device/communicator))
|
else if(istype(candidate, /obj/item/device/communicator))
|
||||||
var/obj/item/device/communicator/comm = candidate
|
var/obj/item/device/communicator/comm = candidate
|
||||||
|
|||||||
@@ -20,13 +20,13 @@
|
|||||||
|
|
||||||
if("software interface")
|
if("software interface")
|
||||||
p.paiInterface()
|
p.paiInterface()
|
||||||
|
|
||||||
if("radio configuration")
|
if("radio configuration")
|
||||||
p.radio.tgui_interact(p)
|
p.radio.tgui_interact(p)
|
||||||
|
|
||||||
if("pda")
|
if("pda")
|
||||||
p.pda.cmd_pda_open_ui()
|
p.pda.cmd_pda_open_ui()
|
||||||
|
|
||||||
if("communicator")
|
if("communicator")
|
||||||
p.communicator.activate()
|
p.communicator.activate()
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
else
|
else
|
||||||
p.hud_used.inventory_shown = 1
|
p.hud_used.inventory_shown = 1
|
||||||
p.client.screen += p.hud_used.other
|
p.client.screen += p.hud_used.other
|
||||||
|
|
||||||
if("directives")
|
if("directives")
|
||||||
p.directives()
|
p.directives()
|
||||||
|
|
||||||
@@ -53,10 +53,10 @@
|
|||||||
|
|
||||||
if("medical records")
|
if("medical records")
|
||||||
p.med_records()
|
p.med_records()
|
||||||
|
|
||||||
if("security records")
|
if("security records")
|
||||||
p.sec_records()
|
p.sec_records()
|
||||||
|
|
||||||
if("remote signaler")
|
if("remote signaler")
|
||||||
p.remote_signal()
|
p.remote_signal()
|
||||||
|
|
||||||
@@ -364,7 +364,9 @@
|
|||||||
pai_fold_display.icon_state = "unfolded"
|
pai_fold_display.icon_state = "unfolded"
|
||||||
|
|
||||||
/mob/living/silicon/pai/toggle_hud_vis(full)
|
/mob/living/silicon/pai/toggle_hud_vis(full)
|
||||||
|
if(!client)
|
||||||
|
return FALSE
|
||||||
|
|
||||||
if(hud_used.hud_shown)
|
if(hud_used.hud_shown)
|
||||||
hud_used.hud_shown = 0
|
hud_used.hud_shown = 0
|
||||||
if(hud_used.adding)
|
if(hud_used.adding)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
else if(M.CanStumbleVore(src))
|
else if(M.CanStumbleVore(src))
|
||||||
visible_message("<span class='warning'>[M] flops carlessly into [src]!</span>")
|
visible_message("<span class='warning'>[M] flops carlessly into [src]!</span>")
|
||||||
perform_the_nom(M,src,M,M.vore_selected,1)
|
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>")
|
visible_message("<span class='warning'>[M] carelessly bowls [src] over!</span>")
|
||||||
M.forceMove(get_turf(src))
|
M.forceMove(get_turf(src))
|
||||||
M.apply_damage(0.5, BRUTE)
|
M.apply_damage(0.5, BRUTE)
|
||||||
|
|||||||
Reference in New Issue
Block a user