cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic pistol, nutriment and sprites fixes (#1617)

Browse Source 
-fix #1217
-fix being unable to put the tactical pistol into belts/holsters, also remove needless code from it
-fix the scout rifle not accepting other magazines
-fix the hardsuit nutriment being useless and just dealing minor toxin damage
-fix missing tactical masks and tapes from unathi and tajaran sprites
-fix tapes cuffs, blinders and etc not updating when equiped to said mob
-some extra tweaks to the hud code
This commit is contained in:
Alberyk
2017-01-21 17:23:11 +02:00
committed by skull132
parent 58dc6dde9e
commit 68dc556434
13 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+5 -5
View File
@@ -1393,7 +1393,7 @@
/mob/living/carbon/human/proc/handle_hud_list()
if (BITTEST(hud_updateflag, HEALTH_HUD)&& hud_list[HEALTH_HUD])
if (BITTEST(hud_updateflag, HEALTH_HUD) && hud_list[HEALTH_HUD])
var/image/holder = hud_list[HEALTH_HUD]
if(stat == DEAD)
holder.icon_state = "hudhealth-100" // X_X
@@ -1410,7 +1410,7 @@
holder.icon_state = "hud[percentage_health]"
hud_list[HEALTH_HUD] = holder
if (BITTEST(hud_updateflag, LIFE_HUD)&& hud_list[LIFE_HUD])
if (BITTEST(hud_updateflag, LIFE_HUD) && hud_list[LIFE_HUD])
var/image/holder = hud_list[LIFE_HUD]
if(stat == DEAD)
holder.icon_state = "huddead"
@@ -1418,7 +1418,7 @@
holder.icon_state = "hudhealthy"
hud_list[LIFE_HUD] = holder
if (BITTEST(hud_updateflag, STATUS_HUD)&& hud_list[STATUS_HUD] && hud_list[STATUS_HUD_OOC])
if (BITTEST(hud_updateflag, STATUS_HUD) && hud_list[STATUS_HUD] && hud_list[STATUS_HUD_OOC])
var/foundVirus = 0
for(var/datum/disease/D in viruses)
if(!D.hidden[SCANNER])
@@ -1459,9 +1459,9 @@
hud_list[STATUS_HUD] = holder
hud_list[STATUS_HUD_OOC] = holder2
if (BITTEST(hud_updateflag, ID_HUD) && hud_list[WANTED_HUD])
if (BITTEST(hud_updateflag, ID_HUD) && hud_list[ID_HUD])
var/image/holder = hud_list[ID_HUD]
//The following function is found in code/defines/procs/hud.dm
holder.icon_state = get_sec_hud_icon(src)
hud_list[ID_HUD] = holder