Skip to content

Commit

Permalink
auto cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Sep 27, 2023
1 parent aaea50b commit 2999822
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
15 changes: 3 additions & 12 deletions _maps/map_files/Oshan/oshan.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,8 @@
pixel_y = 5;
pixel_x = 7;
id = "cargo";
name = "Launch Cargo"
name = "Launch Cargo";
looping_time = 1
},
/turf/closed/wall/r_wall,
/area/station/cargo/storage)
Expand Down Expand Up @@ -9847,16 +9848,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
"eZq" = (
/obj/structure/disposalpipe/segment{
dir = 4;
invisibility = 101
},
/obj/docking_port/stationary/escape_pod{
dir = 4
},
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
"eZx" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
Expand Down Expand Up @@ -67302,7 +67293,7 @@ iLH
ont
dGk
hcx
eZq
hcx
dGk
nip
qRY
Expand Down
5 changes: 4 additions & 1 deletion code/game/machinery/computer/pod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
if(COOLDOWN_FINISHED(src, massdriver_countdown))
timing = FALSE
// alarm() sleeps, so we want to end processing first and can't rely on return PROCESS_KILL
end_processing()
if(!looping_time)
end_processing()
else
COOLDOWN_START(src, massdriver_countdown, time SECONDS)
alarm()

/**
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/modules/ocean_content/fluff/cargo_driver.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/obj/machinery/computer/pod/var/looping_time = FALSE

/obj/machinery/mass_driver/cargo_driver
name = "Cargo Driver"
id = MASSDRIVER_CARGO
Expand Down

0 comments on commit 2999822

Please sign in to comment.