From 1ebc09e0d1f348328c557867a2ca58fbd1d762be Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 14 Jun 2020 05:42:09 -0300 Subject: [PATCH] Fixes some issues with the latest xeno loadout update (#9130) --- code/game/objects/items/tajara.dm | 1 - .../client/preference_setup/loadout/loadout_xeno/tajara.dm | 2 +- code/modules/clothing/under/accessories/xeno/tajara.dm | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm index 4ca4320f569..45d14a670fb 100644 --- a/code/game/objects/items/tajara.dm +++ b/code/game/objects/items/tajara.dm @@ -97,7 +97,6 @@ icon_state = "adhomai_clock" item_state = "adhomai_clock" contained_sprite = TRUE - slot_flags = SLOT_TIE /obj/item/pocketwatch/adhomai/checktime(mob/user) set category = "Object" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index b6c6b69030a..4defb53fe4b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -226,7 +226,7 @@ flags = GEAR_HAS_DESC_SELECTION /datum/gear/accessory/adhomai_pocketwatch - display_name = "adhomian lighter" + display_name = "adhomian watch" path = /obj/item/pocketwatch/adhomai sort_category = "Xenowear - Tajara" whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index fa3fec66238..355ac92798b 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -212,8 +212,8 @@ /obj/item/clothing/accessory/badge/nka_passport name = "new kingdom of adhomai passport" desc = "A passport issued to the citizens of the New Kingdom of Adhomai." - icon_state = "dpra-passport" - overlay_state = "dpra-passport" + icon_state = "nka-passport" + overlay_state = "nka-passport" slot_flags = null w_class = ITEMSIZE_TINY flippable = FALSE