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

- Fixed the old iconset's equip button fitting a million batons into your suit storage slot.

Browse Source 
- Fixed aliens not being able to tell which hand they have selected

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3913 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-06-24 14:27:58 +00:00
parent ae23c7387b
commit 159ff955a6
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/alien/humanoid/hud.dm
View File

@@ -119,24 +119,28 @@
using.layer = 19
src.adding += using
//r hand
using = new src.h_type( src )
using.name = "r_hand"
using.dir = WEST
using.icon = 'screen1_alien.dmi'
using.icon_state = "equip"
using.icon_state = "hand_inactive"
if(mymob && !mymob.hand) //This being 0 or null means the right hand is in use
using.icon_state = "hand_active"
using.screen_loc = ui_rhand
using.layer = 19
src.r_hand_hud_object = using
src.adding += using
//l hand
using = new src.h_type( src )
using.name = "l_hand"
using.dir = EAST
using.icon = 'screen1_alien.dmi'
using.icon_state = "equip"
using.icon_state = "hand_inactive"
if(mymob && mymob.hand) //This being 1 means the left hand is in use
using.icon_state = "hand_active"
using.screen_loc = ui_lhand
using.layer = 19
src.l_hand_hud_object = using
src.adding += using
//pocket 1

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

@@ -122,7 +122,7 @@
//Suit storage
var/confirm
if (wear_suit)
if (!s_store && wear_suit)
if(wear_suit.allowed)
if (istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
confirm = 1