From a991cb7e72ae8dd55b1975e95b32e03c1685734b Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Mon, 27 Jul 2020 04:57:34 +0100
Subject: [PATCH] Moved pullable items to a list.
---
.../mob/living/silicon/robot/drone/drone.dm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index ae417d488a1..86ff147050b 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -156,7 +156,7 @@
else
var/confirm = null
confirm = alert("Using your ID on a Maintenance Drone will shut it down, are you sure you want to do this?", "Disable Drone", "Yes", "No")
- if (confirm == ("Yes"))
+ if(confirm == ("Yes"))
user.visible_message("\the [user] swipes [user.p_their()] ID card through [src], attempting to shut it down.", "You swipe your ID card through \the [src], attempting to shut it down.")
if(emagged)
@@ -324,15 +324,19 @@
/mob/living/silicon/robot/drone/Bumped(atom/movable/AM)
return
+var/list/pullable_drone_items = list(
+ /obj/item/pipe,
+ /obj/structure/disposalconstruct,
+ /obj/item/stack/cable_coil,
+ /obj/item/stack/rods,
+ /obj/item/stack/sheet,
+ /obj/item/stack/tile,)
+
/mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM)
- if(istype(AM,/obj/item/pipe) \
- || istype(AM,/obj/structure/disposalconstruct) \
- || istype(AM,/obj/item/stack/cable_coil) \
- || istype(AM,/obj/item/stack/rods) \
- || istype(AM,/obj/item/stack/sheet) \
- || istype(AM,/obj/item/stack/tile))
+ if(is_type_in_list(AM, pullable_drone_items))
..()
+
else if(istype(AM,/obj/item))
var/obj/item/O = AM
if(O.w_class > WEIGHT_CLASS_SMALL)