cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 02:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 26 Branches 2 Tags
2f401fd7d3600aeebbc71864fbcc42915d2abacc
Commit Graph

77 Commits

Author SHA1 Message Date
Markolie
2dfdd7243c Disable hardsuit breaches, re-add engi shuttle 2015-01-19 18:18:58 +01:00
Markolie
b9ccb857d0 Energy gun description fix, UO45 fix, temporarily disable the engi shuttle 2015-01-17 01:05:23 +01:00
Markolie
ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie
47f4161fbb Bug fixes, map fixes 2014-12-22 14:47:58 +01:00
Markolie
303d7dbf47 Access fixes 2014-12-14 02:00:18 +01:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Markolie
7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
Markolie
8d93085560 Prevent AI from using spec ops shuttle 2014-11-30 04:10:07 +01:00
mwerezak
9cad0d5a16 Allows pod to be launched if shuttle leaves early 2014-08-01 01:00:21 -04:00
mwerezak
929e3fb1fd Allows escape shuttle to scan IDs from within UI 
Fixes #5592

Conflicts:
	nano/templates/escape_shuttle_control_console.tmpl
 2014-08-01 01:00:09 -04:00
Bone White
0aebd8afa3 Spec Ops Shuttle Computer Access Fix 
Gives the shuttle controller the correct access for the ERT
 2014-07-27 17:30:22 +01:00
mwerezak
931f592fae Fixes specops shuttle messages 
Specops messages were reversed due to paradise using a different values
for specops shuttle location.
 2014-07-21 20:27:26 -04:00
mwerezak
3e12d5028c Fixes wrong circuit board in labor shuttle console 2014-07-17 00:40:16 -04: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
mwerezak
e0afb0632b Shuttle now can only be late when arriving 2014-07-13 07:12:30 -04:00
mwerezak
b3ce8db989 Fixes shuttle being late AFTER it arrives 2014-07-13 07:12:16 -04:00
mwerezak
908cabea09 Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard 
Might be related to #5459, not sure though.
 2014-07-13 07:10:01 -04:00
Walter0o
2a3bfa443d adds shuttle_control access check to proper place 2014-07-13 07:09:09 -04:00
mwerezak
4f4b96d5b1 Fixes bad emergency shuttle can_force() check 2014-07-13 06:27:45 -04:00
mwerezak
cf05d11854 Status displays now won't blank when undocking, too 2014-07-13 06:27:31 -04:00
mwerezak
f0f6ce06f2 Makes the escape shuttle NanoUI window bigger 2014-07-13 06:27:17 -04:00
mwerezak
fe40190870 Reduces docking timeout to 20 seconds 2014-07-13 06:25:27 -04:00
mwerezak
1ca6e41532 Fixes status displays blanking out when escape shuttle is about to launch 
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-07-13 06:25:10 -04:00
mwerezak
e368bd81a2 Resets emergency shuttle authorization on arrival 2014-07-13 06:05:51 -04:00
mwerezak
40c6508ccb long_jump() now uses an arrive_time var instead of sleeping the whole time. 
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.

Conflicts:
	code/modules/shuttles/shuttle.dm
 2014-07-13 06:05:29 -04:00
mwerezak
11dc8b9a1f Fixes escape shuttle requiring authorization after countdown has finished 2014-06-29 12:08:43 -04:00
mwerezak
2242658936 Fixes shuttles getting stuck when cancelling launch 2014-06-29 12:07:39 -04:00
mwerezak
117221b0d5 Adds the ability to force launch escape pods 
Also reduces their countdown from 15 to 10 seconds.

Conflicts:
	maps/tgstation2.dmm
 2014-06-29 12:07:13 -04:00
mwerezak
9079bb353e Improves the fix for shuttles being stuck if... 
... the docking controller is destroyed.
 2014-06-26 21:19:13 -04:00
mwerezak
d2837379d4 Fixes ERT shuttle not announcing a cancelled... 
...launch if the launch is cancelled after the countdown is completed.
 2014-06-26 18:23:55 -04:00
mwerezak
05c5f81b97 Fixes base shuttle console requiring engine access 2014-06-26 16:53:32 -04:00
mwerezak
38bf6b59c4 Fixes shuttles getting stuck if the docking... 
...controller they are trying to dock with has been destroyed or is not
responding.
 2014-06-26 16:53:11 -04:00
mwerezak
1284dc85c5 Fixes shuttle consoles not checking access 
Generalizes machine access.
 2014-06-26 07:40:51 -04:00
mwerezak
59fd7a1f18 Adds escape pod docking controller type 
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	maps/tgstation2.dmm
 2014-06-26 07:40:15 -04:00
mwerezak
b39093732b Fix for long_jumps never leaving transition area 
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
 2014-06-26 07:34:32 -04:00
mwerezak
ef0e9c50e9 Fixes missing announcements, bad returned() check 
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-06-26 07:14:40 -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
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