From a4657e63477eceb3e99f3d4735ef0c8e6e0a17fd Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 2 Sep 2022 01:13:19 -0400 Subject: [PATCH 1/2] Fixes runtime with simplemob headsets --- code/modules/mob/living/simple_mob/simple_mob_vr.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 8bf15cea64..45400b2352 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -377,6 +377,7 @@ if(buckle_mob(M)) visible_message("[M] starts riding [name]!") +<<<<<<< HEAD /mob/living/simple_mob/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name) //CHOMPEdit - This whole proc tbh if(message_mode) @@ -392,6 +393,18 @@ if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset)) if(mob_radio.channels[message_mode]) mob_radio.talk_into(src,message,message_mode,verb,speaking) +======= +/mob/living/simple_mob/handle_message_mode(message_mode, message, verb, used_radios, speaking, alt_name) + if(mob_radio) + switch(message_mode) + if("intercom") + for(var/obj/item/device/radio/intercom/I in view(1, null)) + I.talk_into(src, message, verb, speaking) + used_radios += I + if("headset") + if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset/mob_headset)) + mob_radio.talk_into(src,message,null,verb,speaking) +>>>>>>> ab65f1ebfa... Merge pull request #13626 from Verkister/patch-120 used_radios += mob_radio else ..() From 5924b77fc0d17b4c3dd8ba1ed945ed17fb0e74ec Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 4 Sep 2022 15:55:16 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../mob/living/simple_mob/simple_mob_vr.dm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 45400b2352..37b51a1101 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -377,8 +377,7 @@ if(buckle_mob(M)) visible_message("[M] starts riding [name]!") -<<<<<<< HEAD -/mob/living/simple_mob/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name) +/mob/living/simple_mob/handle_message_mode(message_mode, message, verb, used_radios, speaking, alt_name) //CHOMPEdit - This whole proc tbh if(message_mode) if(message_mode == "intercom") @@ -393,18 +392,6 @@ if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset)) if(mob_radio.channels[message_mode]) mob_radio.talk_into(src,message,message_mode,verb,speaking) -======= -/mob/living/simple_mob/handle_message_mode(message_mode, message, verb, used_radios, speaking, alt_name) - if(mob_radio) - switch(message_mode) - if("intercom") - for(var/obj/item/device/radio/intercom/I in view(1, null)) - I.talk_into(src, message, verb, speaking) - used_radios += I - if("headset") - if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset/mob_headset)) - mob_radio.talk_into(src,message,null,verb,speaking) ->>>>>>> ab65f1ebfa... Merge pull request #13626 from Verkister/patch-120 used_radios += mob_radio else ..()