From e7b583ff2947b9a8ee51760c25c21e1532ef20da Mon Sep 17 00:00:00 2001 From: D3athrow Date: Sat, 5 Dec 2015 15:38:34 -0600 Subject: [PATCH] Proper fix to prevent RPD from making a thing while storing it. --- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/bots/medbot.dm | 2 +- code/game/objects/items/weapons/storage/backpack.dm | 4 ++-- code/game/objects/items/weapons/storage/bible.dm | 2 +- code/game/objects/items/weapons/storage/lockbox.dm | 4 ++-- code/game/objects/items/weapons/storage/secure.dm | 2 +- code/modules/projectiles/guns/projectile/pneumatic.dm | 2 +- code/modules/research/mechanic/component_exchanger.dm | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 25a1d7f71a5..f869e037cb7 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -706,7 +706,7 @@ var/global/list/floorbot_targets=list() /obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob) if(!istype(T, /obj/item/stack/tile/plasteel)) - ..() + . = ..() return if(src.contents.len >= 1) to_chat(user, "They wont fit in as there is already stuff inside.") diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 1c95d108793..e6dab68e8fb 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -554,7 +554,7 @@ /obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) - ..() + . = ..() return //Making a medibot! diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9e6fad007c8..b949dfa4db0 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -16,7 +16,7 @@ /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob) playsound(get_turf(src), "rustle", 50, 1, -5) - ..() + . = ..() /* * Backpack Types @@ -62,7 +62,7 @@ user.throw_at(get_turf(src), 10, 5) del(src) return - ..() + . = ..() /obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 01ec221cf0a..50c4ed09ac2 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -157,7 +157,7 @@ /obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) playsound(get_turf(src), "rustle", 50, 1, -5) - ..() + . = ..() /obj/item/weapon/storage/bible/pickup(mob/living/user as mob) if(user.mind && user.mind.assigned_role == "Chaplain") //We are the Chaplain, yes we are diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index f7e2e16cfbc..5dc9939152b 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -49,7 +49,7 @@ O.show_message(text("The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2) if(!locked) - ..() + . = ..() else to_chat(user, "Its locked!") return @@ -183,7 +183,7 @@ tracked_access = "The tracker reads: 'Last unlocked by [ID.registered_name].'" return else - ..() + . = ..() /obj/item/weapon/storage/lockbox/coinbox name = "coinbox" diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index e5315b80cac..4ba7928bda1 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -69,7 +69,7 @@ return // -> storage/attackby() what with handle insertion, etc - ..() + . = ..() /obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location) diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 59edf8bec61..35c2538f7d1 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -60,7 +60,7 @@ item_state = "pneumatic-tank" user.update_icons() else - ..() + . = ..() /obj/item/weapon/storage/pneumatic/examine(mob/user) ..() diff --git a/code/modules/research/mechanic/component_exchanger.dm b/code/modules/research/mechanic/component_exchanger.dm index ec50ba4b3dc..544b0129673 100644 --- a/code/modules/research/mechanic/component_exchanger.dm +++ b/code/modules/research/mechanic/component_exchanger.dm @@ -38,7 +38,7 @@ to_chat(user, "You fill up \the [src] with \the [G]'s contents.") return 1 else - ..() + . = ..() //Redirect the attack only if it's a machine, otherwise don't bother /obj/item/weapon/storage/component_exchanger/preattack(var/atom/A, var/mob/user, proximity_flag)