Commit Graph

174 Commits

Author SHA1 Message Date
Aronai Sieyes
0e458ac500 Merge pull request #2955 from VOREStation/aro-dashboard
Shuttle dashboard info
2018-02-03 21:11:50 -05:00
Leshana
ca64667773 Let objects register to be informed when shuttles have been setup.
* Switch /obj/shuttle_connector to use it instead of the icky process hack.
2018-02-03 20:54:41 -05:00
Leshana
79464c7315 Implement SSshuttles subsystem
* Replaces the shuttle_controller and shuttle process with the shuttles subsystem.  Instead of docking ports being initialized by the game ticker, its part of the StonedMC Master init order.
* The main advantage of this is control over the initialization order, as well as letting Master be aware of CPU we're using up with shuttle processing.
* By being part of the Master init order, we reduce the uncertainty about "are objects initialized yet?" which is nice, since shuttle docks break if machines aren't finished initializing!
2018-02-03 20:34:44 -05:00
Arokha Sieyes
3e6760722f POLARIS: Add shuttle door/environment sensors 2018-02-03 20:21:41 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Arokha Sieyes
4162e35e00 POLARIS: Silly piloting helmet animation
Bonk helmet on shuttle computer to link. No, it doesn't work if you're off the shuttle, no remote info transfer.
2018-02-02 19:06:07 -05:00
Arokha Sieyes
afb24d364f POLARIS: Fix two mistakes with the shuttle_arrival procs 2018-01-31 20:56:57 -05:00
Arokha Sieyes
54865f2fbe POLARIS: Call procs on areas when shuttles arrive/depart 2018-01-30 19:23:36 -05:00
Arokha Sieyes
1910940c43 VS: Remove some bad VS edits 2018-01-27 14:10:50 -05:00
Arokha Sieyes
73b3bd639b POLARIS: Shuttle connector object for lateloaded Z-levels and other stuff 2018-01-27 14:10:50 -05:00
Arokha Sieyes
8a147d5a3a POLARIS: Move these defines elsewhere 2018-01-26 17:17:40 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
atermonera
caf3735500 Shuttles can announce over radio too! 2018-01-15 17:00:03 -08:00
Neerti
d0d6689263 Web Shuttle Update
Adds autopilot functionality for shuttle one and shuttle two. It can be enabled and disabled by the flight computer.
Autopilot is active by default on both shuttles. The shuttle waits for two minutes when it reaches the outpost or station, except for the first flight, where it waits for about ten minutes, which should be plenty of time for people to get on and for the pilot to turn it off if one exists.
Adds renaming feature to all shuttles.
Ports /tg/'s 'shuttle warning' effect, which adds a bunch of blue circles where a ship is about to land, which should prevent surprise shuttle crushes if paying attention.
Flight times for all routes are cut in half to act as the bonus for flying manually. Automatic flight takes twice as long, and so it will take the current amount of time.
Makes Ninja shuttle faster because Nippen steal.
Does some cleanup with temporary effects.
2018-01-14 14:03:58 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Leshana
a1734c97e9 Moved makepowernets() into SSmachines initialization proc. 2017-12-29 15:32:06 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Belsima
3320690a1e I before E (#4287)
* except after C

* maroonic mistake

* Improved use of sound files.

Also more grammar.

* now with less fuckup
2017-11-19 03:00:14 -06:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Belsima
e61efc752a more gammers (#4052)
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
Neerti
2d1e7c3ed2 Tries to please Travis. 2017-10-10 02:16:23 -04:00
Neerti
7225ea2b66 Read github PR for details. 2017-10-10 00:48:27 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Verkister
f846437db5 I think I figured out the shuttle issue.
-No, the line 84 did not replace or relate to the timer part you commented out.
-Due to condition mismatch of some sort, the code skipped the line 84 stuff, moving onto the next thing below, slapping the shuttle through instantly because of the timer having been commented out
2017-08-24 21:23:39 +03:00
killer653
5515c4679f Fixes a micro 2017-08-06 19:20:31 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
9d98406833 Makes Arrivals Shuttle Great
Arrivals shuttle now moves automatically to and from the station.  People still spawn onboard if they join the round with arrivals selected in preferences.
The shuttle is completely automated and will go to the station if someone boards it, and leave if nobody is onboard.
Changes some tape code so it can be mapped in.
Sadly the mapmerger is broken so the map file diff is massive.
2017-08-05 15:18:55 -04:00
Neerti
178dc07dfc Ports Shuttle Sounds + Fixes Southern Cross Shuttles
Southern Cross shuttles one and two can now launch.
Adds missing areas for shuttles 1 and 2.
Shuttles warming up, moving, or stopping now make a nice sound, ported from /tg/.
Rearranges shuttle datum/computer definitions to make it easier to read.
Removes cloaking abilities for most multi-shuttles.
Lowers transit time for multi-shuttles.  Can be raised later if desired.
2017-08-01 21:40:51 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Woodratt
e75c3887b7 Woodrat breaks map stuff
Added SC map files for further work. Including hopefully all the related files.

New airlock sprite thanks to Virgo, with a alternate non-see through sprite.

Changes to the space and transit tiles (ported from bay).

Changes done to the NC map that should bring it more up to date with changes (shield defuse stuff and minor bug fixes)
2017-07-02 18:53:17 -07:00
Leshana
aa8723b724 Switch tether shuttles over to self-initializing shuttle paradigm
* Deleted shuttle_controller_vr.dm as it is no longer needed.  Using standard shuttle_controller.dm again - It has no map-specific info!
* Converted the former contents of shuttle_controller_vr.dm into proper shuttle datums that self-initialize for each of our shuttles!
* Converted the tether_backup shuttle crashing mechanic to support self-initialization also.
2017-06-14 19:34:01 -04:00
Leshana
780eb637d8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614
# Conflicts:
#	code/controllers/shuttle_controller.dm
#	code/modules/shuttles/shuttles_multi.dm
2017-06-14 17:54:34 -04:00
Neerti
18012fa1d1 Port's Bay's Shuttle Cleanup
Shuttles now set themselves up upon being instantiated instead of relying on a monolithic proc in the shuttle controller.
Shuttles can now be defined more cleanly on a per-map basis, as well.
Accidentally fixes a broken admin shuttle.
2017-06-11 11:45:31 -04:00
Arokha Sieyes
35bcf1602a Tether Shuttle Crashing
Woooooo
2017-05-17 01:12:03 -04:00
Arokha Sieyes
69dc05731f Things landing on other things fixes
Turbolifts, and shuttles. Please behave.

Shuttles throw everything to z1 regardless of actual shuttle destination z-level, which is silly. Secondly they literally throw it using Move which is silly. Thirdly, they do it to every atom/movable, which is unacceptable. Especially since that tries to squash lighting overlays out of the way, making weird lighting problems on shuttles.

Turbolifts qdel any 'simulated' atom/movable when they run into it, which is also stupid. This includes things like the AI Eye, which permanently deletes it. A little unfortunate, if you ask me.
2017-05-14 23:54:57 -04:00
Arokha Sieyes
752d436922 Tweak antag base, add shuttles 2017-05-07 03:11:28 -04:00
Leshana
31c09b85a6 Added the Tether Backup Shuttle 2017-05-01 20:30:43 -04:00
Arokha Sieyes
17dd3a0fb8 Tether 1 and 3 work
Added gateway area (probably buttons not set up right), belter shuttle (not coded), and barebones docks on z5
2017-04-28 18:23:12 -04:00
Arokha Sieyes
0fe43a1f2b Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:54:16 -04:00
Arokha Sieyes
49b31344f5 Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:51:03 -04:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Anewbe
e373a0b353 Fixes the %ETA% thing on evac shuttles 2017-04-09 20:04:53 -05:00
killer653
0cf24cd709 Bugfix, cleanup, & xenoarch belter access 2017-03-28 18:01:02 -04:00
Arokha Sieyes
1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
Arokha Sieyes
1300ef333d Dynamic Shuttles - Code and Icon Changes 2017-03-25 21:00:08 -04:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Neerti
411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00