TG: - 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.
Revision: r3725
Author: 	 baloh.matevz
This commit is contained in:
Erthilo
2012-06-06 23:56:43 +01:00
parent d4810cb90c
commit f5475afcc2
2 changed files with 70 additions and 60 deletions
@@ -935,10 +935,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
var/datum/organ/external/lo = organs["l_hand"]
var/datum/organ/external/ro = organs["r_hand"]
@@ -1060,9 +1056,10 @@
clothing_overlays += image("icon" = 'back.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = BACK_LAYER)
back.screen_loc = ui_back
if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
//to hide / show them.
// WHAT IS THIS DOING IN UPDATE_CLOTHING(), AHHHHHHHHHHHHH
if(client)
client.screen -= contents
client.screen += contents
//to hide / show them.
if (handcuffed)
pulling = null
var/h1 = handcuffed.icon_state
@@ -1121,6 +1118,11 @@
clothing_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)