diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b571b9968b2..3acd800f628 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -207,20 +207,18 @@ name = "service radio headset" desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean." icon_state = "srv_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_service /obj/item/device/radio/headset/heads/hop name = "head of personnel's headset" desc = "The headset of the guy who will one day be captain." icon_state = "hop_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/hop /obj/item/device/radio/headset/heads/hop/alt name = "head of personnel's bowman headset" icon_state = "hop_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Engineering @@ -230,25 +228,23 @@ name = "engineering radio headset" desc = "When the engineers wish to chat like girls." icon_state = "eng_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_eng /obj/item/device/radio/headset/headset_eng/alt name = "engineering bowman headset" icon_state = "eng_headset_alt" - item_state = "eng_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/heads/ce name = "chief engineer's headset" desc = "The headset of the guy who is in charge of morons." icon_state = "ce_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/ce /obj/item/device/radio/headset/heads/ce/alt name = "chief engineer's bowman headset" icon_state = "ce_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Cargo @@ -258,29 +254,28 @@ name = "supply radio headset" desc = "A headset used by the quartermaster's slaves." icon_state = "cargo_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_cargo/alt name = "cargo bowman headset" icon_state = "cargo_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/headset_mining name = "mining radio headset" desc = "Headset used by dwarves. It has an inbuilt subspace antenna for better reception." icon_state = "mine_headset" - item_state = "headset" ks1type = /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_mining/alt name = "mining bowman radio headset" icon_state = "mine_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/qm name = "quartermaster's headset" desc = "A headset used by the head honcho of paper pushing." icon_state = "qm_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/qm/alt @@ -296,25 +291,23 @@ name = "medical radio headset" desc = "A headset for the trained staff of the medbay." icon_state = "med_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_med /obj/item/device/radio/headset/headset_med/alt name = "medical bowman headset" icon_state = "med_headset_alt" - item_state = "med_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/heads/cmo name = "chief medical officer's headset" desc = "The headset of the highly trained medical chief." icon_state = "cmo_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/cmo /obj/item/device/radio/headset/heads/cmo/alt name = "chief medical officer's bowman headset" icon_state = "cmo_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Science @@ -324,32 +317,28 @@ name = "science radio headset" desc = "A sciency headset. Like usual." icon_state = "sci_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_sci /obj/item/device/radio/headset/headset_sci/alt name = "science bowman headset" icon_state = "sci_headset_alt" - item_state = "sci_headset_alt" /obj/item/device/radio/headset/headset_rob name = "robotics radio headset" desc = "Made specifically for the roboticists who cannot decide between departments." icon_state = "rob_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_rob /obj/item/device/radio/headset/heads/rd name = "research director's headset" desc = "Headset of the researching God." icon_state = "rd_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/rd/alt name = "research director's bowman headset" icon_state = "rd_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Security @@ -359,25 +348,23 @@ name = "security radio headset" desc = "This is used by your elite security force." icon_state = "sec_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_sec /obj/item/device/radio/headset/headset_sec/alt name = "security bowman headset" icon_state = "sec_headset_alt" - item_state = "sec_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/heads/hos name = "head of security's headset" desc = "The headset of the man who protects your worthless lifes." icon_state = "hos_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/hos/alt name = "head of security's bowman headset" icon_state = "hos_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Captain @@ -387,25 +374,23 @@ name = "command radio headset" desc = "A headset with a commanding channel." icon_state = "com_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_com /obj/item/device/radio/headset/headset_com/alt name = "command bowman headset" icon_state = "com_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/heads/captain name = "captain's headset" desc = "The headset of the boss." icon_state = "cap_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/captain /obj/item/device/radio/headset/heads/captain/alt name = "captain's bowman headset" icon_state = "cap_headset_alt" - item_state = "com_headset_alt" + item_state = "headset_alt" /* * Misc @@ -415,7 +400,6 @@ name = "medical research radio headset" desc = "A headset that is a result of the mating between medical and science." icon_state = "medsci_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_medsci /obj/item/device/radio/headset/hivenet @@ -432,7 +416,7 @@ /obj/item/device/radio/headset/syndicate/alt name = "military bowman headset" icon_state = "syn_headset_alt" - item_state = "syn_headset_alt" + item_state = "headset_alt" /obj/item/device/radio/headset/raider icon_state = "syn_headset" @@ -454,14 +438,12 @@ name = "emergency response team radio headset" desc = "The headset of the boss's boss." icon_state = "com_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/ert /obj/item/device/radio/headset/legion name = "Tau Ceti Foreign Legion radio headset" desc = "The headset used by NanoTrasen sanctioned response forces." icon_state = "com_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/onlyert /obj/item/device/radio/headset/distress @@ -473,7 +455,6 @@ name = "representative headset" desc = "The headset of your worst enemy." icon_state = "com_headset" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/headset_com /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. @@ -481,7 +462,6 @@ desc = "Integrated AI radio transceiver." icon = 'icons/obj/robot_component.dmi' icon_state = "radio" - item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/ai_integrated var/myAi = null // Atlantis: Reference back to the AI which has this radio. var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu. diff --git a/html/changelogs/wezzy_bowmans_fix.yml b/html/changelogs/wezzy_bowmans_fix.yml new file mode 100644 index 00000000000..6a26fa0d893 --- /dev/null +++ b/html/changelogs/wezzy_bowmans_fix.yml @@ -0,0 +1,41 @@ +################################ +# 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 some invisible bowman onmob sprites." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 409f7c05cd6..25fc5787d3f 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index cbb08c3f38d..02ae9b65e83 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 d2d7c37254d..7eabec96f94 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 879b96f221b..40088718782 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 0130f16acbd..1e5f57dd25c 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ