diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index e3f7f2e1fbb..33bd0f9065b 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -67,7 +67,6 @@ priority = "Undetermined" /obj/machinery/telecomms/message_server - icon = 'icons/obj/machinery/research.dmi' icon_state = "server" name = "messaging server" desc = "A machine that processes and routes request console messages." @@ -166,12 +165,12 @@ ..() /obj/machinery/telecomms/message_server/update_icon() - if(!operable(EMPED)) - icon_state = "server-nopower" - else if (!use_power) - icon_state = "server-off" - else - icon_state = "server-on" + icon_state = initial(icon_state) + ClearOverlays() + if(panel_open) + icon_state += "_o" + if(!operable()) + icon_state += "_off" /datum/signal/subspace/pda frequency = PUB_FREQ diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 415c77170ef..3332e3cc8fd 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1319,6 +1319,8 @@ w_class = WEIGHT_CLASS_BULKY attack_verb = list("attacked", "slashed", "stabbed", "poked") contained_sprite = TRUE + worn_x_dimension = 64 + worn_y_dimension = 64 /obj/item/inflatable_duck name = "inflatable duck" diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 6e4fed45f7e..1def90ff2be 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -43,7 +43,7 @@ /obj/item/clothing/accessory/poncho/dominia_cape name = "dominian cape" desc = "This is a cape in the style of Dominian nobility. It's the latest fashion across Dominian space." - icon = 'icons/clothing/suits/capes/dominia.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi' icon_state = "dominian_cape" item_state = "dominian_cape" icon_override = null @@ -507,7 +507,7 @@ desc = "A simple red surcoat commonly worn by Dominian clergy members." desc_extended = "Spun with rough but hardy fabrics from the Dominian frontier, this surcoat is commonly worn by poorer Tribunal clergy as well as missionaries\ seeking protection from the elements. This garment was popularized by the Kael'kah sect and remains respected as a symbol of humility and poverty amongst priests." - icon = 'icons/clothing/suits/capes/dominia_surcoat.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/dominia_surcoat.dmi' icon_state = "dominian_surcoat" item_state = "dominian_surcoat" overlay_state = "dominian_surcoat" @@ -519,7 +519,7 @@ desc_extended = "This style of cape is among the most flashy and ornate of the Tribunal's garb. Its weight and impracticality of use means that \ it is often only worn by clergy of high station and on special occasions. Lower ranking members of the Tribunal or those who wear it frequently \ are often frowned upon as arrogant and vain." - icon = 'icons/clothing/suits/capes/dominia_doublecape.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/dominia_doublecape.dmi' icon_state = "dominian_doublecape" item_state = "dominian_doublecape" overlay_state = "dominian_doublecape" @@ -531,7 +531,7 @@ desc_extended = "Dominian priests and priestesses are traditionally expected to wear red or golden clothing when discharging \ their duties. Capes are worn as both a fashion statement to attract the attention of crowds and as a simple form of protection\ against the elements." - icon = 'icons/clothing/suits/capes/dominia_red.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/dominia_red.dmi' icon_state = "dominian_cape_red" item_state = "dominian_cape_red" overlay_state = "dominian_cape_red" @@ -575,7 +575,7 @@ desc = "A truly majestic gold and red cape worn by members of the clergy affiliated with His Majesty's Diplomatic Service." desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also \ employs may commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." - icon = 'icons/clothing/suits/capes/dominia_consular_cape.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/dominia_consular_cape.dmi' icon_state = "dominia_cape_consular" item_state = "dominia_cape_consular" overlay_state = "dominia_cape_consular" diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm index 3c4e50f4f1b..e21138219db 100644 --- a/code/modules/clothing/factions/goldendeep.dm +++ b/code/modules/clothing/factions/goldendeep.dm @@ -143,7 +143,7 @@ desc = "Viewed as ostentatious by outsiders (and perhaps insiders, for that matter) capes nonetheless remain as a means of quickly broadcasting one's status (or pretentions of status)." icon_state = "golden_cape" item_state = "golden_cape" - icon = 'icons/clothing/suits/capes/golden_cape.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/golden_cape.dmi' contained_sprite = TRUE icon_override = null protects_against_weather = FALSE @@ -153,7 +153,7 @@ desc = "A long and flowing cloak used by members of Golden Deep evocative of trenchcoats. Curiously, many investigatorial synthetics within the collective favor these cloaks." icon_state = "flowing_cloak" item_state = "flowing_cloak" - icon = 'icons/clothing/suits/capes/flowing_cloak.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/flowing_cloak.dmi' has_accents = TRUE /obj/item/clothing/accessory/poncho/goldendeep/elegantcloak @@ -161,7 +161,7 @@ desc = "Billowing fabric for all classes with a regal clasp that hints at its original merchant designers." icon_state = "elegant_cloak" item_state = "elegant_cloak" - icon = 'icons/clothing/suits/capes/elegant_cloak.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/elegant_cloak.dmi' has_accents = TRUE /obj/item/clothing/accessory/poncho/goldendeep/furwrap @@ -169,14 +169,14 @@ desc = "The fur of an animal, soft and fluffy, now repurposed as a decorative neck wrap." icon_state = "fur_wrap" item_state = "fur_wrap" - icon = 'icons/clothing/suits/capes/fur_wrap.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/fur_wrap.dmi' /obj/item/clothing/accessory/poncho/goldendeep/desertadornment name = "desert adornment" desc = "Lightweight and soft, this sleeveless coat feels like it's hardly anything at all, but it keeps the sun from bearing down on the wearer." icon_state = "desert_adornment" item_state = "desert_adornment" - icon = 'icons/clothing/suits/capes/desert_adornment.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/desert_adornment.dmi' //head slot diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 7f27ba0dfb9..739eb8a40c0 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -783,7 +783,7 @@ /obj/item/clothing/accessory/poncho/assunzione name = "\improper Luceian cloak" desc = "A violet cloak adorned with gold inlays worn by devout adherents of Luceism, the dominant faith of Assunzione." - icon = 'icons/clothing/suits/capes/assunzione_cloak.dmi' + icon = 'icons/obj/item/clothing/accessory/poncho/assunzione_cloak.dmi' icon_override = null icon_state = "assunzione_robe" item_state = "assunzione_robe" diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 4276e614ec1..8196a1680ca 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -5,7 +5,7 @@ use_power = POWER_USE_ACTIVE active_power_usage = 20000 //20kW, appropriate for machine that keeps massive cross-Zlevel wireless network operational. idle_power_usage = 100 - icon_state = "ntnet" + icon_state = "relay" icon = 'icons/obj/machinery/telecomms.dmi' anchored = TRUE density = TRUE @@ -42,11 +42,9 @@ if(!operable()) icon_state += "_off" else if(dos_failure) - AddOverlays("ntnet_o_problem") + AddOverlays("relay_traitor") else if(!enabled) - AddOverlays("ntnet_o_error") - else - AddOverlays("ntnet_o_ok") + AddOverlays("relay_traitor_activate") /obj/machinery/ntnet_relay/process() if(operable()) diff --git a/html/changelogs/wezzy_cape-sword-fix.yml b/html/changelogs/wezzy_cape-sword-fix.yml new file mode 100644 index 00000000000..f38e794d224 --- /dev/null +++ b/html/changelogs/wezzy_cape-sword-fix.yml @@ -0,0 +1,61 @@ +################################ +# 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 Poncho/Cape accessory sprites." + - bugfix: "Fixes foam sword sprite." + - bugfix: "Fixes NTnet relay sprite." + - bugfix: "Fixes message server using the wrong sprite." diff --git a/icons/clothing/suits/capes/desert_adornment.dmi b/icons/clothing/suits/capes/desert_adornment.dmi deleted file mode 100644 index e30c1f0661b..00000000000 Binary files a/icons/clothing/suits/capes/desert_adornment.dmi and /dev/null differ diff --git a/icons/clothing/suits/capes/assunzione_cloak.dmi b/icons/obj/item/clothing/accessory/poncho/assunzione_cloak.dmi similarity index 85% rename from icons/clothing/suits/capes/assunzione_cloak.dmi rename to icons/obj/item/clothing/accessory/poncho/assunzione_cloak.dmi index 71293959e9c..2eefce26fb1 100644 Binary files a/icons/clothing/suits/capes/assunzione_cloak.dmi and b/icons/obj/item/clothing/accessory/poncho/assunzione_cloak.dmi differ diff --git a/icons/obj/item/clothing/accessory/poncho/desert_adornment.dmi b/icons/obj/item/clothing/accessory/poncho/desert_adornment.dmi new file mode 100644 index 00000000000..c24ee60723c Binary files /dev/null and b/icons/obj/item/clothing/accessory/poncho/desert_adornment.dmi differ diff --git a/icons/clothing/suits/capes/dominia.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi similarity index 68% rename from icons/clothing/suits/capes/dominia.dmi rename to icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi index 19efb6c9530..b6c7b9c12b6 100644 Binary files a/icons/clothing/suits/capes/dominia.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi differ diff --git a/icons/clothing/suits/capes/dominia_consular_cape.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_consular_cape.dmi similarity index 91% rename from icons/clothing/suits/capes/dominia_consular_cape.dmi rename to icons/obj/item/clothing/accessory/poncho/dominia_consular_cape.dmi index a2f87e2ae22..fad009a0dc6 100644 Binary files a/icons/clothing/suits/capes/dominia_consular_cape.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_consular_cape.dmi differ diff --git a/icons/clothing/suits/capes/dominia_doublecape.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_doublecape.dmi similarity index 87% rename from icons/clothing/suits/capes/dominia_doublecape.dmi rename to icons/obj/item/clothing/accessory/poncho/dominia_doublecape.dmi index 0228664f5a6..5bf800c8e02 100644 Binary files a/icons/clothing/suits/capes/dominia_doublecape.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_doublecape.dmi differ diff --git a/icons/clothing/suits/capes/dominia_red.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_red.dmi similarity index 89% rename from icons/clothing/suits/capes/dominia_red.dmi rename to icons/obj/item/clothing/accessory/poncho/dominia_red.dmi index f26f8ff4c6a..6096776ef65 100644 Binary files a/icons/clothing/suits/capes/dominia_red.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_red.dmi differ diff --git a/icons/clothing/suits/capes/dominia_surcoat.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_surcoat.dmi similarity index 83% rename from icons/clothing/suits/capes/dominia_surcoat.dmi rename to icons/obj/item/clothing/accessory/poncho/dominia_surcoat.dmi index d0d8be4007d..c7d27b93c20 100644 Binary files a/icons/clothing/suits/capes/dominia_surcoat.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_surcoat.dmi differ diff --git a/icons/clothing/suits/capes/elegant_cloak.dmi b/icons/obj/item/clothing/accessory/poncho/elegant_cloak.dmi similarity index 82% rename from icons/clothing/suits/capes/elegant_cloak.dmi rename to icons/obj/item/clothing/accessory/poncho/elegant_cloak.dmi index 99d885e01d0..e91e8e6109b 100644 Binary files a/icons/clothing/suits/capes/elegant_cloak.dmi and b/icons/obj/item/clothing/accessory/poncho/elegant_cloak.dmi differ diff --git a/icons/clothing/suits/capes/flowing_cloak.dmi b/icons/obj/item/clothing/accessory/poncho/flowing_cloak.dmi similarity index 75% rename from icons/clothing/suits/capes/flowing_cloak.dmi rename to icons/obj/item/clothing/accessory/poncho/flowing_cloak.dmi index 71f4b896852..578f7afdf45 100644 Binary files a/icons/clothing/suits/capes/flowing_cloak.dmi and b/icons/obj/item/clothing/accessory/poncho/flowing_cloak.dmi differ diff --git a/icons/clothing/suits/capes/fur_wrap.dmi b/icons/obj/item/clothing/accessory/poncho/fur_wrap.dmi similarity index 78% rename from icons/clothing/suits/capes/fur_wrap.dmi rename to icons/obj/item/clothing/accessory/poncho/fur_wrap.dmi index 92b7e052ad1..090b144a952 100644 Binary files a/icons/clothing/suits/capes/fur_wrap.dmi and b/icons/obj/item/clothing/accessory/poncho/fur_wrap.dmi differ diff --git a/icons/clothing/suits/capes/golden_cape.dmi b/icons/obj/item/clothing/accessory/poncho/golden_cape.dmi similarity index 75% rename from icons/clothing/suits/capes/golden_cape.dmi rename to icons/obj/item/clothing/accessory/poncho/golden_cape.dmi index 7f71b43c9f4..74f0b480f72 100644 Binary files a/icons/clothing/suits/capes/golden_cape.dmi and b/icons/obj/item/clothing/accessory/poncho/golden_cape.dmi differ