cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9086 from RavingManiac/master

Browse Source 
Intent menu appears on zoom
This commit is contained in:
Chinsky
2015-05-04 21:24:06 +03:00
parent d86dd60c63 a35f2c0ad6
commit 587015ff4e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/_onclick/hud/hud.dm
View File

@@ -259,11 +259,11 @@ datum/hud/New(mob/owner)
if(!hud_used) if(!hud_used)
usr << "\red This mob type does not use a HUD." usr << "\red This mob type does not use a HUD."
return return
if(!ishuman(src)) if(!ishuman(src))
usr << "\red Inventory hiding is currently only supported for human mobs, sorry." usr << "\red Inventory hiding is currently only supported for human mobs, sorry."
return return
if(!client) return if(!client) return
if(client.view != world.view) if(client.view != world.view)
return return
@@ -325,7 +325,7 @@ datum/hud/New(mob/owner)
return return
if(client.view != world.view) if(client.view != world.view)
return return
if(hud_used.hud_shown) if(hud_used.hud_shown)
hud_used.hud_shown = 0 hud_used.hud_shown = 0
if(src.hud_used.adding) if(src.hud_used.adding)
@@ -337,6 +337,7 @@ datum/hud/New(mob/owner)
if(src.hud_used.item_action_list) if(src.hud_used.item_action_list)
src.client.screen -= src.hud_used.item_action_list src.client.screen -= src.hud_used.item_action_list
src.client.screen -= src.internals src.client.screen -= src.internals
src.client.screen += src.hud_used.action_intent //we want the intent swticher visible
else else
hud_used.hud_shown = 1 hud_used.hud_shown = 1
if(src.hud_used.adding) if(src.hud_used.adding)

3
html/changelogs/RavingManiac-master.yml
View File

@@ -2,4 +2,5 @@ author: RavingManiac
delete-after: True delete-after: True
changes: changes:
- tweak: "Candles now burn for about 30 mintutes." - tweak: "Candles now burn for about 30 minutes."
- tweak: "Intent menu now appears while zooming with a sniper rifle."