From 0e9b583caf1ef7715561d8b305d5f5bb38e15f26 Mon Sep 17 00:00:00 2001 From: datlo Date: Sat, 7 Jul 2018 07:50:31 +0100 Subject: [PATCH] Combined table and floor check --- code/game/objects/items/weapons/RSF.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 02f6d878511..62b203e43b1 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -57,16 +57,13 @@ RSF if(!proximity) return if(!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor))) return - var spawn_location - if(istype(A, /obj/structure/table)) - spawn_location = A.loc - else if (istype(A, /turf/simulated/floor)) - spawn_location = A + var/turf/T = get_turf(A) + if(istype(T) && !T.density) + spawn_location = T else to_chat(user, "The RSF can only create service items on tables, or floors.") return - if(isrobot(user)) var/mob/living/silicon/robot/engy = user if(!engy.cell.use(configured_items[mode][2]))