From 1fd0522276571ab711bf513838f6153b476a0964 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 14:24:12 +0100 Subject: [PATCH 1/7] Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. --- .../game/machinery/computer/communications.dm | 18 ++++++------- code/game/objects/items/devices/PDA/PDA.dm | 25 ++++++++++++++++++- code/game/objects/items/devices/PDA/cart.dm | 3 ++- code/modules/admin/topic.dm | 4 +-- code/modules/admin/verbs/pray.dm | 4 +-- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index acaabc984c0..464aa41031c 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -179,16 +179,16 @@ if("MessageCentcomm") if(src.authenticated==2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + usr << "\red Arrays recycling. Please stand by." return - var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Centcomm_announce(input, usr) - usr << "Message transmitted." - log_say("[key_name(usr)] has made a Centcomm announcement: [input]") + usr << "\blue Message transmitted." + log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]") centcomm_message_cooldown = 1 - spawn(6000)//10 minute cooldown + spawn(300)//10 minute cooldown centcomm_message_cooldown = 0 @@ -196,16 +196,16 @@ if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + usr << "\red Arrays recycling. Please stand by." return - var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) - usr << "Message transmitted." + usr << "\blue Message transmitted." log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 - spawn(6000)//10 minute cooldown + spawn(300)//10 minute cooldown centcomm_message_cooldown = 0 if("RestoreBackup") diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e494baf0245..d0b2e7e5cc0 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -38,6 +38,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/cart = "" //A place to stick cartridge menu information var/detonate = 1 // Can the PDA be blown up? var/hidden = 0 // Is the PDA hidden from the PDA list? + var/centcomm_message_cooldown = 0 //Internal Affairs centcomm message cooldown var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -378,11 +379,16 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += "" else dat += "" if(cartridge.access_quartermaster) - dat += "

Quartermaster Functions:

" + dat += "

Quartermaster Functions

" dat += "" + if (cartridge.access_internalaffairs) + dat += "

Internal Affairs Functions

" + dat += "" dat += "" dat += "

Utilities

" @@ -677,6 +683,23 @@ var/global/list/obj/item/device/pda/PDAs = list() else U << browse(null, "window=pda") return + if("Centcomm Message") + if(istype(cartridge, /obj/item/weapon/cartridge/lawyer)) + if(centcomm_message_cooldown) + U << "\red Arrays recycling. Please stand by." + return + var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Use only as a last resort if all other avenues have been exhausted. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") + if(!input || !(usr in view(1,src))) + return + Centcomm_announce(input, usr) + U << "\blue Message transmitted." + log_say("[key_name(usr)] has made a Centcomm announcement: [input]") + centcomm_message_cooldown = 1 + spawn(300)//30 seconds cooldown + centcomm_message_cooldown = 0 + else + U << browse(null, "window=pda") + return //SYNDICATE FUNCTIONS=================================== diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index f0e3ee98f17..6f25f2b55d6 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -14,6 +14,7 @@ var/access_clown = 0 var/access_mime = 0 var/access_janitor = 0 + var/access_internalaffairs = 0 // var/access_flora = 0 var/access_reagent_scanner = 0 var/access_remote_door = 0 //Control some blast doors remotely!! @@ -79,6 +80,7 @@ name = "P.R.O.V.E. Cartridge" icon_state = "cart-s" access_security = 1 + access_internalaffairs = 1 clown name = "Honkworks 5.0" @@ -602,7 +604,6 @@ Code: menu += "ERROR: Unable to determine current location." menu += "

Refresh GPS Locator" - /obj/item/weapon/cartridge/Topic(href, href_list) ..() diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e5a6574ccca..b28cb8420e1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1415,7 +1415,7 @@ src.owner << "You sent [input] to [H] via a secure channel." log_admin("[src.owner] replied to [key_name(H)]'s Centcomm message with the message [input].") message_admins("[src.owner] replied to [key_name(H)]'s Centcom message with: \"[input]\"") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"" + H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. \"[input]\" Message ends.\"" else if(href_list["SyndicateReply"]) var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) @@ -1431,7 +1431,7 @@ src.owner << "You sent [input] to [H] via a secure channel." log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"" + H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. \"[input]\" Message ends.\"" else if(href_list["CentcommFaxView"]) var/info = locate(href_list["CentcommFaxView"]) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 906ec8a5ac4..fd91142cdf6 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -27,9 +27,9 @@ feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") -/proc/Centcomm_announce(var/text , var/mob/Sender) +/proc/Centcomm_announce(var/text , var/mob/Sender , var/iamessage) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "\blue CENTCOMM:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg = "\blue CENTCOMM[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" admins << msg /proc/Syndicate_announce(var/text , var/mob/Sender) From 5437b1bbacd34d37b0ce4ac17b0fdb14763927fb Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:05:27 +0100 Subject: [PATCH 2/7] Added two ears back. --- code/datums/mind.dm | 6 +- code/game/gamemodes/events/space_ninja.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/setupgame.dm | 10 +-- code/game/gamemodes/wizard/wizard.dm | 2 +- code/game/hud.dm | 9 ++- code/game/jobs/job/captain.dm | 4 +- code/game/jobs/job/civilian.dm | 8 +- code/game/jobs/job/engineering.dm | 6 +- code/game/jobs/job/medical.dm | 12 +-- code/game/jobs/job/science.dm | 8 +- code/game/jobs/job/security.dm | 8 +- code/game/jobs/job_controller.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/game/objects/items.dm | 14 +++- .../objects/items/devices/radio/headset.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 2 +- code/game/objects/structures/watercloset.dm | 7 +- code/game/response_team.dm | 3 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/debug.dm | 24 +++--- code/modules/admin/verbs/onlyone.dm | 2 +- code/modules/admin/verbs/striketeam.dm | 2 +- .../admin/verbs/striketeam_syndicate.dm | 2 +- code/modules/admin/verbs/vox_raiders.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/clothing.dm | 50 ++++++++++++- code/modules/mob/inventory.dm | 13 +++- .../mob/living/carbon/human/examine.dm | 10 ++- code/modules/mob/living/carbon/human/hud.dm | 15 +++- code/modules/mob/living/carbon/human/human.dm | 9 ++- .../mob/living/carbon/human/human_defines.dm | 3 +- .../mob/living/carbon/human/inventory.dm | 56 ++++++++++---- code/modules/mob/living/carbon/human/life.dm | 2 +- .../mob/living/carbon/human/update_icons.dm | 10 ++- code/modules/mob/living/say.dm | 75 ++++++++++++------- .../mob/living/simple_animal/corpse.dm | 2 +- code/modules/mob/mob.dm | 5 +- code/modules/organs/organ_external.dm | 3 +- code/setup.dm | 7 +- 40 files changed, 275 insertions(+), 132 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 769f7707eaf..fb8a134c5ad 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -707,7 +707,8 @@ datum/mind var/mob/living/carbon/human/H = current del(H.belt) del(H.back) - del(H.ears) + del(H.l_ear) + del(H.r_ear) del(H.gloves) del(H.head) del(H.shoes) @@ -989,7 +990,8 @@ datum/mind var/mob/living/carbon/human/H = current del(H.belt) del(H.back) - del(H.ears) + del(H.l_ear) + del(H.r_ear) del(H.gloves) del(H.head) del(H.shoes) diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index 437b5be0c23..c3b77d5f875 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -534,7 +534,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. del(gloves) var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) - equip_to_slot_or_del(R, slot_ears) + equip_to_slot_or_del(R, slot_l_ear) if(gender==FEMALE) equip_to_slot_or_del(new /obj/item/clothing/under/color/blackf(src), slot_w_uniform) else diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d014ba09608..be688554147 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -205,7 +205,7 @@ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(synd_mob) R.set_frequency(radio_freq) - synd_mob.equip_to_slot_or_del(R, slot_ears) + synd_mob.equip_to_slot_or_del(R, slot_l_ear) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(synd_mob), slot_shoes) diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 0168bbf2049..53d90a7e98c 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -95,14 +95,14 @@ var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) M.real_name = "Corpse" M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/device/pda/engineering(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) // M.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(M), slot_l_hand) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store) - //M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + //M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) if (prob(50)) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask) @@ -117,7 +117,7 @@ var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) M.real_name = "Corpse" M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) @@ -140,7 +140,7 @@ var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) M.real_name = "Corpse" M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/storage/utilitybelt(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) @@ -161,7 +161,7 @@ var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) M.real_name = "Corpse" M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) //M.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index ba5700b1df3..add8ee00a66 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -162,7 +162,7 @@ del(wizard_mob.r_store) del(wizard_mob.l_store) - wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears) + wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_l_ear) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) diff --git a/code/game/hud.dm b/code/game/hud.dm index 04399852886..99042bdef9f 100644 --- a/code/game/hud.dm +++ b/code/game/hud.dm @@ -79,7 +79,8 @@ #define ui_glasses "1:6,3:9" #define ui_mask "2:8,3:9" -#define ui_ears "3:10,3:9" +#define ui_l_ear "3:10,3:9" +#define ui_r_ear "3:10,4:11" #define ui_head "2:8,4:11" @@ -214,7 +215,8 @@ datum/hud/New(mob/owner) if(inventory_shown && hud_shown) if(H.shoes) H.shoes.screen_loc = ui_shoes if(H.gloves) H.gloves.screen_loc = ui_gloves - if(H.ears) H.ears.screen_loc = ui_ears + if(H.l_ear) H.l_ear.screen_loc = ui_l_ear + if(H.r_ear) H.r_ear.screen_loc = ui_r_ear if(H.glasses) H.glasses.screen_loc = ui_glasses if(H.w_uniform) H.w_uniform.screen_loc = ui_iclothing if(H.wear_suit) H.wear_suit.screen_loc = ui_oclothing @@ -223,7 +225,8 @@ datum/hud/New(mob/owner) else if(H.shoes) H.shoes.screen_loc = null if(H.gloves) H.gloves.screen_loc = null - if(H.ears) H.ears.screen_loc = null + if(H.l_ear) H.l_ear.screen_loc = null + if(H.r_ear) H.r_ear.screen_loc = null if(H.glasses) H.glasses.screen_loc = null if(H.w_uniform) H.w_uniform.screen_loc = null if(H.wear_suit) H.wear_suit.screen_loc = null diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 38cb9d10be7..7d93bdb3253 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -14,7 +14,7 @@ minimal_player_age = 14 equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) @@ -70,7 +70,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 8d9e0875dc9..ce7c3968f3a 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -116,7 +116,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt) @@ -146,7 +146,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt) @@ -174,7 +174,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) @@ -342,7 +342,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 3ab06c4e389..246d3eb3f01 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -22,7 +22,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) @@ -57,7 +57,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) @@ -91,7 +91,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 22dd096bcca..1303976b131 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -19,7 +19,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) @@ -53,7 +53,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) @@ -115,7 +115,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt) @@ -143,7 +143,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt) @@ -171,7 +171,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) @@ -204,7 +204,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index fbfe286e484..c4c117b260c 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -21,7 +21,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt) @@ -50,7 +50,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) @@ -77,7 +77,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) @@ -104,7 +104,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index dd04b9cbac7..b8f91554d47 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -25,7 +25,7 @@ if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt) @@ -61,7 +61,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) @@ -100,7 +100,7 @@ minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) @@ -146,7 +146,7 @@ minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index fc5f7df203a..cb8a73278c6 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -431,7 +431,7 @@ var/global/datum/controller/occupations/job_master H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." spawnId(H, rank, alt_title) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) //Gives glasses to the vision impaired if(H.disabilities & NEARSIGHTED) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 91b2455eb03..b461cd4b12b 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -122,7 +122,7 @@ for(var/mob/living/carbon/M in ohearers(6, chassis)) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(istype(H.ears, /obj/item/clothing/ears/earmuffs)) + if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) continue M << "HONK" M.sleeping = 0 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c55684eb197..39252964f6c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -461,11 +461,21 @@ if( !(slot_flags & SLOT_HEAD) ) return 0 return 1 - if(slot_ears) - if(H.ears) + if(slot_l_ear) + if(H.l_ear) return 0 if( !(slot_flags & SLOT_EARS) ) return 0 + if( (slot_flags & SLOT_TWOEARS) && H.r_ear ) + return 0 + return 1 + if(slot_r_ear) + if(H.r_ear) + return 0 + if( !(slot_flags & SLOT_EARS) ) + return 0 + if( (slot_flags & SLOT_TWOEARS) && H.l_ear ) + return 0 return 1 if(slot_w_uniform) if(H.w_uniform) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 05285807d71..f8b908264d9 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -23,7 +23,7 @@ /obj/item/device/radio/headset/receive_range(freq, level) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc - if(H.ears == src) + if(H.l_ear == src || H.r_ear == src) return ..(freq, level) return -1 diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 2ff047a7465..1a50e9ad05c 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -38,7 +38,7 @@ if(iscarbon(M)) eye_safety = M.eyecheck() if(ishuman(M)) - if(istype(M:ears, /obj/item/clothing/ears/earmuffs)) + if(istype(M:l_ear, /obj/item/clothing/ears/earmuffs) || istype(M:r_ear, /obj/item/clothing/ears/earmuffs)) ear_safety += 2 if(HULK in M.mutations) ear_safety += 1 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 1f08c112306..9d6cab7723e 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -258,8 +258,11 @@ if(H.glasses && washglasses) if(H.glasses.clean_blood()) H.update_inv_glasses(0) - if(H.ears && washears) - if(H.ears.clean_blood()) + if(H.l_ear && washears) + if(H.l_ear.clean_blood()) + H.update_inv_ears(0) + if(H.r_ear && washears) + if(H.r_ear.clean_blood()) H.update_inv_ears(0) if(H.belt) if(H.belt.clean_blood()) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 282db62f72b..a518cef566e 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -280,13 +280,12 @@ proc/trigger_armed_response_team(var/force = 0) /mob/living/carbon/human/proc/equip_strike_team(leader_selected = 0) //Special radio setup - equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_ears) + equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear) //Replaced with new ERT uniform equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes) equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves) - equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_ears) equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(src), slot_back) /* diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b28cb8420e1..f8165e848cd 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1405,7 +1405,7 @@ if(!istype(H)) usr << "This can only be used on instances of type /mob/living/carbon/human" return - if(!istype(H.ears, /obj/item/device/radio/headset)) + if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) usr << "The person you are trying to contact is not wearing a headset" return @@ -1422,7 +1422,7 @@ if(!istype(H)) usr << "This can only be used on instances of type /mob/living/carbon/human" return - if(!istype(H.ears, /obj/item/device/radio/headset)) + if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) usr << "The person you are trying to contact is not wearing a headset" return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index f08f5c3a30a..0659622f6a0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -667,7 +667,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/chaplain_hood(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store) @@ -689,7 +689,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_store) @@ -706,7 +706,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wcoat(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) @@ -747,7 +747,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves) - M.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(M), slot_ears) + M.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(M), slot_l_ear) var/obj/item/device/pda/heads/pda = new(M) pda.owner = M.real_name @@ -772,7 +772,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves) - M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_if_possible(new /obj/item/clothing/head/beret/centcom/officer(M), slot_head) var/obj/item/device/pda/heads/pda = new(M) @@ -797,7 +797,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves) - M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_if_possible(new /obj/item/clothing/head/beret/centcom/captain(M), slot_head) var/obj/item/device/pda/heads/pda = new(M) @@ -821,7 +821,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) @@ -840,7 +840,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) @@ -861,7 +861,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) @@ -873,7 +873,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) @@ -885,7 +885,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) @@ -896,7 +896,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 06cb9f64564..822043720d7 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -31,7 +31,7 @@ del(I) H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_l_hand) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index ca5d8e5cb80..8ea48ea4898 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -125,7 +125,7 @@ var/global/sent_strike_team = 0 var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) R.set_frequency(1441) - equip_to_slot_or_del(R, slot_ears) + equip_to_slot_or_del(R, slot_l_ear) if (leader_selected == 0) equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform) else diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index c74e0b9f70c..e8c446d966e 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -131,7 +131,7 @@ var/global/sent_syndicate_strike_team = 0 var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src) R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. - equip_to_slot_or_del(R, slot_ears) + equip_to_slot_or_del(R, slot_l_ear) equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes) if (!syndicate_leader_selected) diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index be4b04f42fe..1e3a8defe74 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -4,7 +4,7 @@ var/global/vox_tick = 1 var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src) R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. - equip_to_slot_or_del(R, slot_ears) + equip_to_slot_or_del(R, slot_l_ear) equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES. diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index e0cc01cb3e3..e9304976cce 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -42,7 +42,7 @@ if(src.corpsegloves) M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves) if(src.corpseradio) - M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears) + M.equip_to_slot_or_del(new src.corpseradio(M), slot_l_ear) if(src.corpseglasses) M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) if(src.corpsemask) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 2d13a0ce92f..1e3213e66ea 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -9,12 +9,60 @@ throwforce = 2 slot_flags = SLOT_EARS +/obj/item/clothing/ears/attack_hand(mob/user as mob) + if (!user) return + + if (src.loc != user || !istype(user,/mob/living/carbon/human)) + ..() + return + + var/mob/living/carbon/human/H = user + if(H.l_ear != src && H.r_ear != src) + ..() + return + + if(!canremove) + return + + var/obj/item/clothing/ears/O + if(slot_flags & SLOT_TWOEARS ) + O = (H.l_ear == src ? H.r_ear : H.l_ear) + user.u_equip(O) + if(!istype(src,/obj/item/clothing/ears/offear)) + del(O) + O = src + else + O = src + + user.u_equip(src) + + if (O) + user.put_in_hands(O) + O.add_fingerprint(user) + + if(istype(src,/obj/item/clothing/ears/offear)) + del(src) + +/obj/item/clothing/ears/offear + name = "Other ear" + w_class = 5.0 + icon = 'icons/mob/screen1_Midnight.dmi' + icon_state = "block" + slot_flags = SLOT_EARS | SLOT_TWOEARS + + New(var/obj/O) + name = O.name + desc = O.desc + icon = O.icon + icon_state = O.icon_state + dir = O.dir + /obj/item/clothing/ears/earmuffs name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." icon_state = "earmuffs" item_state = "earmuffs" - + slot_flags = SLOT_EARS | SLOT_TWOEARS //Glasses /obj/item/clothing/glasses diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 0da20f1a5e7..0bcf1b92442 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -194,7 +194,8 @@ if(hasvar(src,"back")) if(src:back) items += src:back if(hasvar(src,"belt")) if(src:belt) items += src:belt - if(hasvar(src,"ears")) if(src:ears) items += src:ears + if(hasvar(src,"l_ear")) if(src:l_ear) items += src:l_ear + if(hasvar(src,"r_ear")) if(src:r_ear) items += src:r_ear if(hasvar(src,"glasses")) if(src:glasses) items += src:glasses if(hasvar(src,"gloves")) if(src:gloves) items += src:gloves if(hasvar(src,"head")) if(src:head) items += src:head @@ -255,9 +256,13 @@ if(!src.wear_id && src.w_uniform) src.wear_id = W equipped = 1 - if(slot_ears) - if(!src.ears) - src.ears = W + if(slot_l_ear) + if(!src.l_ear) + src.l_ear = W + equipped = 1 + if(slot_r_ear) + if(!src.r_ear) + src.r_ear = W equipped = 1 if(slot_glasses) if(!src.glasses) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e074d9caae8..5efefee11dc 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -163,9 +163,13 @@ else msg += "[t_He] [t_has] \icon[glasses] \a [glasses] covering [t_his] eyes.\n" - //ears - if(ears && !skipears) - msg += "[t_He] [t_has] \icon[ears] \a [ears] on [t_his] ears.\n" + //left ear + if(l_ear && !skipears) + msg += "[t_He] [t_has] \icon[l_ear] \a [l_ear] on [t_his] left ear.\n" + + //right ear + if(r_ear && !skipears) + msg += "[t_He] [t_has] \icon[r_ear] \a [r_ear] on [t_his] right ear.\n" //ID if(wear_id) diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index c1cf1634694..70f204bbc4e 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -249,11 +249,20 @@ src.other += inv_box inv_box = new /obj/screen/inventory() - inv_box.name = "ears" + inv_box.name = "l_ear" inv_box.icon = ui_style inv_box.icon_state = "ears" - inv_box.screen_loc = ui_ears - inv_box.slot_id = slot_ears + inv_box.screen_loc = ui_l_ear + inv_box.slot_id = slot_l_ear + inv_box.layer = 19 + src.other += inv_box + + inv_box = new /obj/screen/inventory() + inv_box.name = "r_ear" + inv_box.icon = ui_style + inv_box.icon_state = "ears" + inv_box.screen_loc = ui_r_ear + inv_box.slot_id = slot_r_ear inv_box.layer = 19 src.other += inv_box diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cfef1b78a04..e2548ff08fc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -198,7 +198,7 @@ b_loss = b_loss/1.5 f_loss = f_loss/1.5 - if (!istype(ears, /obj/item/clothing/ears/earmuffs)) + if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs)) ear_damage += 30 ear_deaf += 120 if (prob(70) && !shielded) @@ -208,7 +208,7 @@ b_loss += 30 if (prob(getarmor(null, "bomb"))) b_loss = b_loss/2 - if (!istype(ears, /obj/item/clothing/ears/earmuffs)) + if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs)) ear_damage += 15 ear_deaf += 60 if (prob(50) && !shielded) @@ -398,7 +398,8 @@
Right Hand: [(r_hand ? r_hand : "Nothing")]
Gloves: [(gloves ? gloves : "Nothing")]
Eyes: [(glasses ? glasses : "Nothing")] -
Ears: [(ears ? ears : "Nothing")] +
Left Ear: [(l_ear ? l_ear : "Nothing")] +
Right Ear: [(r_ear ? r_ear : "Nothing")]
Head: [(head ? head : "Nothing")]
Shoes: [(shoes ? shoes : "Nothing")]
Belt: [(belt ? belt : "Nothing")] @@ -812,7 +813,7 @@ /mob/living/carbon/human/abiotic(var/full_body = 0) - if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.ears || src.gloves))) + if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves))) return 1 if( (src.l_hand && !src.l_hand.abstract) || (src.r_hand && !src.r_hand.abstract) ) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index d9768992d3f..315b3f40915 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -34,7 +34,8 @@ var/obj/item/gloves = null var/obj/item/glasses = null var/obj/item/head = null - var/obj/item/ears = null + var/obj/item/l_ear = null + var/obj/item/r_ear = null var/obj/item/wear_id = null var/obj/item/r_store = null var/obj/item/l_store = null diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 8e5938fffdf..46d7083644b 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -31,7 +31,9 @@ if(slot_wear_id) // the only relevant check for this is the uniform check return 1 - if(slot_ears) + if(slot_l_ear) + return has_organ("head") + if(slot_r_ear) return has_organ("head") if(slot_glasses) return has_organ("head") @@ -92,8 +94,12 @@ update_hair(0) //rebuild hair success = 1 update_inv_head() - else if (W == ears) - ears = null + else if (W == l_ear) + l_ear = null + success = 1 + update_inv_ears() + else if (W == r_ear) + r_ear = null success = 1 update_inv_ears() else if (W == shoes) @@ -215,8 +221,22 @@ src.wear_id = W W.equipped(src, slot) update_inv_wear_id(redraw_mob) - if(slot_ears) - src.ears = W + if(slot_l_ear) + src.l_ear = W + if(l_ear.slot_flags & SLOT_TWOEARS) + var/obj/item/clothing/ears/offear/O = new(W) + O.loc = src + src.r_ear = O + O.layer = 20 + W.equipped(src, slot) + update_inv_ears(redraw_mob) + if(slot_r_ear) + src.r_ear = W + if(r_ear.slot_flags & SLOT_TWOEARS) + var/obj/item/clothing/ears/offear/O = new(W) + O.loc = src + src.l_ear = O + O.layer = 20 W.equipped(src, slot) update_inv_ears(redraw_mob) if(slot_glasses) @@ -393,12 +413,18 @@ return else message = "\red [source] is trying to take off the [target.glasses] from [target]'s eyes!" - if("ears") - if(target.ears && !target.ears.canremove) - message = "\red [source] fails to take off \a [target.ears] from [target]'s ears!" + if("l_ear") + if(target.l_ear && !target.l_ear.canremove) + message = "\red [source] fails to take off \a [target.l_ear] from [target]'s left ear!" return else - message = "\red [source] is trying to take off the [target.ears] from [target]'s ears!" + message = "\red [source] is trying to take off the [target.l_ear] from [target]'s left ear!" + if("r_ear") + if(target.r_ear && !target.r_ear.canremove) + message = "\red [source] fails to take off \a [target.r_ear] from [target]'s right ear!" + return + else + message = "\red [source] is trying to take off the [target.r_ear] from [target]'s right ear!" if("head") if(target.head && !target.head.canremove) message = "\red [source] fails to take off \a [target.head] from [target]'s head!" @@ -510,10 +536,14 @@ It can still be worn/put on as normal. slot_to_process = slot_head if (target.head && target.head.canremove) strip_item = target.head - if("ears") - slot_to_process = slot_ears - if (target.ears) - strip_item = target.ears + if("l_ear") + slot_to_process = slot_l_ear + if (target.l_ear) + strip_item = target.l_ear + if("r_ear") + slot_to_process = slot_r_ear + if (target.r_ear) + strip_item = target.r_ear if("shoes") slot_to_process = slot_shoes if (target.shoes && target.shoes.canremove) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9efb72f203e..f026d0c50cd 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1039,7 +1039,7 @@ ear_deaf = max(ear_deaf, 1) else if(ear_deaf) //deafness, heals slowly over time ear_deaf = max(ear_deaf-1, 0) - else if(istype(ears, /obj/item/clothing/ears/earmuffs)) //resting your ears with earmuffs heals ear damage faster + else if(istype(l_ear, /obj/item/clothing/ears/earmuffs) || istype(r_ear, /obj/item/clothing/ears/earmuffs)) //resting your ears with earmuffs heals ear damage faster ear_damage = max(ear_damage-0.15, 0) ear_deaf = max(ear_deaf, 1) else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index cce4d70d3db..45b42a9447f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -576,9 +576,13 @@ proc/get_damage_icon_part(damage_state, body_part) if(update_icons) update_icons() /mob/living/carbon/human/update_inv_ears(var/update_icons=1) - if(ears) - overlays_lying[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[ears.icon_state]2") - overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[ears.icon_state]") + if(l_ear || r_ear) + if(l_ear) + overlays_lying[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[l_ear.icon_state]2") + overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[l_ear.icon_state]") + if(r_ear) + overlays_lying[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[r_ear.icon_state]2") + overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[r_ear.icon_state]") else overlays_lying[EARS_LAYER] = null overlays_standing[EARS_LAYER] = null diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3c13b8befd4..510fd52709a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -1,7 +1,7 @@ #define SAY_MINIMUM_PRESSURE 10 var/list/department_radio_keys = list( - ":r" = "right hand", "#r" = "right hand", ".r" = "right hand", - ":l" = "left hand", "#l" = "left hand", ".l" = "left hand", + ":r" = "right ear", "#r" = "right ear", ".r" = "right ear", + ":l" = "left ear", "#l" = "left ear", ".l" = "left ear", ":i" = "intercom", "#i" = "intercom", ".i" = "intercom", ":h" = "department", "#h" = "department", ".h" = "department", ":c" = "Command", "#c" = "Command", ".c" = "Command", @@ -16,8 +16,8 @@ var/list/department_radio_keys = list( ":u" = "Supply", "#u" = "Supply", ".u" = "Supply", ":g" = "changeling", "#g" = "changeling", ".g" = "changeling", - ":R" = "right hand", "#R" = "right hand", ".R" = "right hand", - ":L" = "left hand", "#L" = "left hand", ".L" = "left hand", + ":R" = "right ear", "#R" = "right ear", ".R" = "right ear", + ":L" = "left ear", "#L" = "left ear", ".L" = "left ear", ":I" = "intercom", "#I" = "intercom", ".I" = "intercom", ":H" = "department", "#H" = "department", ".H" = "department", ":C" = "Command", "#C" = "Command", ".C" = "Command", @@ -34,8 +34,8 @@ var/list/department_radio_keys = list( //kinda localization -- rastaf0 //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding. - ":ê" = "right hand", "#ê" = "right hand", ".ê" = "right hand", - ":ä" = "left hand", "#ä" = "left hand", ".ä" = "left hand", + ":ê" = "right ear", "#ê" = "right ear", ".ê" = "right ear", + ":ä" = "left ear", "#ä" = "left ear", ".ä" = "left ear", ":ø" = "intercom", "#ø" = "intercom", ".ø" = "intercom", ":ð" = "department", "#ð" = "department", ".ð" = "department", ":ñ" = "Command", "#ñ" = "Command", ".ñ" = "Command", @@ -59,8 +59,12 @@ var/list/department_radio_keys = list( if (!ishuman(src)) return var/mob/living/carbon/human/H = src - if (H.ears) - var/obj/item/device/radio/headset/dongle = H.ears + if (H.l_ear || H.r_ear) + var/obj/item/device/radio/headset/dongle + if(istype(H.l_ear,/obj/item/device/radio/headset)) + dongle = H.l_ear + else + dongle = H.r_ear if(!istype(dongle)) return if(dongle.translate_binary) return 1 @@ -68,10 +72,14 @@ var/list/department_radio_keys = list( if (isalien(src)) return 1 if (!ishuman(src)) return var/mob/living/carbon/human/H = src - if (H.ears) - var/obj/item/device/radio/headset/dongle = H.ears + if (H.l_ear || H.r_ear) + var/obj/item/device/radio/headset/dongle + if(istype(H.l_ear,/obj/item/device/radio/headset)) + dongle = H.l_ear + else + dongle = H.r_ear if(!istype(dongle)) return - if(dongle.translate_hive) return 1 + if(dongle.translate_binary) return 1 /mob/living/say(var/message) @@ -179,27 +187,31 @@ var/list/department_radio_keys = list( switch (message_mode) if ("headset") - if (src:ears) - src:ears.talk_into(src, message) - used_radios += src:ears + if (src:l_ear && istype(src:l_ear,/obj/item/device/radio)) + src:l_ear.talk_into(src, message) + used_radios += src:l_ear + is_speaking_radio = 1 + else if (src:r_ear) + src:r_ear.talk_into(src, message) + used_radios += src:r_ear is_speaking_radio = 1 message_range = 1 italics = 1 - if ("right hand") - if (r_hand) - r_hand.talk_into(src, message) - used_radios += src:r_hand + if ("right ear") + if (src:r_ear) + src:r_ear.talk_into(src, message) + used_radios += src:r_ear is_speaking_radio = 1 message_range = 1 italics = 1 - if ("left hand") - if (l_hand) - l_hand.talk_into(src, message) - used_radios += src:l_hand + if ("left ear") + if (src:l_ear) + src:l_ear.talk_into(src, message) + used_radios += src:l_ear is_speaking_radio = 1 message_range = 1 @@ -233,9 +245,13 @@ var/list/department_radio_keys = list( if ("department") if(istype(src, /mob/living/carbon)) - if (src:ears) - src:ears.talk_into(src, message, message_mode) - used_radios += src:ears + if (src:l_ear && istype(src:l_ear,/obj/item/device/radio)) + src:l_ear.talk_into(src, message, message_mode) + used_radios += src:l_ear + is_speaking_radio = 1 + if (src:r_ear) + src:r_ear.talk_into(src, message, message_mode) + used_radios += src:r_ear is_speaking_radio = 1 else if(istype(src, /mob/living/silicon/robot)) if (src:radio) @@ -267,9 +283,12 @@ var/list/department_radio_keys = list( R.radio.talk_into(src, message, message_mode) used_radios += R.radio else - if (src:ears) - src:ears.talk_into(src, message, message_mode) - used_radios += src:ears + if (src:l_ear && istype(src:l_ear,/obj/item/device/radio)) + src:l_ear.talk_into(src, message, message_mode) + used_radios += src:l_ear + else if (src:r_ear) + src:r_ear.talk_into(src, message, message_mode) + used_radios += src:r_ear message_range = 1 italics = 1 /////SPECIAL HEADSETS END diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index e3f7f3ceac2..8c7561f7d71 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -43,7 +43,7 @@ if(src.corpsegloves) M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves) if(src.corpseradio) - M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears) + M.equip_to_slot_or_del(new src.corpseradio(M), slot_l_ear) if(src.corpseglasses) M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) if(src.corpsemask) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6171377730f..3677ceac70c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -182,7 +182,8 @@ var/list/slot_equipment_priority = list( \ slot_head,\ slot_shoes,\ slot_gloves,\ - slot_ears,\ + slot_l_ear,\ + slot_r_ear,\ slot_glasses,\ slot_belt,\ slot_s_store,\ @@ -961,4 +962,4 @@ mob/verb/yank_out_object() pinned -= O if(!pinned.len) anchored = 0 - return 1 + return 1 diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index de037500009..d3192dc9de7 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -454,7 +454,8 @@ organ= new /obj/item/weapon/organ/head(owner.loc, owner) owner.u_equip(owner.glasses) owner.u_equip(owner.head) - owner.u_equip(owner.ears) + owner.u_equip(owner.l_ear) + owner.u_equip(owner.r_ear) owner.u_equip(owner.wear_mask) if(ARM_RIGHT) if(status & ORGAN_ROBOT) diff --git a/code/setup.dm b/code/setup.dm index 9b11e9a9cf0..ed5255a4ce0 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -171,7 +171,8 @@ var/MAX_EXPLOSION_RANGE = 14 #define SLOT_BACK 1024 #define SLOT_POCKET 2048 //this is to allow items with a w_class of 3 or 4 to fit in pockets. #define SLOT_DENYPOCKET 4096 //this is to deny items with a w_class of 2 or 1 to fit in pockets. - +#define SLOT_TWOEARS 8192 +#define SLOT_LEGS = 16384 //FLAGS BITMASK #define STOPSPRESSUREDMAGE 1 //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere @@ -235,7 +236,7 @@ var/MAX_EXPLOSION_RANGE = 14 #define slot_r_hand 5 #define slot_belt 6 #define slot_wear_id 7 -#define slot_ears 8 +#define slot_l_ear 8 #define slot_glasses 9 #define slot_gloves 10 #define slot_head 11 @@ -247,6 +248,8 @@ var/MAX_EXPLOSION_RANGE = 14 #define slot_s_store 17 #define slot_in_backpack 18 #define slot_legcuffed 19 +#define slot_r_ear 20 +#define slot_legs 21 //Cant seem to find a mob bitflags area other than the powers one From 65fe9d429c67117da44c32a83aaf0d936ef38bf9 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:06:27 +0100 Subject: [PATCH 3/7] Heads can now change the alert level. --- code/game/machinery/computer/communications.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 464aa41031c..9d499e168c8 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -76,7 +76,7 @@ var/obj/item/device/pda/pda = I I = pda.id if (I && istype(I)) - if(access_captain in I.access) + if(access_captain in I.access || access_heads in I.access) //Let heads change the alert level. var/old_level = security_level if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN @@ -308,7 +308,7 @@ dat += "
\[ Send an emergency message to \[UNKNOWN\] \]" dat += "
\[ Restore Backup Routing Data \]" - dat += "
\[ Change alert level \]" + dat += "
\[ Change alert level \]" if(emergency_shuttle.location==0) if (emergency_shuttle.online) dat += "
\[ Cancel Shuttle Call \]" From a2295821878e5da0217e6e13396ca3c0f070b3c4 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:10:20 +0100 Subject: [PATCH 4/7] Added IA stamps, IA office has a receiving desk. --- code/modules/paperwork/stamps.dm | 10 ++++++++++ icons/obj/bureaucracy.dmi | Bin 9078 -> 9294 bytes maps/tgstation2.dmm | 16 ++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 644eaf646b2..48a1fd00b31 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -54,6 +54,16 @@ icon_state = "stamp-clown" color = "clown" +/obj/item/weapon/stamp/internalaffairs + name = "internal affairs rubber stamp" + icon_state = "stamp-intaff" + color = "intaff" + +/obj/item/weapon/stamp/centcomm + name = "centcomm rubber stamp" + icon_state = "stamp-cent" + color = "centcomm" + /obj/item/weapon/stamp/attack_paw(mob/user as mob) return attack_hand(user) \ No newline at end of file diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 4578c90e7b89e4a424d220936544526affedb0b4..18ee15e05280215d821cbd2a82d4206bfc6e527f 100644 GIT binary patch literal 9294 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 bG#p-TlUFtVm>jtJo(9lReXLTZY#sJrpjju4 diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index d773e5583d3..97b8e4cc897 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -921,10 +921,10 @@ "arK" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood{icon_state = "wood-broken3"},/area/security/vacantoffice2) "arL" = (/turf/simulated/floor/wood,/area/security/vacantoffice2) "arM" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/light_construct{icon_state = "tube-construct-stage1"; dir = 1},/turf/simulated/floor/wood,/area/security/vacantoffice2) -"arN" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"arN" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only{dir = 1; name = "hazard door north"},/obj/machinery/door/window/eastright{base_state = "left"; dir = 2; icon_state = "left"; name = "Internal Affairs Desk"; req_access_txt = "38"},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/folder/white,/turf/simulated/floor/plating,/area/lawoffice) "arO" = (/obj/machinery/photocopier,/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 27},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "arP" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) -"arQ" = (/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"arQ" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/hand_labeler,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "arR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "arS" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/weapon/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "arT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) @@ -964,7 +964,7 @@ "asB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/security/vacantoffice2) "asC" = (/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/security/vacantoffice2) "asD" = (/obj/machinery/requests_console{pixel_x = 30},/turf/simulated/floor/wood{icon_state = "wood-broken3"},/area/security/vacantoffice2) -"asE" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/device/camera{pixel_x = 3; pixel_y = -4},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"asE" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/device/camera{pixel_x = 3; pixel_y = -4},/obj/item/weapon/stamp/denied,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "asF" = (/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "asG" = (/obj/structure/closet/lawcloset,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "asH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/hallway/secondary/exit) @@ -1047,8 +1047,8 @@ "aug" = (/obj/structure/computerframe,/turf/simulated/floor/wood,/area/security/vacantoffice2) "auh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/requests_console{pixel_x = -30},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "aui" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Internal Affairs Agent"},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) -"auj" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) -"auk" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"auj" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/internalaffairs,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"auk" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp/internalaffairs,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "aul" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Internal Affairs Agent"},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "aum" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "aun" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep) @@ -10267,11 +10267,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalNaafapwapwapwapwapwaafaoVaafapwapwapwapwapwaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaankapxapyapxapzapxapAapAapBapCapDapAapAapAapAapAapAapAapAapAapGapHapIapJapKapLapMapNalcapOapPapQapRapSapTapUapVapWajhajhajhapXajhaldaqaaqbaqcaqdaqealMalMalMalMalMaaaaaaaaaaaaaaaaaaalOaaaaaaaaaaafaaaaaaaafaoOaaaaaaaaaaafaaaaaaaaaalOaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaaaaaaaaaafaaaaaaaafaoVaaaaaaaaaaafaaaaaaaaaamnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafapxaqfaqgapxapxaqhapGaqiapGapGapGapGapGapGapGapGapGapGapGaqlapGaqmapGaqnapGapGapGalcaqoaqpaqqaqrapQaqsapUajpaquaqvaqwaqxaqyakUaqAaqBalLalLalLajhalMalMalMalMalMaaaaaaaaaaaaaaaaaaalNaafaohaohaohaohaohaafaoOaafaohaohaohaohaohaafalNaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalNaafaojaojaojaojaojaafaoVaafaojaojaojaojaojaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapxaqCaqDaqEaqFaqGaqHaqIaqJaqJaqJaqJaqJaqJaqJaqLaqOaqNaqOaqPaqQaqRaqSaqTaqUaqSaqValcaphaphaphaphaphaphaqWaqXaqYaqZaraarbarcajhalLajzargalLaaaaaaaaaalMalMalMaaaaaaaaaaaaaaaaaaaaaalNaafaoLaoMaoMaoMaoMaoNaoOaoPaoQaoQaoQaoQaoRaafalNaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarhariarhaaaaaaaaaaaaaaaaaaaaaalNaafaoSaoTaoTaoTaoTaoUaoVaoWaoXaoXaoXaoXaoYaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapxaoZarjapxarkarkaixarmajgarkarkaroaroaroaroarparoaroarqarrarsartalLarualLarvalLalLaprajhajhajhajhajharwaqXarxaryaryaryarzarAarBarCalSalLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalNaafapvapvapvapvapvaafaoOaafapvapvapvapvapvaafalNaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaMzarFaMzaaaaaaaaaaaaaaaaaaaaaalNaafapwapwapwapwapwaafaoVaafapwapwapwapwapwaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaagapxarGapaapxarHarIarJarKarLarMarkarNarOarParQarRarSaQfarUapGarVarWarXarYarZarZarZarZarZasaarZarZarZasbascasdaseasfasgashasiaqjaskaslasmalLaafaQeaQcaQcaQdaQcaQcaQaaaaaaaaaaaaaaaaalOaaaaaaaaaaafaaaaaaaaaaoOaaaaaaaaaaafaaaaaaaaaalOaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarhariarhaaaaaaaaaaaaaaaaaaaaaalNaafaoSaoTaoTaoTaoTaoUaoVaoWaoXaoXaoXaoXaoYaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapxaoZarjapxarkarkaixarmajgarkarkaroaroaroarNarparoaroarqarrarsartalLarualLarvalLalLaprajhajhajhajhajharwaqXarxaryaryaryarzarAarBarCalSalLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalNaafapvapvapvapvapvaafaoOaafapvapvapvapvapvaafalNaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaMzarFaMzaaaaaaaaaaaaaaaaaaaaaalNaafapwapwapwapwapwaafaoVaafapwapwapwapwapwaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaagapxarGapaapxarHarIarJarKarLarMarkarQarOarPasFarRarSaQfarUapGarVarWarXarYarZarZarZarZarZasaarZarZarZasbascasdaseasfasgashasiaqjaskaslasmalLaafaQeaQcaQcaQdaQcaQcaQaaaaaaaaaaaaaaaaalOaaaaaaaaaaafaaaaaaaaaaoOaaaaaaaaaaafaaaaaaaaaalOaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasrassastaaaasuasvaswaaaaafaNAarhaNAaaaaaaaaaaaaaaaaaaaaaalOaaaaaaaaaaafaaaaaaaaaaoVaaaaaaaaaaafaaaaaaaaaalOaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafapxapxapxapxapaapxasyaszasAasBasCasDarkasEasFasFasFarRasGaQhasIasJasKalLasLasMasNasNasNasNasOasMasNasPasNasMasNasNasPasNasQasRasSasTasUasVasWasWasWaQgasYasYasYasYasYaQgasWaaaaaaaaaaaaalNaafaohaohaohaohaohaafaoOaafaohaohaohaohaohaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaknaknaknaknaknaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasZataatbataasZatcatdatcasZaafaNAateaQiaaaaaaaaaaaaaaaaaaaaaalNaafaojaojaojaojaojaafaoVaafaojaojaojaojaojaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafapxatgathapxapaapxatiatjatkatlatmatnarkatoasFatpatparRbhUaQhapAapGatqalLatratsattatuatvatwatxatyatwatzatAatBatwatCatDatEatFatGatHatIatJatKatLatMasWaQgasYasYasYasYasYaQgasWaafaaaaaaaaaalOaafaoLaoMaoMaoMaoMaoNaoOaoPaoQaoQaoQaoQaoRaafalNaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatNataatOataatNatcatPatcatNatQaQlatSaQAaQmaQmaQxatQatQaafaaaalNaafaoSaoTaoTaoTaoTaoUaoVaoWaoXaoXaoXaoXaoYaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafapxatWatXatYatZauaaubaucaudaueaufaugarkauhauiaujaukaulaumaQhapAapGarValLatratsaunauoatvatwaupauqatwaurausautatwauuausauvasWauwauxauyauzauAauBauCauDaQjasYasYasYasYasYaQkasWasWasWaaaaaaalOaaaapvapvapvapvapvaafaoOaafapvapvapvapvapvaaaamnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatNataatOataatNatcatPatcatNatQaQlatSaQAaQmaQmaQxatQatQaafaaaalNaafaoSaoTaoTaoTaoTaoUaoVaoWaoXaoXaoXaoXaoYaafalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafapxatWatXatYatZauaaubaucaudaueaufaugarkauhauiaukaujaulaumaQhapAapGarValLatratsaunauoatvatwaupauqatwaurausautatwauuausauvasWauwauxauyauzauAauBauCauDaQjasYasYasYasYasYaQkasWasWasWaaaaaaalOaaaapvapvapvapvapvaafaoOaafapvapvapvapvapvaaaamnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatNauGauHauIatNauJauKauLatNarharhauMauNauOauPauQauRatQaaaaaaamnaaaapwapwapwapwapwaafaoVaafapwapwapwapwapwaaaalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaagapxauSaoZapxauTapxauUauVauWauXauYauZarkavaavbavcavcavdaveaKDavgavhaviavjavkavlaunatuatvatwavmauqatwatwavnatwatwatwavoatwasWavpavqavravravsavtavuavvavwasYasYasYasYasYavxavyavzaKCaaaaaaalOaaaaafaaaaafaafaaaaaaaoOaaaaaaaafaaaaaaaafaaaalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatNavBavCavDatNavBavCavDatNavEavFavGavGavGavGavHavIaMzaaaaaaalNaaaaafaaaaafaafaaaaaaavJaaaaaaaafaaaaaaaafaaaalNaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaagapxapxapxapxauTapxavKavLavLapZavLavNavLavOavPavPavPavPavQavRavSapGavTalLavUasMavVatuavWavXavmavYavZawaawbawbawcawdawbaweaKKawgawhawiawjawjawkawlawmaLuasYasYasYasYasYaLuawoawpaLvaaaaaaalOalOalNaaaaaaaafaaaaaaaoOaaaaafaafaafaafalNalNalNaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaasZatNawrawsasZatNawrawsasZatQawtatQatQatQatQatQawuaNAaaaaaaalNalNalNaaaaaaaafaaaaNfawwaNfaafaafaafaafalNalNalNaafapxapxapxapxaOZaOXaOXaOXaOXaOXaOXaOXaOWapxapxaOoaObaOnapxawDaNNawEawFawGawHawHawHawIawHawJawHawKawLawMawMawNawNawOawPawQawRaqAawSawTawUawVawWatwavmawXawXawXawZawZaxaawYawXawXaxbaxcaxdawiawjawjawkawlaxeaNeasYasYasYasYasYaNeaxgawpaLvaaaaaaaaaaaaaafaafaaaaafaaaaaaaxhaaaaaaaafaaaaaaaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 5f68a4c65624ae9ff5d370aeb26f47169946d9ad Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:10:47 +0100 Subject: [PATCH 5/7] Misc formatting errors. --- code/game/gamemodes/game_mode.dm | 2 +- code/game/gamemodes/revolution/rp_revolution.dm | 2 +- code/modules/reagents/reagent_containers/borghydro.dm | 4 ++-- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a78e8dd8ae0..83c77f24a87 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -248,7 +248,7 @@ Implants; for (var/obj/machinery/computer/communications/comm in machines) if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) - intercept.name = "paper- 'Cent. Com. Status Summary'" + intercept.name = "paper - 'Cent. Com. Status Summary'" intercept.info = intercepttext comm.messagetitle.Add("Cent. Com. Status Summary") diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 98923b49eef..06573263bee 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -233,7 +233,7 @@ for (var/obj/machinery/computer/communications/comm in world) if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) - intercept.name = "paper- 'Cent. Com. Announcement'" + intercept.name = "paper - 'Cent. Com. Announcement'" intercept.info = message comm.messagetitle.Add("Cent. Com. Announcement") diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 130ea2ba7ac..8491c35fa8d 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -76,7 +76,7 @@ R.reaction(M, INGEST) if(M.reagents) var/trans = R.trans_to(M, amount_per_transfer_from_this) - user << "\blue [trans] units injected. [R.total_volume] units remaining." + user << "\blue [trans] units injected. [R.total_volume] units remaining." return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) @@ -104,4 +104,4 @@ empty = 0 if(empty) - usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more." + usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more." diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 0b4a3c1e7e9..42ad3df0d1e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -41,7 +41,7 @@ injected += R.name var/trans = reagents.trans_to(M, amount_per_transfer_from_this) - user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." + user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." var/contained = english_list(injected) From 75f53ba5cde53536fa273e5e190705fd0a806b0f Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:12:04 +0100 Subject: [PATCH 6/7] Reverts IA centcomm messaging due to the fax machine. --- code/game/objects/items/devices/PDA/PDA.dm | 25 +-------------------- code/game/objects/items/devices/PDA/cart.dm | 3 +-- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index d0b2e7e5cc0..e494baf0245 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -38,7 +38,6 @@ var/global/list/obj/item/device/pda/PDAs = list() var/cart = "" //A place to stick cartridge menu information var/detonate = 1 // Can the PDA be blown up? var/hidden = 0 // Is the PDA hidden from the PDA list? - var/centcomm_message_cooldown = 0 //Internal Affairs centcomm message cooldown var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -379,16 +378,11 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += "" else dat += "" if(cartridge.access_quartermaster) - dat += "

Quartermaster Functions

" + dat += "

Quartermaster Functions:

" dat += "" - if (cartridge.access_internalaffairs) - dat += "

Internal Affairs Functions

" - dat += "" dat += "" dat += "

Utilities

" @@ -683,23 +677,6 @@ var/global/list/obj/item/device/pda/PDAs = list() else U << browse(null, "window=pda") return - if("Centcomm Message") - if(istype(cartridge, /obj/item/weapon/cartridge/lawyer)) - if(centcomm_message_cooldown) - U << "\red Arrays recycling. Please stand by." - return - var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Use only as a last resort if all other avenues have been exhausted. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") - if(!input || !(usr in view(1,src))) - return - Centcomm_announce(input, usr) - U << "\blue Message transmitted." - log_say("[key_name(usr)] has made a Centcomm announcement: [input]") - centcomm_message_cooldown = 1 - spawn(300)//30 seconds cooldown - centcomm_message_cooldown = 0 - else - U << browse(null, "window=pda") - return //SYNDICATE FUNCTIONS=================================== diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 6f25f2b55d6..f0e3ee98f17 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -14,7 +14,6 @@ var/access_clown = 0 var/access_mime = 0 var/access_janitor = 0 - var/access_internalaffairs = 0 // var/access_flora = 0 var/access_reagent_scanner = 0 var/access_remote_door = 0 //Control some blast doors remotely!! @@ -80,7 +79,6 @@ name = "P.R.O.V.E. Cartridge" icon_state = "cart-s" access_security = 1 - access_internalaffairs = 1 clown name = "Honkworks 5.0" @@ -604,6 +602,7 @@ Code: menu += "ERROR: Unable to determine current location." menu += "

Refresh GPS Locator" + /obj/item/weapon/cartridge/Topic(href, href_list) ..() From 712fbc285f4c798920c17314594e5eeb9655886e Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:38:32 +0100 Subject: [PATCH 7/7] Smaller teacup, credit to Malsquando. --- icons/obj/drinks.dmi | Bin 59636 -> 59748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 5b9521e089f361e6662448e8ed85dff4773c76dd..6e4d355c5bdf42f72c22b4300d557da7eec97bb3 100644 GIT binary patch delta 3335 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 RzzYBX002ovPDHLkV1kF;Tn+#L delta 3222 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