cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,258 Commits 26 Branches 2 Tags
2cf6acd4e752e9893ab2acf7f788caa5cd4ec91b
Commit Graph

40 Commits

Author SHA1 Message Date
mwerezak
eb86081165 Adds direction arg for area/move_contents_to() 
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
 2014-06-24 07:26:03 -04:00
mwerezak
d6e768fbfd Fixes escape shuttle not transitioning 
Conflicts:
	code/modules/shuttles/shuttle.dm
 2014-06-24 07:12:11 -04:00
mwerezak
bd339f6156 Replaces the emergency shuttle control console 
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.

Conflicts:
	maps/tgstation2.dmm
 2014-06-24 07:10:28 -04:00
mwerezak
e6944b989c Adds shuttle controller 
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.

Conflicts:
	code/controllers/master_controller.dm
	code/controllers/verbs.dm
	code/game/supplyshuttle.dm
	code/modules/shuttles/shuttle.dm
 2014-06-24 07:06:48 -04:00
mwerezak
7e057e7eb9 Minor shuttle fixes and cleanup 
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
 2014-06-23 11:10:28 -04:00
mwerezak
d8c02c7b6e Some fixes 
Conflicts:
	code/game/supplyshuttle.dm
 2014-06-23 11:09:14 -04:00
mwerezak
8a873b4a1c Adds escape pods to the controller 2014-06-23 11:08:15 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum 
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
 2014-06-23 11:07:58 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle 
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
 2014-06-23 10:33:05 -04:00
ZomgPonies
2fd3ad5802 NSS Cyberiad to NGS Cyberiad 2014-06-21 17:02:35 -04:00
mwerezak
428bf6d350 Adds supply shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-19 10:13:48 -04:00
mwerezak
175c48240d Makes the supply shuttle process in a tighter loop 
Conflicts:
	code/game/supplyshuttle.dm
 2014-06-19 09:54:45 -04:00
mwerezak
723979115c Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
 2014-06-19 09:52:35 -04:00
mwerezak
bc2fa7940a Adds supply shuttle datum 2014-06-19 09:40:28 -04:00
mwerezak
b7c3e13901 Fixes special shuttle consoles being... 
...deconstructible
 2014-06-18 22:18:08 -04:00
ZomgPonies
4fb9cf4aa9 Final shuttle controller for ERT/DS shuttle. 2014-06-18 01:12:28 -04:00
mwerezak
93060a2766 Fixes old ferry shuttles (e.g. supply) not being able to use move() directly. 
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
 2014-06-15 13:55:44 -04:00
ZomgPonies
a21ccf0139 Add the other shuttle controllers back in 2014-06-15 01:54:38 -04:00
ZomgPonies
9f9b2b5ae2 Commenting out the other docking controllers until I get science setup correctly. 2014-06-14 21:38:27 -04:00
mwerezak
e0d3e7e4d7 Adds docking control to ERT shuttle 
Also adjusts the location of the centcom shuttle docking controller.

Conflicts:
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
 2014-06-14 21:33:05 -04:00
mwerezak
aa39abacec Adds centcom and admin shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-14 21:29:47 -04:00
mwerezak
3dbb1fe6c9 Adds engineering shuttle docking controllers 
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.

Conflicts:
	maps/tgstation2.dmm
 2014-06-14 21:29:25 -04:00
mwerezak
f22c9db34d Streamlined docking code 
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
 2014-06-14 21:29:02 -04:00
mwerezak
15641bc88a Adds mining shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-14 21:25:18 -04:00
mwerezak
cdabebba3e Adjusts how undocking signals are used 
Now both server and client will to undock concurrently. It looks much
more natural.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
 2014-06-14 21:23:59 -04:00
mwerezak
cd540fe56d Shuttle console refactoring 
Also adjusted the way undocking signals were used.

Conflicts:
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
 2014-06-14 21:22:30 -04:00
mwerezak
fbd4c870eb Docking overrides now have a clear purpose 
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
 2014-06-14 21:19:53 -04:00
mwerezak
cc287d00db Shuttles now dock on arrival and departure 
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
 2014-06-14 04:17:37 -04:00
mwerezak
a54ef207a1 Reworks shuttles to be more extensible 
Kudos to Zuhayr for laying the groundwork for this.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/shuttles/shuttle.dm
 2014-06-14 04:13:34 -04:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
 2014-06-14 04:10:39 -04:00
mwerezak
629c14a66c Adds support for different shuttle states 
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file

Conflicts:
	code/modules/shuttles/shuttle.dm
 2014-06-14 04:04:36 -04:00
mwerezak
1f90fe05c8 Adds docking controllers to shuttles 
Shuttles dock at round start.

Conflicts:
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
 2014-06-14 03:58:51 -04:00
Zuhayr
ed380b1dad Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break. 2014-06-14 02:34:44 -04:00
Zuhayr
361503fa8b Converted Syndicate shuttle over to multi-shuttle setup. 
Conflicts:
	baystation12.dme
	code/game/gamemodes/nuclear/pinpointer.dm
 2014-06-14 02:25:15 -04:00
Zuhayr
4385b1320c Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 
Conflicts:
	baystation12.dme
	code/game/gamemodes/vox/heist/heist.dm
	code/game/machinery/computer/vox_shuttle.dm
 2014-06-14 02:22:11 -04:00
Zuhayr
e6a8680347 Update shuttle.dm 
Corrected a mistake.
 2014-06-14 02:11:05 -04:00
Zuhayr
7c442ac9a3 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn. 
Conflicts:
	code/controllers/master_controller.dm
	code/modules/admin/admin.dm
 2014-06-14 02:10:10 -04:00
Zuhayr
689110af1d Some cleanup stuff for prior commits. 2014-06-14 02:01:58 -04:00
Zuhayr
e4b95aa05e Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 
Conflicts:
	baystation12.dme
	code/modules/mining/mine_items.dm
	code/modules/research/research_shuttle.dm
 2014-06-14 02:01:14 -04:00
Zuhayr
4f37a924fe Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering. 
Conflicts:
	baystation12.dme
	maps/tgstation2.dmm
 2014-06-04 15:30:09 -04:00