mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 18:13:34 +01:00
- You can now light your cigarette with an energy sword :)
- Fixed the problem where suits appeared on the UI even with the inventory closed. The call to other_update() in update_clothing() must be done after all the icon slots get updated. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3725 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -863,10 +863,6 @@
|
||||
client.screen -= hud_used.intents
|
||||
client.screen -= hud_used.mov_int
|
||||
|
||||
|
||||
//Screenlocs for these slots are handled by the huds other_update()
|
||||
//because theyre located on the 'other' inventory bar.
|
||||
|
||||
// Gloves
|
||||
if (gloves)
|
||||
var/t1 = gloves.item_state
|
||||
@@ -977,7 +973,6 @@
|
||||
back.screen_loc = ui_back
|
||||
|
||||
if(client)
|
||||
hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
|
||||
client.screen -= contents
|
||||
client.screen += contents
|
||||
//to hide / show them.
|
||||
@@ -1043,6 +1038,11 @@
|
||||
overlays += image("icon" = stain_icon, "layer" = B_SUIT_LAYER)
|
||||
wear_suit.screen_loc = ui_oclothing
|
||||
|
||||
//Update_other() MUST be called after all the storage slots get updated. This is because all the storage slots assign their
|
||||
//respective items a screen_loc, which other_update() will then override if needed.
|
||||
if(client)
|
||||
hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
|
||||
|
||||
switch(shielded)
|
||||
if(1)
|
||||
overlays += image("icon" = 'effects.dmi', "icon_state" = "shield", "layer" = SHIELD_LAYER)
|
||||
|
||||
Reference in New Issue
Block a user