diff --git a/code/datums/trading/unique.dm b/code/datums/trading/unique.dm index 33c4f6e1bb7..7c8a178d6ac 100644 --- a/code/datums/trading/unique.dm +++ b/code/datums/trading/unique.dm @@ -44,7 +44,6 @@ /obj/item/storage/box/syndie_kit = TRADER_SUBTYPES_ONLY, /obj/item/syndie/c4explosive = TRADER_ALL, /obj/item/melee/energy/sword = TRADER_ALL, - /obj/item/melee/energy/sword/color = TRADER_BLACKLIST, /obj/item/melee/energy/axe = TRADER_THIS_TYPE, /obj/item/shield/energy = TRADER_ALL, /obj/item/clothing/gloves/force/syndicate = TRADER_THIS_TYPE, diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index f5f835f7101..6fb22275349 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -1835,8 +1835,8 @@ /obj/machinery/vending/ramen name = "ramen vendor" desc = "A generic brand vending machine capable of cooking tonkotsu ramen at the push of a button. Truly a pinnacle of human engineering!" - icon_state = "ramenvend" - icon_vend = "ramenvend" + icon_state = "ramen" + icon_vend = "ramen-vend" product_slogans = "Irasshaimase!" vend_id = "ramen" products = list( diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 18047f1e08f..bdf27c72592 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -291,6 +291,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' contained_sprite = TRUE + item_state = "electronic" /atom/proc/get_cell() return DEVICE_NO_CELL diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index fbb18ba70c4..90be70bb91f 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "plastic-explosive0" item_state = "plasticx" + contained_sprite = TRUE item_flags = ITEM_FLAG_NO_BLUDGEON w_class = WEIGHT_CLASS_SMALL origin_tech = list(TECH_ILLEGAL = 2) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 889b45e335e..e83aa16223e 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -76,10 +76,7 @@ update_icon() /obj/item/implanter/ipc_tag/update_icon() - if(ipc_tag) - icon_state = "cimplanter1" - else - icon_state = "cimplanter0" + icon_state = "implanter-[ipc_tag ? "1" : "0"]" return /obj/item/implanter/ipc_tag/attack(mob/living/target_mob, mob/living/user, target_zone) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 85cd0abd0cf..d774e273a4e 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -219,7 +219,6 @@ * Energy Sword */ /obj/item/melee/energy/sword - color name = "energy sword" desc = "An energy sword. Quite rare, very dangerous." desc_antag = "The energy sword is a very strong melee weapon, capable of severing limbs easily, if they are targeted. It can also has a chance \ @@ -245,19 +244,24 @@ base_block_chance = 30 var/blade_color -/obj/item/melee/energy/sword/New() +/obj/item/melee/energy/sword/Initialize(mapload, ...) + . = ..() blade_color = pick("red","blue","green","purple") -/obj/item/melee/energy/sword/green/New() +/obj/item/melee/energy/sword/green/Initialize(mapload, ...) + . = ..() blade_color = "green" -/obj/item/melee/energy/sword/red/New() +/obj/item/melee/energy/sword/red/Initialize(mapload, ...) + . = ..() blade_color = "red" -/obj/item/melee/energy/sword/blue/New() +/obj/item/melee/energy/sword/blue/Initialize(mapload, ...) + . = ..() blade_color = "blue" -/obj/item/melee/energy/sword/purple/New() +/obj/item/melee/energy/sword/purple/Initialize(mapload, ...) + . = ..() blade_color = "purple" /obj/item/melee/energy/sword/activate(mob/living/user) diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm index 5fc8f863059..b043f39de08 100644 --- a/code/game/objects/structures/therapy.dm +++ b/code/game/objects/structures/therapy.dm @@ -1,8 +1,9 @@ /obj/item/mesmetron name = "mesmetron pocketwatch" desc = "An elaborate pocketwatch, with a captivating gold etching and an enchanting face. . ." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/item/clothing/wrists/wrist.dmi' icon_state = "pocketwatch" + item_state = "pocketwatch" drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50) diff --git a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm index 24f76ebaa21..146f6ad1a3b 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm @@ -374,7 +374,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/tees display_name = "skrellian wetshirts" - path = /obj/item/clothing/under/tshirt/skrell + path = /obj/item/clothing/under/dressshirt/tshirt/skrell/ocean whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -382,20 +382,20 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/tees/New() ..() var/list/tees = list() - tees["ocean wetshirt"] = /obj/item/clothing/under/tshirt/skrell/ocean - tees["maelstrom wetshirt"] = /obj/item/clothing/under/tshirt/skrell/maelstrom - tees["reef wetshirt"] = /obj/item/clothing/under/tshirt/skrell/reef - tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula - tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/purple - tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/teal - tees["black eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/black - tees["white eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/white - tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/nralakk + tees["ocean wetshirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/ocean + tees["maelstrom wetshirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/maelstrom + tees["reef wetshirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/reef + tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula + tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/purple + tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal + tees["black eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/black + tees["white eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/white + tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/nralakk gear_tweaks += new /datum/gear_tweak/path(tees) /datum/gear/accessory/skrell/dress display_name = "skrellian formal wetshirts" - path = /obj/item/clothing/under/dressshirt/skrell + path = /obj/item/clothing/under/dressshirt/skrell/ocean whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/factions/nralakk.dm b/code/modules/clothing/factions/nralakk.dm index f1e09d9074c..858b568ade1 100644 --- a/code/modules/clothing/factions/nralakk.dm +++ b/code/modules/clothing/factions/nralakk.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/dressshirt/skrell +ABSTRACT_TYPE(/obj/item/clothing/under/dressshirt/skrell) desc = "A formal wetshirt in Skrell style." icon = 'icons/obj/item/clothing/under/shirt/skrell_casual.dmi' @@ -20,60 +20,59 @@ icon_state = "reef_dressshirt" item_state = "reef_dressshirt" -/obj/item/clothing/under/tshirt/skrell +ABSTRACT_TYPE(/obj/item/clothing/under/dressshirt/tshirt/skrell) icon = 'icons/obj/item/clothing/under/shirt/skrell_casual.dmi' desc = "A wetshirt in Skrell style." - contained_sprite = TRUE -/obj/item/clothing/under/tshirt/skrell/ocean +/obj/item/clothing/under/dressshirt/tshirt/skrell/ocean name = "ocean wetshirt" desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "ocean_tee" item_state = "ocean_tee" -/obj/item/clothing/under/tshirt/skrell/maelstrom +/obj/item/clothing/under/dressshirt/tshirt/skrell/maelstrom name = "maelstrom wetshirt" desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "maelstrom_tee" item_state = "maelstrom_tee" -/obj/item/clothing/under/tshirt/skrell/reef +/obj/item/clothing/under/dressshirt/tshirt/skrell/reef name = "reef wetshirt" desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "reef_tee" item_state = "reef_tee" -/obj/item/clothing/under/tshirt/skrell/nebula +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula name = "pink eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "pink_skrell_hawaiian" item_state = "pink_skrell_hawaiian" -/obj/item/clothing/under/tshirt/skrell/nebula/purple +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/purple name = "purple eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "purple_skrell_hawaiian" item_state = "purple_skrell_hawaiian" -/obj/item/clothing/under/tshirt/skrell/nebula/teal +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal name = "teal eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "teal_skrell_hawaiian" item_state = "teal_skrell_hawaiian" -/obj/item/clothing/under/tshirt/skrell/nebula/black +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/black name = "black eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "black_skrell_hawaiian" item_state = "black_skrell_hawaiian" -/obj/item/clothing/under/tshirt/skrell/nebula/white +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/white name = "white eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "white_skrell_hawaiian" item_state = "white_skrell_hawaiian" -/obj/item/clothing/under/tshirt/skrell/nebula/nralakk +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/nralakk name = "nralakk eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "nralakk_skrell_hawaiian" diff --git a/html/changelogs/wezzy_sick_bugfix.yml b/html/changelogs/wezzy_sick_bugfix.yml new file mode 100644 index 00000000000..650ac40cb72 --- /dev/null +++ b/html/changelogs/wezzy_sick_bugfix.yml @@ -0,0 +1,66 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes Dominian flagpatches." + - bugfix: "Fixes shirts for Bulwarks." + - bugfix: "Fixes Skrellian wetshirt sprites." + - bugfix: "Fixes Ramenvend sprites." + - bugfix: "Fixes recolorable poncho accents." + - bugfix: "Fixes mesmetron sprite." + - bugfix: "Fixes not being able to pick up energy swords and their subtypes." + - bugfix: "Fixes IPC Implanter sprite." + diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index 6c98a10b608..6450fcd0720 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index c7948810947..4c521b249f0 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 2724f70e791..8cd6a240230 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/species/bulwark/accessories.dmi b/icons/mob/species/bulwark/accessories.dmi index 21516536420..695917ee768 100644 Binary files a/icons/mob/species/bulwark/accessories.dmi and b/icons/mob/species/bulwark/accessories.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index 4445f2d622f..7007b2f22a4 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi index 0bec21d8b6d..e18eb16b3ab 100644 Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ diff --git a/icons/obj/item/clothing/accessory/poncho/poncho.dmi b/icons/obj/item/clothing/accessory/poncho/poncho.dmi index 400a43a8654..e28b13b8874 100644 Binary files a/icons/obj/item/clothing/accessory/poncho/poncho.dmi and b/icons/obj/item/clothing/accessory/poncho/poncho.dmi differ diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi index 07ae5ba887f..75c4a2a3d8d 100644 Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 3eb4897c767..004d20790a2 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/away/ships/golden_deep/golden_deep_submaps.dmm b/maps/away/ships/golden_deep/golden_deep_submaps.dmm index 3aa6f77349c..3167945fc9d 100644 --- a/maps/away/ships/golden_deep/golden_deep_submaps.dmm +++ b/maps/away/ships/golden_deep/golden_deep_submaps.dmm @@ -156,10 +156,10 @@ /area/template_noop) "ji" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/tshirt/skrell/nebula/black, -/obj/item/clothing/under/tshirt/skrell/nebula/nralakk, -/obj/item/clothing/under/tshirt/skrell/nebula/teal, -/obj/item/clothing/under/tshirt/skrell/reef, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/black, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/nralakk, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/dressshirt/tshirt/skrell/reef, /obj/item/clothing/ears/skrell/band, /obj/item/clothing/ears/skrell/chain/black, /obj/item/clothing/ears/skrell/chain/ebony, diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm index e015131a505..585896987b5 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer.dmm @@ -756,7 +756,7 @@ color = "#7B5143" }, /obj/item/clothing/gloves/fingerless, -/obj/item/clothing/under/tshirt/skrell/nebula/black, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/black, /obj/item/clothing/ears/skrell/scrunchy, /obj/item/clothing/pants/shorts/athletic/black, /obj/item/clothing/pants/track, diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index 94176ddf1e6..aa236639cb0 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -470,14 +470,14 @@ /obj/structure/closet/cabinet{ name = "wardrobe" }, -/obj/item/clothing/under/tshirt/skrell/nebula, -/obj/item/clothing/under/tshirt/skrell/maelstrom, -/obj/item/clothing/under/tshirt/skrell/nebula/black, -/obj/item/clothing/under/tshirt/skrell/nebula/nralakk, -/obj/item/clothing/under/tshirt/skrell/nebula/purple, -/obj/item/clothing/under/tshirt/skrell/nebula/teal, -/obj/item/clothing/under/tshirt/skrell/nebula/white, -/obj/item/clothing/under/tshirt/skrell/ocean, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula, +/obj/item/clothing/under/dressshirt/tshirt/skrell/maelstrom, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/black, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/nralakk, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/purple, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/white, +/obj/item/clothing/under/dressshirt/tshirt/skrell/ocean, /obj/item/clothing/accessory/poncho/skrell, /obj/item/clothing/accessory/poncho/skrell/brown, /obj/item/clothing/accessory/poncho/skrell/gray, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm index 37ca2a945a4..0d1a77c9425 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm @@ -85,7 +85,7 @@ /obj/outfit/admin/ouerea_human name = "Ouerean Human" - uniform = list(/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/under/dressshirt, /obj/item/clothing/under/tshirt, /obj/item/clothing/under/dressshirt/longsleeve) + uniform = list(/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/under/dressshirt, /obj/item/clothing/under/dressshirt/tshirt, /obj/item/clothing/under/dressshirt/longsleeve) pants = list(/obj/item/clothing/pants/tan, /obj/item/clothing/pants/jeans, /obj/item/clothing/pants/shorts/black, /obj/item/clothing/pants/shorts/jeans) suit = list(/obj/item/clothing/suit/storage/toggle/track, /obj/item/clothing/suit/storage/toggle/asymmetriccoat/izharshan, /obj/item/clothing/accessory/poncho/unathimantle, /obj/item/clothing/suit/storage/toggle/corp/heph) shoes = list(/obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/shoes/sandals, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/jackboots) @@ -97,7 +97,7 @@ /obj/outfit/admin/ouerea_skrell name = "Ouerean Skrell" - uniform = list(/obj/item/clothing/under/tshirt/skrell/maelstrom, /obj/item/clothing/under/tshirt/skrell/nebula, /obj/item/clothing/under/tshirt/skrell/reef) + uniform = list(/obj/item/clothing/under/dressshirt/tshirt/skrell/maelstrom, /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula, /obj/item/clothing/under/dressshirt/tshirt/skrell/reef) pants = list(/obj/item/clothing/pants/tan, /obj/item/clothing/pants/jeans, /obj/item/clothing/pants/shorts/black, /obj/item/clothing/pants/shorts/jeans) shoes = list(/obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/shoes/sandals, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/jackboots) back = /obj/item/storage/backpack/satchel/leather diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm index 2bdc7226119..0c8a50dbea9 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm @@ -486,7 +486,7 @@ /obj/item/clothing/pants/tan, /obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, -/obj/item/clothing/under/tshirt/skrell/ocean, +/obj/item/clothing/under/dressshirt/tshirt/skrell/ocean, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/workboots, /turf/simulated/floor/exoplanet/wood/birch{ @@ -562,7 +562,7 @@ /obj/item/clothing/pants/tan, /obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, -/obj/item/clothing/under/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/workboots, /turf/simulated/floor/exoplanet/wood/birch{