Commit Graph

6392 Commits

Author SHA1 Message Date
Aronai Sieyes
f656dd6dfb Merge pull request #6840 from Novacat/nova-pathfinder
Fixes Vacuum Holodeck
2020-03-12 15:08:34 -04:00
Unknown
8d12cfa053 Fixes vacuum holodeck 2020-03-12 14:43:10 -04:00
Aronai Sieyes
aa612835e0 Make a couple of space shuttle landmarks zero-g 2020-03-11 22:59:28 -04:00
Aronai Sieyes
b4dac8ee21 Misnamed shuttle area 2020-03-11 22:41:54 -04:00
Heroman
a7a9080362 Separates PTO being earned into its own var 2020-03-12 11:47:55 +10:00
Aronai Sieyes
28c9ff82fa Merge pull request #6808 from VOREStation/vplk-overmap
Overmap Skybox, Ships, Sectors, and Boats
2020-03-11 20:15:09 -04:00
Heroman
7fb347f935 Fixes _vr only job things 2020-03-12 09:43:00 +10:00
Novacat
ec219ac54d Merge pull request #6811 from VOREStation/upstream-merge-6725
[MIRROR] Job description alt
2020-03-11 18:59:08 -04:00
Unknown
d0d86e45ba Exploration fixes 2020-03-11 18:02:37 -04:00
Aronai Sieyes
48ac65e43b Fix mapped in cleaner launcher 2020-03-11 17:08:05 -04:00
Atermonera
fa8c9fabab Job description alt 2020-03-11 15:55:05 -04:00
Aronai Sieyes
3011fade54 Add tourbus dock to virgo3b sector 2020-03-11 15:48:03 -04:00
Aronai Sieyes
9f95fb1a0a Old map item cleanup 2020-03-11 11:45:01 -04:00
Aronai Sieyes
295ed29e5f Fix step_x/step_y in screebarge.dmm 2020-03-11 11:35:57 -04:00
Aronai Sieyes
07a5e8e86d Convert Tether shuttles to Overmap Landable Ships 2020-03-11 11:11:41 -04:00
Leshana
d0bf576ad8 Update virgo minitest to demonstrate overmap landable shuttle features. 2020-03-11 11:11:40 -04:00
Leshana
86c435f4b7 Ports Skybox Parallax
- Port based on Baystation's implementation and customized for our code and usages.
- Switched space icon_state permutation to a "dust" overlay that is permutated the same way. As an overlay, the dust can be *above* the parallax planes. Space turfs are now white to allow skybox to BLEND_MULTIPLY onto them.
- Added skybox hud effect that replaces background space turfs with an image moved to create a parallax effect.
- Added skybox subsystem to generate and manage skybox parallax images, and lots of images for it!
2020-03-11 11:11:40 -04:00
Unknown
b2cd0eade0 Converts off duty system to new system 2020-03-09 15:37:45 -04:00
Unknown
dd75b3c21c Auto stash before rebase of "VOREStation/upstream-merge-6762" 2020-03-09 01:53:51 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Aronai Sieyes
b5a20f9805 Merge pull request #6768 from TheFurryFeline/TFF-Revert_Teleporter_Removal
[Map] Revert Teleporter Removal
2020-03-08 17:48:38 -04:00
TheFurryFeline
c6412b99fa Requested Change 2020-03-08 12:11:20 -04:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
TheFurryFeline
0ca1a7b19a Fix Travis & Moar 2020-03-05 15:18:35 -05:00
TheFurryFeline
cc2af514be Restore Secondary Command
Couple extras listed in PR summary.
2020-03-05 14:40:38 -05:00
TheFurryFeline
f15ecabe06 Merge remote-tracking branch 'upstream/master' into TFF-Revert_Teleporter_Removal 2020-03-05 14:08:11 -05:00
TheFurryFeline
f1381adefc Prep For Revert of Removal
Couple minor changes with the substation name and maintenance: secondary command maint/substation now. The SMES, Powernet Sensor, and Breaker Box RCON tags are all renamed accordingly

This commit is for making the copy ready to use for copying over the old version of the Secondary Command, plus the maints and sand outside. The new file will be deleted for the second commit.
2020-03-05 11:03:48 -05:00
Aronai Sieyes
db35a6ec53 Tether map conversion to use landmark shuttles.
- Updated shuttle datums according to the guide.
- Removed the extra shuttle areas and replaced with shuttle landmarks.
- Updated some custom code.
2020-03-05 10:29:10 -05:00
Leshana
252692a8ea Added test shuttles to virgo_minitest map. 2020-03-05 10:29:08 -05:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles.
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Novacat
974eaccdaa Merge pull request #6714 from Heroman3003/sofabrown
Replaces cargo sofa with brown one
2020-03-01 10:56:27 -05:00
Novacat
41bbefddb4 Merge pull request #6713 from Novacat/nova-basicfixes
Fixes runtimes with chemspill map
2020-03-01 10:56:09 -05:00
Novacat
be406c91ed Merge pull request #6703 from Heroman3003/secondary-command
Removes teleporter room from secondary command
2020-03-01 10:55:55 -05:00
Novacat
54c792ba9b Merge pull request #6648 from VOREStation/aro-medstand
Replace IV drips with medical stands
2020-03-01 10:54:45 -05:00
Novacat
d98cd87585 Merge pull request #6646 from VOREStation/aro-salv
Add salvageable machines
2020-03-01 10:54:21 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Heroman
97e193df2b Replaces cargo sofa with brown one 2020-03-01 16:15:20 +10:00
Unknown
df04292ef4 Fixes runtimes with chemspill map 2020-03-01 00:33:27 -05:00
Heroman
e057975779 Removes teleporter room from secondary command 2020-02-29 12:32:47 +10:00
Unknown
81da0eab04 adds planet datum for Virgo 3b 2020-02-28 01:06:38 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes
Fixes various lightning strike bugs
2020-02-27 23:58:36 -05:00
Heroman
e8d4b6a4c2 Centcom Fixes 2020-02-28 13:27:51 +10:00
Novacat
dac0c77a7f Reverts unknown dorm color changes 2020-02-25 15:10:51 -05:00
Unknown
8053f6fc2f Central Fixes
- Replaces remainder of purple walled alien stuff with blue walls
- Fixes some vendors in Mothership resleeving being inaccessible
- Fixes decal issue with Central bathroom
2020-02-25 15:05:43 -05:00
Novacat
1c80ed2a88 Merge pull request #6622 from Shadow-Quill/Holowarrant
Holowarrants can now only be authorized by an ID with HoS access
2020-02-25 10:50:30 -05:00
Novacat
7031f896b9 Merge pull request #6606 from Heroman3003/biochem
Adds biochemical dispenser to medical's chemistry
2020-02-25 10:50:00 -05:00
Leshana
7452d17c81 Resolved conflicts with vorestation edit 2020-02-24 19:13:04 -05:00
Atermonera
5e2a692610 Added two chemical spill PoIs + More Immersive PoI Names 2020-02-24 16:02:31 -05:00
Heroman3003
b12348f909 Merge branch 'master' into maint_pred 2020-02-24 11:00:59 +10:00