From 9d3015cd24b2a2e602be82634352ca47218a7b7c Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 23 May 2020 18:17:01 +0100 Subject: [PATCH] Fixes my awful typechecks --- code/game/machinery/tcomms/_base.dm | 12 ------------ code/game/objects/items/devices/radio/radio.dm | 2 -- 2 files changed, 14 deletions(-) diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm index dccf1b23f28..d81afe942e8 100644 --- a/code/game/machinery/tcomms/_base.dm +++ b/code/game/machinery/tcomms/_base.dm @@ -283,8 +283,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") for(var/M in receive) - if(!istype(M, /mob)) - return var/mob/R = M /* --- Loop through the receivers and categorize them --- */ @@ -376,8 +374,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(length(heard_masked)) for(var/M in heard_masked) - if(!istype(M, /mob)) - return var/mob/R = M R.hear_radio(tcm.message_pieces, tcm.verbage, part_a, part_b, tcm.sender, 0, tcm.sender_name, follow_target=tcm.follow_target) @@ -385,8 +381,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(length(heard_normal)) for(var/M in heard_normal) - if(!istype(M, /mob)) - return var/mob/R = M R.hear_radio(tcm.message_pieces, tcm.verbage, part_a, part_b, tcm.sender, 0, tcm.sender_name, follow_target=tcm.follow_target) @@ -394,8 +388,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(length(heard_voice)) for(var/M in heard_voice) - if(!istype(M, /mob)) - return var/mob/R = M R.hear_radio(tcm.message_pieces, tcm.verbage, part_a, part_b, tcm.sender,0, tcm.vname, follow_target=tcm.follow_target) @@ -404,8 +396,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(length(heard_garbled)) for(var/M in heard_garbled) - if(!istype(M, /mob)) - return var/mob/R = M R.hear_radio(tcm.message_pieces, tcm.verbage, part_a, part_b, tcm.sender, 1, tcm.vname, follow_target=tcm.follow_target) @@ -414,8 +404,6 @@ GLOBAL_LIST_EMPTY(tcomms_machines) if(length(heard_gibberish)) for(var/M in heard_gibberish) - if(!istype(M, /mob)) - return var/mob/R = M R.hear_radio(tcm.message_pieces, tcm.verbage, part_a, part_b, tcm.sender, 1, follow_target=tcm.follow_target) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index ffb34100cfb..483db1db86d 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -343,8 +343,6 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( var/jammed = FALSE var/turf/position = get_turf(src) for(var/J in GLOB.active_jammers) - if(!istype(J, /obj/item/jammer)) - return var/obj/item/jammer/jammer = J if(get_dist(position, get_turf(jammer)) < jammer.range) jammed = TRUE