mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Merge pull request #13549 from farie82/tubes-tweak
Refactors and reworks transit tube pods. Maint drones can now also use them
This commit is contained in:
@@ -31,6 +31,10 @@
|
||||
var/obj/item/stack/sheet/plastic/stack_plastic = null
|
||||
var/obj/item/matter_decompiler/decompiler = null
|
||||
|
||||
// What objects can drones bump into
|
||||
var/static/list/allowed_bumpable_objects = list(/obj/machinery/door, /obj/machinery/recharge_station, /obj/machinery/disposal/deliveryChute,
|
||||
/obj/machinery/teleport/hub, /obj/effect/portal, /obj/structure/transit_tube/station)
|
||||
|
||||
//Used for self-mailing.
|
||||
var/mail_destination = 0
|
||||
var/reboot_cooldown = 60 // one minute
|
||||
@@ -330,11 +334,7 @@
|
||||
|
||||
|
||||
/mob/living/silicon/robot/drone/Bump(atom/movable/AM, yes)
|
||||
if(istype(AM, /obj/machinery/door) \
|
||||
|| istype(AM, /obj/machinery/recharge_station) \
|
||||
|| istype(AM, /obj/machinery/disposal/deliveryChute) \
|
||||
|| istype(AM, /obj/machinery/teleport/hub) \
|
||||
|| istype(AM, /obj/effect/portal))
|
||||
if(is_type_in_list(AM, allowed_bumpable_objects))
|
||||
return ..()
|
||||
|
||||
/mob/living/silicon/robot/drone/Bumped(atom/movable/AM)
|
||||
|
||||
Reference in New Issue
Block a user