From 865b6a5b3a669437714aff6bcc93ba3a83a44c30 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 26 Sep 2018 08:03:59 -0500 Subject: [PATCH] Finished code --- code/modules/clothing/shoes/_shoes.dm | 8 +++++--- .../mob/living/carbon/human/species.dm | 4 ---- .../mob/living/carbon/human/update_icons.dm | 12 +++++------- code/modules/surgery/bodyparts/helpers.dm | 8 ++++---- modular_citadel/icons/mob/digishoes.dmi | Bin 21713 -> 22751 bytes 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index daaf0836e7..31ed69254b 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -16,8 +16,8 @@ var/equipped_before_drop = FALSE //CITADEL EDIT Enables digitigrade shoe styles - adjusted = NORMAL_STYLE - alternate_worn_icon = 'modular_citadel/icons/mob/digishoes.dmi' + var/adjusted = NORMAL_STYLE + var/mutantrace_variation = MUTANTRACE_VARIATION /obj/item/clothing/shoes/ComponentInitialize() . = ..() @@ -63,11 +63,13 @@ worn_y_dimension -= (offset * 2) user.update_inv_shoes() equipped_before_drop = TRUE + if(mutantrace_variation && ishuman(user)) var/mob/living/carbon/human/H = user if(DIGITIGRADE in H.dna.species.species_traits) adjusted = DIGITIGRADE_STYLE - H.update_inv_shoes() + else if(adjusted == DIGITIGRADE_STYLE) + adjusted = NORMAL_STYLE /obj/item/clothing/shoes/proc/restore_offsets(mob/user) equipped_before_drop = FALSE diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 5a37007271..52661fae6d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -917,10 +917,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) return FALSE if(num_legs < 2) return FALSE - if(DIGITIGRADE in species_traits) - if(!disable_warning) - to_chat(H, "The footwear around here isn't compatible with your feet!") - return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) if(SLOT_BELT) if(H.belt) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 79705764de..53c45d199f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -274,6 +274,11 @@ There are several things that need to be remembered: if(hud_used.inventory_shown) //if the inventory is open client.screen += shoes //add it to client's screen update_observer_view(shoes,1) + if(S.adjusted == DIGITIGRADE_STYLE) + S.icon_override = 'modular_citadel/icons/mob/digishoes.dmi' + else if(S.adjusted == NORMAL_STYLE) + S.icon_override = null + overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.icon_override) ? shoes.icon_override : 'icons/mob/feet.dmi')) var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER] if(OFFSET_SHOES in dna.species.offset_features) @@ -282,13 +287,6 @@ There are several things that need to be remembered: overlays_standing[SHOES_LAYER] = shoes_overlay apply_overlay(SHOES_LAYER) -var/obj/item/clothing/shoes/S = H.shoes - if(swap_back) - S.adjusted = NORMAL_STYLE - else - S.adjusted = DIGITIGRADE_STYLE - H.update_inv_w_uniform() - /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index e884895c1b..d5ee3466d4 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -301,7 +301,7 @@ if(H.shoes) var/obj/item/clothing/shoes/S = H.shoes if(swap_back) - S.adjusted = NORMAL_STYLE - else - S.adjusted = DIGITIGRADE_STYLE - H.update_inv_w_uniform() + S.adjusted = NORMAL_STYLE + else + S.adjusted = DIGITIGRADE_STYLE + H.update_inv_shoes() diff --git a/modular_citadel/icons/mob/digishoes.dmi b/modular_citadel/icons/mob/digishoes.dmi index 02c9232963c6dff04f4e21a6957d5b098db8d1f7..49988f88f6eb31766a6aa5d952762094eadbcd28 100644 GIT binary patch delta 4441 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