DJSnapshot
de282a4e2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Zuhayr
005ac89aad
Tweaks to previous commit.
2014-07-25 23:41:41 +09:30
Zuhayr
19cfe8940c
Added table layout to vote form.
2014-07-25 23:32:05 +09:30
Kelenius
a7748c8542
Adds amount of required players to gamemode vote.
2014-07-25 17:05:15 +04:00
Zuhayr
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
Zuhayr
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
Zuhayr
5ace6d3bc0
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
2014-07-09 19:12:32 +09:30
Chinsky
67c425fe2b
Merge pull request #5463 from mwerezak/emergency-shuttle
...
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
2014-07-03 05:10:35 +04:00
mwerezak
8388ecb94a
Allows escape pods to be armed from inside the pod
2014-07-01 21:55:37 -04:00
mwerezak
191b4763b6
Fixes status displays blanking out when escape shuttle is about to launch
2014-07-01 21:54:50 -04:00
Zuhayr
1bc57b81a3
Merge pull request #5425 from Mloc/bs12-lightopt
...
shuttle + lighting fixes
2014-07-01 07:59:11 +09:30
Mloc-Argent
6fe27b57b1
lighting: fix + optimize colored lights
...
turfs now directly hold color lumcounts
overlay is averaged + rounded from that instead of strings
overall colored lumcount is now rounded properly
fixes having thousands of lighting subareas after a fire
fixes #5417
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-30 23:23:46 +01:00
mwerezak
c147eb9034
Improves the display of shuttle ETAs
2014-06-30 18:00:28 -04:00
mwerezak
9991b46ea6
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.
2014-06-30 15:14:20 -04:00
mwerezak
1cc840dccc
Adds the ability to force launch escape pods
...
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
mwerezak
c8bddfb219
Fixes shuttle announcing arrival in 7 minutes.
2014-06-28 18:47:42 -04:00
Zuhayr
19bb5014a9
More work on custom gear.
2014-06-29 04:22:09 +09:30
mwerezak
7ae03d127b
Fixes macro escape slashes
...
Derp.
2014-06-26 20:48:07 -04:00
mwerezak
363df869e2
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
mwerezak
0f2ea177c9
Improves shuttle ETA calculation
2014-06-26 13:30:44 -04:00
mwerezak
96e584d517
Adds escape pod docking controllers
2014-06-25 13:08:22 -04:00
mwerezak
d5c5d4b21f
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.
2014-06-25 12:32:12 -04:00
mwerezak
717a697fe2
Adds escape shuttle docking controllers
2014-06-25 00:21:52 -04:00
mwerezak
05ced4b89d
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.
2014-06-25 00:18:56 -04:00
mwerezak
e7aef647c2
Fixes #5351
...
Multi-shuttle origin was being assigned a path, not an actual area.
2014-06-24 18:03:45 -04:00
mwerezak
abcba2c725
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
2014-06-24 17:49:20 -04:00
mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
mwerezak
d892099ea3
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
e17b8bffab
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.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c
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.
2014-06-23 22:00:57 -04:00
Zuhayr
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
mwerezak
81f0f868b4
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 01:55:43 -04:00
mwerezak
71351bd285
Some fixes
2014-06-22 20:40:08 -04:00
mwerezak
b0cc1f6789
Forgot to process shuttles
2014-06-22 18:36:43 -04:00
mwerezak
caece105dc
Adds escape pods to the controller
2014-06-22 18:19:07 -04:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
Chinsky
2cc80a0694
Fix for a runtime.
2014-06-22 22:17:56 +04:00
Ccomp5950
68d01b00ab
Merge pull request #5297 from comma/fancy
...
Nextgen lights
2014-06-20 20:30:11 -05:00
mwerezak
e46c3c8834
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
Chinsky
ceecd7abc9
Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
...
Adjusted color mixing helper to use inbuilt procs.
2014-06-18 23:45:25 +04:00
Chinsky
cf53a4d6fb
Made lights look fancier with blend modes
2014-06-18 10:56:01 +04:00
Chinsky
161b37fca0
Got vgstation13 colored lights rewrite working here.
2014-06-17 22:35:23 +04:00
Zuhayr
5be9f0e12f
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:15:28 +09:30
mwerezak
ed4fb8d3c6
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.
2014-06-10 00:05:08 -04:00
mwerezak
b4bb8ab31d
Reworks shuttles to be more extensible
...
Kudos to Zuhayr for laying the groundwork for this.
2014-06-09 23:41:29 -04:00
mwerezak
0319c96502
Adds docking support to shuttles, NanoUI
2014-06-09 23:41:08 -04:00
Zuhayr
95a6f9d613
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
2014-06-07 23:07:49 +09:30
Zuhayr
c01b124ac7
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.
2014-06-03 18:06:05 +09:30
mwerezak
cc4a6e0f26
Fixes config.continous_rounds and adds check
2014-06-01 15:49:13 -04:00
