From f3028d3edd7f09da3d850d51831cdd79829db7c9 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 16 Oct 2013 11:28:41 +0400 Subject: [PATCH] Attempted fix #3769 Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day --- baystation12.int | 1 + code/game/objects/structures/tables_racks.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/baystation12.int b/baystation12.int index 29f9e64646a..b82874fded5 100644 --- a/baystation12.int +++ b/baystation12.int @@ -1,5 +1,6 @@ // BEGIN_INTERNALS /* +MAP_ICON_TYPE: 0 AUTO_FILE_DIR: OFF */ // END_INTERNALS diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 84bb23a5746..58ed13b9d9d 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -348,6 +348,7 @@ /obj/structure/table/attackby(obj/item/W as obj, mob/user as mob) + if (!W) return if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if (istype(G.affecting, /mob/living))