Merge pull request #15914 from Hatterhat/conveyor-sorter

[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
This commit is contained in:
silicons
2023-01-07 14:09:55 -08:00
committed by GitHub
8 changed files with 223 additions and 12 deletions
+6
View File
@@ -2,6 +2,7 @@
layer = ABOVE_MOB_LAYER
anchored = TRUE
default_driver_move = FALSE
var/explode_on_death = TRUE
var/car_traits = NONE //Bitflag for special behavior such as kidnapping
var/engine_sound = 'sound/vehicles/carrev.ogg'
var/last_enginesound_time
@@ -12,6 +13,11 @@
. = ..()
LoadComponent(/datum/component/riding)
/obj/vehicle/sealed/car/Destroy()
. = ..()
if(explode_on_death)
explosion(loc, 0, 1, 2, 3, 0)
/obj/vehicle/sealed/car/generate_actions()
. = ..()
initialize_controller_action_type(/datum/action/vehicle/sealed/remove_key, VEHICLE_CONTROL_DRIVE)
-3
View File
@@ -1,7 +1,6 @@
/obj/vehicle/sealed
enclosed = TRUE // you're in a sealed vehicle dont get dinked idiot
var/enter_delay = 20
var/explode_on_death = TRUE
flags_1 = BLOCK_FACE_ATOM_1
/obj/vehicle/sealed/generate_actions()
@@ -90,8 +89,6 @@
/obj/vehicle/sealed/Destroy()
DumpMobs()
if(explode_on_death)
explosion(loc, 0, 1, 2, 3, 0)
return ..()
/obj/vehicle/sealed/proc/DumpMobs(randomstep = TRUE)