From 5204348ce6419cb99f4c8a473a3785ed0edaffb1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 24 Nov 2016 23:22:58 -0600 Subject: [PATCH] Corrects magboots and the shoe toggle thing --- code/modules/clothing/clothing.dm | 6 +++--- code/modules/clothing/shoes/magboots.dm | 1 + code/modules/mob/living/carbon/human/update_icons.dm | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a2e5e48a369..68dc3c25ceb 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -380,7 +380,7 @@ var/can_hold_knife = 0 var/obj/item/holding - var/show_above_pants = 1 + var/shoes_under_pants = 0 permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN @@ -437,10 +437,10 @@ set name = "Switch Shoe Layer" set category = "Object" - if(show_above_pants == -1) + if(shoes_under_pants == -1) usr << "\The [src] cannot be worn above your suit!" return - show_above_pants = !show_above_pants + shoes_under_pants = !shoes_under_pants update_icon() /obj/item/clothing/shoes/update_icon() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 0f862f4c53f..19eda1a1ddb 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -6,6 +6,7 @@ species_restricted = null force = 3 overshoes = 1 + shoes_under_pants = -1 //These things are huge var/magpulse = 0 var/icon_base = "magboots" action_button_name = "Toggle Magboots" diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6a54cc93e71..3f4c00f8a57 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -646,11 +646,12 @@ var/global/list/damage_icon_parts = list() var/shoe_layer = SHOES_LAYER if(istype(shoes, /obj/item/clothing/shoes)) var/obj/item/clothing/shoes/ushoes = shoes - if(ushoes.show_above_pants) + if(ushoes.shoes_under_pants == 1) overlays_standing[SHOES_LAYER] = null shoe_layer = SHOES_LAYER_ALT else overlays_standing[SHOES_LAYER_ALT] = null + shoe_layer = SHOES_LAYER if(shoes.blood_DNA) var/image/bloodsies = image("icon" = species.get_blood_mask(src), "icon_state" = "shoeblood")