cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/screen_objects.dm
+4 -4
View File
@@ -558,12 +558,12 @@
if (user.max_stamina == -1 || user.stamina == user.max_stamina)
if (user.stamina_bar)
QDEL_NULL(user.stamina_bar)
return
else
if (!user.stamina_bar)
user.stamina_bar = new(user, user.max_stamina, src)
if (!user.stamina_bar)
user.stamina_bar = new(user, user.max_stamina, src)
user.stamina_bar.update(user.stamina)
user.stamina_bar.update(user.stamina)
if (user.m_intent == "run")
icon_state = "running"
else