cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 22:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,736 Commits 27 Branches 2 Tags
62fb3c29813e2894de6aa13c5653900aa51e3f72
Commit Graph

25 Commits

Author SHA1 Message Date
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Markolie
5e95ae82b4 Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update 2015-08-14 06:26:40 +02:00
Markolie
b39a775164 Span fixes, re-add fingerprint to operating computer 2015-07-28 02:42:27 +02:00
SamCroswell
1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -04:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie
2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
mwerezak
7823403456 Updates docking controllers 
Fixed centcom and admin shuttles missing centcom side docking
controllers. Adds prison and gamma shuttle docking controllers. Adds
escape shuttle docking controllers. Adds escape pod docking controllers.
 2014-07-17 00:33:49 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -04:00
Walter0o
2a3bfa443d adds shuttle_control access check to proper place 2014-07-13 07:09:09 -04:00
mwerezak
05c5f81b97 Fixes base shuttle console requiring engine access 2014-06-26 16:53:32 -04:00
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
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
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
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
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
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
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