diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index 00c18156efa..410555b4bc9 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -232,8 +232,8 @@ shoes = /obj/item/clothing/shoes/jackboots species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/jackboots/toeless, - SPECIES_TAJARA = /obj/item/clothing/shoes/tajara/jackboots, - SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/tajara/jackboots + SPECIES_TAJARA = /obj/item/clothing/shoes/jackboots/tajara, + SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/tajara ) r_pocket = null l_hand = null diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 3d34e91cb67..5cacb8d05a1 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -327,9 +327,6 @@ if(!opened) to_chat(user, SPAN_NOTICE("\The [src] is closed.")) return - if(!use_check(M)) - to_chat(usr, SPAN_WARNING("[M.name] is in no condition to handle items!")) - return if(target_zone == BP_MOUTH && contents.len > 0) var/obj/item/clothing/mask/smokable/cigarette/W = new cigarette_to_spawn(M) if(!istype(W) || M.wear_mask) @@ -338,6 +335,9 @@ to_chat(M, SPAN_NOTICE("\The [M.wear_mask] is in the way.")) return if(M != user) + if(use_check(M)) + to_chat(user, SPAN_WARNING("[M.name] is in no condition to handle items!")) + return var/response = "" user.visible_message(SPAN_NOTICE("\The [user] holds up \the [src] to \the [M]'s mouth."), SPAN_NOTICE("You hold up \the [src] to \the [M]'s mouth, waiting for them to accept.")) response = alert(M, "\The [user] offers you \a [W.name]. Do you accept?", "Smokable offer", "Accept", "Decline") diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index d15fed95899..33bf31d5bd2 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -711,13 +711,13 @@ /obj/structure/closet/crate/secure/gear_loadout/pvsm/fill() new /obj/item/clothing/under/tajaran/pvsm(src) - new /obj/item/clothing/shoes/tajara/jackboots(src) + new /obj/item/clothing/shoes/jackboots/tajara(src) new /obj/item/clothing/under/tajaran/pvsm(src) - new /obj/item/clothing/shoes/tajara/jackboots(src) + new /obj/item/clothing/shoes/jackboots/tajara(src) new /obj/item/clothing/under/tajaran/pvsm(src) - new /obj/item/clothing/shoes/tajara/jackboots(src) + new /obj/item/clothing/shoes/jackboots/tajara(src) new /obj/item/clothing/under/tajaran/pvsm/captain(src) - new /obj/item/clothing/shoes/tajara/jackboots(src) + new /obj/item/clothing/shoes/jackboots/tajara(src) new /obj/item/clothing/head/beret/tajaran/pvsm(src) new /obj/item/clothing/suit/space/void/dpra(src) new /obj/item/clothing/head/helmet/space/void/dpra(src) @@ -755,7 +755,7 @@ /obj/structure/closet/crate/secure/gear_loadout/pvsm/single/fill() new /obj/item/clothing/under/tajaran/pvsm(src) - new /obj/item/clothing/shoes/tajara/jackboots(src) + new /obj/item/clothing/shoes/jackboots/tajara(src) new /obj/item/clothing/suit/space/void/dpra(src) new /obj/item/clothing/head/helmet/space/void/dpra(src) new /obj/item/gun/projectile/automatic/rifle/dpra(src) diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm index 4ffbb10a8bc..dc3495ddbdf 100644 --- a/code/modules/asset_cache/asset_cache.dm +++ b/code/modules/asset_cache/asset_cache.dm @@ -668,7 +668,7 @@ var/list/asset_datums = list() Insert("pill[i]", 'icons/obj/chemical.dmi', "pill[i]") for (var/sprite in bottle_sprites) - Insert(sprite, icon('icons/obj/chemical.dmi', sprite)) + Insert(sprite, icon('icons/obj/item/reagent_containers/glass.dmi', sprite)) return ..() /datum/asset/spritesheet/accents diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index 3751f0e7cb5..f2fc0f421ed 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -8,8 +8,9 @@ /datum/gear/shoes/tajara/boots/New() ..() var/list/boots = list() - boots["jackboots, short"] = /obj/item/clothing/shoes/jackboots/tajara + boots["jackboots"] = /obj/item/clothing/shoes/jackboots/tajara boots["jackboots, cavalry"] = /obj/item/clothing/shoes/jackboots/tajara/cavalry + boots["jackboots, riding"] = /obj/item/clothing/shoes/jackboots/tajara/riding boots["workboots"] = /obj/item/clothing/shoes/workboots/tajara boots["brown workboots"] = /obj/item/clothing/shoes/workboots/tajara/brown boots["grey workboots"] = /obj/item/clothing/shoes/workboots/tajara/grey @@ -656,4 +657,4 @@ var/list/earrings = list() earrings["adhomian pearls earrings"] = /obj/item/clothing/ears/earring/tajara earrings["adhomian golden earrings"] = /obj/item/clothing/ears/earring/tajara/gold - gear_tweaks += new /datum/gear_tweak/path(earrings) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/path(earrings) diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 0a39dcd6d28..3a63f90eddc 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -128,6 +128,7 @@ icon = 'icons/obj/item/clothing/shoes/boots.dmi' icon_state = "combat" item_state = "combat" + contained_sprite = TRUE force = 5 armor = list( melee = ARMOR_MELEE_VERY_HIGH, diff --git a/code/modules/clothing/shoes/xeno/tajara.dm b/code/modules/clothing/shoes/xeno/tajara.dm index cc5be2af5a0..5ee13e823dd 100644 --- a/code/modules/clothing/shoes/xeno/tajara.dm +++ b/code/modules/clothing/shoes/xeno/tajara.dm @@ -20,39 +20,39 @@ /obj/item/clothing/shoes/flats/tajara desc = "A pair of black women's flats. Refitted for Tajara." name = "black dress flats" - icon_state = "flats_black" - item_state = "flats_black" + icon_state = "blackdf" + item_state = "blackdf" species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/shoes/flats/tajara/red desc = "A pair of red women's flats. Refitted for Tajara." name = "red dress flats" - icon_state = "flats_red" - item_state = "flats_red" + icon_state = "reddf" + item_state = "reddf" /obj/item/clothing/shoes/flats/tajara/blue desc = "A pair of blue women's flats. Refitted for Tajara." name = "blue dress flats" - icon_state = "flats_blue" - item_state = "flats_blue" + icon_state = "bluedf" + item_state = "bluedf" /obj/item/clothing/shoes/flats/tajara/green desc = "A pair of green women's flats. Refitted for Tajara." name = "green dress flats" - icon_state = "flats_green" - item_state = "flats_green" + icon_state = "greendf" + item_state = "greendf" /obj/item/clothing/shoes/flats/tajara/purple desc = "A pair of purple women's flats. Refitted for Tajara." name = "purple dress flats" - icon_state = "flats_purple" - item_state = "flats_purple" + icon_state = "purpledf" + item_state = "purpledf" /obj/item/clothing/shoes/flats/tajara/white desc = "A pair of white women's flats. Refitted for Tajara." name = "white dress flats" - icon_state = "flats_white" - item_state = "flats_white" + icon_state = "whitedf" + item_state = "whitedf" // these look completely different and should be called something else @@ -79,9 +79,10 @@ // Jackboots -/obj/item/clothing/shoes/tajara/jackboots // Because yes, Tajara don't leave their toes out all the time. - name = "black boots" +/obj/item/clothing/shoes/jackboots/tajara // Because yes, Tajara don't leave their toes out all the time. + name = "jackboots" desc = "Tall synthleather boots with an artificial shine. Fitted for Tajara." + icon_supported_species_tags = list("taj") species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/shoes/jackboots/tajara/cavalry @@ -90,6 +91,12 @@ icon_state = "cavalryboots" item_state = "cavalryboots" +/obj/item/clothing/shoes/jackboots/tajara/riding + name = "riding jackboots" + desc = "Knee-high riding synthleather boots with an artificial shine. Fitted for Tajara" + icon_state = "ridingboots" + item_state = "ridingboots" + /obj/item/clothing/shoes/workboots/tajara name = "workboots" desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first. Fitted for Tajara." @@ -126,6 +133,7 @@ desc = "A pair of Tajaran boots designed for the rough terrain of Adhomai." icon_state = "adhomian_boots" item_state = "adhomian_boots" + icon_supported_species_tags = null contained_sprite = TRUE /obj/item/clothing/shoes/tajara/fancy @@ -167,6 +175,8 @@ /obj/item/clothing/shoes/heels/tajara/red name = "red high-heeled adhomian shoes" desc = "A pair of red heels adapted specifically for tajara anatomy, in the latest style." + icon_state = "heels_red" + item_state = "heels_red" /obj/item/clothing/shoes/sneakers/black/tajara name = "black saddle shoes" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 38a81e11b69..1d2b6bbc209 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -193,8 +193,8 @@ /obj/item/clothing/accessory/holster/utility name = "utility holster" desc = "A utility holster." - icon = 'icons/obj/item/clothing/accessory/utility_holsters.dmi' - + icon_state = "holster" + item_state = "holster" var/list/allowed_items = list() // A list of allowed items. /obj/item/clothing/accessory/holster/utility/holster(var/obj/item/I, var/mob/living/user) @@ -222,15 +222,15 @@ /obj/item/clothing/accessory/holster/utility/custodial/armpit name = "brown custodial armpit holster" desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel." - icon_state = "custodial_brown" - item_state = "custodial_brown" + icon_state = "holster_brown" + item_state = "holster_brown" // Brown Custodial Hip Holster /obj/item/clothing/accessory/holster/utility/custodial/hip name = "brown custodial hip holster" desc = "A brown utility holster which can't hold actual firearms. This particular one is designed for custodial personnel." - icon_state = "custodial_brown_hip" - item_state = "custodial_brown_hip" + icon_state = "holster_brown_hip" + item_state = "holster_brown_hip" /obj/item/clothing/accessory/holster/utility/machete name = "machete sheath" diff --git a/html/changelogs/wezzy_22-9-23-Fixes.yml b/html/changelogs/wezzy_22-9-23-Fixes.yml new file mode 100644 index 00000000000..99987f35af8 --- /dev/null +++ b/html/changelogs/wezzy_22-9-23-Fixes.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes invisible tajaran shoes and invisible holsters." + - bugfix: "Fixes Koi arm tattoos being on the wrong arms." + - bugfix: "Fixes Chemmaster bottle sprites." diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi index 408a5aff52b..a9b0bed9536 100644 Binary files a/icons/mob/human_races/markings.dmi and b/icons/mob/human_races/markings.dmi differ diff --git a/icons/obj/item/clothing/accessory/holster.dmi b/icons/obj/item/clothing/accessory/holster.dmi index c8732014245..162f0601446 100644 Binary files a/icons/obj/item/clothing/accessory/holster.dmi and b/icons/obj/item/clothing/accessory/holster.dmi differ diff --git a/icons/obj/item/clothing/accessory/utility_holsters.dmi b/icons/obj/item/clothing/accessory/utility_holsters.dmi deleted file mode 100644 index 59393b4a107..00000000000 Binary files a/icons/obj/item/clothing/accessory/utility_holsters.dmi and /dev/null differ diff --git a/maps/away/ships/tajara/circus/adhomian_circus_items.dm b/maps/away/ships/tajara/circus/adhomian_circus_items.dm index dd67ad92464..5892681d214 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus_items.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus_items.dm @@ -24,7 +24,7 @@ item_state = "ringmastercoat" contained_sprite = TRUE -/obj/item/clothing/shoes/tajara/jackboots/ringmaster +/obj/item/clothing/shoes/jackboots/tajara/ringmaster name = "ringmaster boots" desc = "Comfortable and fancy boots meant for a Tajara." icon = 'maps/away/ships/tajara/circus/circus_sprites.dmi' @@ -428,4 +428,4 @@ if(HULK in user.mutations) return TRUE else - return FALSE \ No newline at end of file + return FALSE diff --git a/maps/away/ships/tajara/circus/adhomian_circus_roles.dm b/maps/away/ships/tajara/circus/adhomian_circus_roles.dm index 821dd183cbd..1364a6a99f4 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus_roles.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus_roles.dm @@ -34,7 +34,7 @@ uniform = /obj/item/clothing/under/service_overalls back = /obj/item/storage/backpack/satchel - shoes = /obj/item/clothing/shoes/tajara/jackboots + shoes = /obj/item/clothing/shoes/jackboots/tajara /datum/ghostspawner/human/adhomian_circus/ringmaster short_name = "adhomian_circus_ringmaster" @@ -56,7 +56,7 @@ name = "Adhomian Circus Ringmaster" uniform = /obj/item/clothing/under/ringmaster - shoes = /obj/item/clothing/shoes/tajara/jackboots/ringmaster + shoes = /obj/item/clothing/shoes/jackboots/tajara/ringmaster head = /obj/item/clothing/head/that/ringmaster suit = /obj/item/clothing/suit/storage/ringmaster @@ -104,7 +104,7 @@ name = "Adhomian Circus Tamer" uniform = /obj/item/clothing/under/tamer - shoes = /obj/item/clothing/shoes/tajara/jackboots + shoes = /obj/item/clothing/shoes/jackboots/tajara belt = /obj/item/melee/whip accessory = /obj/item/clothing/accessory/holster/hip/brown