cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 21:10:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bowman and headset invisible onmob bug (#7493)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2019-11-24 20:11:56 +08:00
committed by Werner
parent a1ade93cfd
commit 6787020a28
7 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+13 -33
View File
@@ -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.