cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
This commit is contained in:
PsiOmega
2015-05-05 08:11:28 +02:00
parent 8294f02c1b 864d40d1c4
commit 151c5204ee
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/hud.dm
+1
View File
@@ -341,6 +341,7 @@ datum/hud/New(mob/owner)
if(src.hud_used.item_action_list)
src.client.screen -= src.hud_used.item_action_list
src.client.screen -= src.internals
src.client.screen += src.hud_used.action_intent //we want the intent swticher visible
else
hud_used.hud_shown = 1
if(src.hud_used.adding)