cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 15:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Made belts go under coats." This caused weird icon runtimes and caused cameras to crash the server. Sorry!

Browse Source 
This reverts commit 3dfcb96c98.
This commit is contained in:
Ren Erthilo
2012-04-29 22:25:22 +01:00
parent 7457b6fe19
commit 6c7bb19d5e
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1098,8 +1098,7 @@
else
m_select.screen_loc = null
var/suit_img //A bit of kludge to make belts go under coats, but on other suits
var/suit_stain
if (wear_suit)
/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
src << "\red You burst out of the [wear_suit.name]!"
@@ -1113,7 +1112,7 @@
c:layer = initial(c:layer)*/
if (istype(wear_suit, /obj/item/clothing/suit))
var/t1 = wear_suit.icon_state
suit_img = image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
if (wear_suit)
if (wear_suit.blood_DNA)
var/icon/stain_icon = null
@@ -1123,7 +1122,7 @@
stain_icon = icon('blood.dmi', "coatblood[!lying ? "" : "2"]")
else
stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
suit_stain = image("icon" = stain_icon, "layer" = MOB_LAYER)
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
wear_suit.screen_loc = ui_oclothing
if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
if (handcuffed)
@@ -1137,24 +1136,6 @@
hand = 0
drop_item()
hand = h
// Belt
var/belt_img //A bit of kludge to make belts go under coats, but on other suits
if (belt)
var/t1 = belt.item_state
if (!t1)
t1 = belt.icon_state
belt_img = image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
belt.screen_loc = ui_belt
//A bit of kludge to make belts go under coats, but on other suits
if (istype(wear_suit, /obj/item/clothing/suit/storage/det_suit) || istype(wear_suit, /obj/item/clothing/suit/storage/labcoat))
overlays += belt_img
overlays += suit_img
overlays += suit_stain
else
overlays += suit_img
overlays += suit_stain
overlays += belt_img
if (lying)
@@ -1188,6 +1169,13 @@
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
head.screen_loc = ui_head
// Belt
if (belt)
var/t1 = belt.item_state
if (!t1)
t1 = belt.icon_state
overlays += image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
belt.screen_loc = ui_belt
if ((wear_mask && !(wear_mask.see_face)) || (head && !(head.see_face))) // can't see the face
if (wear_id)