From 4b29ca2b462d925525de26f026649ad5a9c7e13d Mon Sep 17 00:00:00 2001 From: Citinited Date: Thu, 25 Oct 2018 20:31:55 +0100 Subject: [PATCH] what srcery is this (removes implied srcs) --- code/modules/assembly/holder.dm | 12 ++++++------ code/modules/assembly/igniter.dm | 10 +++++----- code/modules/assembly/mousetrap.dm | 2 +- code/modules/assembly/signaler.dm | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index c90b3f62171..68aa0f1db0b 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -30,7 +30,7 @@ return ..() /obj/item/assembly_holder/attach(var/obj/item/D, var/obj/item/D2, var/mob/user) - if(!D||!D2) + if(!D || !D2) return FALSE if(!isassembly(D) || !isassembly(D2)) return FALSE @@ -60,7 +60,7 @@ for(var/O in a_left.attached_overlays) overlays += "[O]_l" if(a_right) - src.overlays += "[a_right.icon_state]_right" + overlays += "[a_right.icon_state]_right" for(var/O in a_right.attached_overlays) overlays += "[O]_r" if(master) @@ -69,8 +69,8 @@ /obj/item/assembly_holder/examine(mob/user) ..(user) - if(in_range(src, user) || src.loc == user) - if(src.secured) + if(in_range(src, user) || loc == user) + if(secured) to_chat(user, "\The [src] is ready!") else to_chat(user, "\The [src] can be attached!") @@ -157,8 +157,8 @@ /obj/item/assembly_holder/attack_self(mob/user as mob) - src.add_fingerprint(user) - if(src.secured) + add_fingerprint(user) + if(secured) if(!a_left || !a_right) to_chat(user, "Assembly part missing!") return diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 93ccdc82e4b..1059948a482 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -25,13 +25,13 @@ return FALSE//Cooldown check var/turf/location = get_turf(loc) if(location) location.hotspot_expose(1000,1000) - if(istype(src.loc,/obj/item/assembly_holder)) - if(istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/)) - var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc + if(istype(loc,/obj/item/assembly_holder)) + if(istype(loc.loc, /obj/structure/reagent_dispensers/fueltank/)) + var/obj/structure/reagent_dispensers/fueltank/tank = loc.loc if(tank) tank.boom(TRUE) - if(istype(src.loc.loc, /obj/item/reagent_containers/glass/beaker/)) - var/obj/item/reagent_containers/glass/beaker/beakerbomb = src.loc.loc + if(istype(loc.loc, /obj/item/reagent_containers/glass/beaker/)) + var/obj/item/reagent_containers/glass/beaker/beakerbomb = loc.loc if(beakerbomb) beakerbomb.heat_beaker() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index d9ce1125d37..9ea81eb84c4 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -58,7 +58,7 @@ var/mob/living/simple_animal/mouse/M = target visible_message("SPLAT!") M.splat() - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(loc, 'sound/effects/snap.ogg', 50, 1) layer = MOB_LAYER - 0.2 armed = 0 update_icon() diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index fe8c283ca7a..ed0ce2c01ad 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -67,14 +67,14 @@ Frequency: - - - [format_frequency(src.frequency)] + [format_frequency(frequency)] + +
Code: - - - [src.code] + [code] + +
[t1] @@ -102,10 +102,10 @@ set_frequency(new_frequency) if(href_list["code"]) - src.code += text2num(href_list["code"]) - src.code = round(src.code) - src.code = min(100, src.code) - src.code = max(1, src.code) + code += text2num(href_list["code"]) + code = round(code) + code = min(100, code) + code = max(1, code) if(href_list["receive"]) receiving = !receiving @@ -135,7 +135,7 @@ return /obj/item/assembly/signaler/pulse(var/radio = 0) - if(src.connected && src.wires) + if(connected && wires) connected.Pulse(src) else return ..(radio) @@ -147,11 +147,11 @@ if(signal.encryption != code) return FALSE - if(!(src.wires & WIRE_RADIO_RECEIVE)) + if(!(wires & WIRE_RADIO_RECEIVE)) return FALSE pulse(1) - for(var/mob/O in hearers(1, src.loc)) + for(var/mob/O in hearers(1, loc)) O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2) return