cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from VOREStation/bored,_fix_polaris

Browse Source 
Fixes two high-priority issues
This commit is contained in:
Datraen
2016-05-19 14:29:46 -04:00
parent a87c8de3fd a50286e5e8
commit ec3e4a0315
12 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/death.dm
View File

@@ -85,6 +85,7 @@
dead_mob_list |= src
updateicon()
handle_regular_hud_updates()
if(ticker && ticker.mode)
ticker.mode.check_win()

2
code/modules/mob/living/carbon/human/death.dm
View File

@@ -31,8 +31,6 @@
BITSET(hud_updateflag, STATUS_HUD)
BITSET(hud_updateflag, LIFE_HUD)
handle_hud_list()
//Handle species-specific deaths.
species.handle_death(src)
animate_tail_stop()

4
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1557,7 +1557,7 @@
/mob/living/carbon/human/proc/handle_hud_list()
if (BITTEST(hud_updateflag, HEALTH_HUD))
var/image/holder = hud_list[HEALTH_HUD]
if(stat == 2)
if(stat == DEAD)
holder.icon_state = "hudhealth-100" // X_X
else
var/percentage_health = RoundHealth((health-config.health_threshold_crit)/(maxHealth-config.health_threshold_crit)*100)
@@ -1581,7 +1581,7 @@
var/image/holder = hud_list[STATUS_HUD]
var/image/holder2 = hud_list[STATUS_HUD_OOC]
if(stat == 2)
if(stat == DEAD)
holder.icon_state = "huddead"
holder2.icon_state = "huddead"
else if(status_flags & XENO_HOST)

12
code/modules/mob/living/carbon/human/stripping.dm
View File

@@ -13,22 +13,22 @@
// Handle things that are part of this interface but not removing/replacing a given item.
if("pockets")
visible_message("<span class='danger'>\The [user] is trying to empty \the [src]'s pockets!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY,src))
empty_pockets(user)
return
if("splints")
visible_message("<span class='danger'>\The [user] is trying to remove \the [src]'s splints!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY,src))
remove_splints(user)
return
if("sensors")
visible_message("<span class='danger'>\The [user] is trying to set \the [src]'s sensors!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY,src))
toggle_sensors(user)
return
if("internals")
visible_message("<span class='danger'>\The [usr] is trying to set \the [src]'s internals!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY,src))
toggle_internals(user)
return
if("tie")
@@ -40,7 +40,7 @@
return
visible_message("<span class='danger'>\The [usr] is trying to remove \the [src]'s [A.name]!</span>")
if(!do_after(user,HUMAN_STRIP_DELAY))
if(!do_after(user,HUMAN_STRIP_DELAY,src))
return
if(!A || suit.loc != src || !(A in suit.accessories))
@@ -74,7 +74,7 @@
else
visible_message("<span class='danger'>\The [user] is trying to put \a [held] on \the [src]!</span>")
if(!do_after(user,HUMAN_STRIP_DELAY))
if(!do_after(user,HUMAN_STRIP_DELAY,src))
return
if(!stripping && user.get_active_hand() != held)

3
code/modules/mob/living/life.dm
View File

@@ -53,8 +53,7 @@
update_canmove()
if(client)
handle_regular_hud_updates()
handle_regular_hud_updates()
/mob/living/proc/handle_breathing()
return