Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

[pull] master from Aurorastation:master #9

Merged
merged 2 commits into from
Nov 7, 2023

Commits on Nov 7, 2023

  1. Airlock markers - docking and shuttle airlocks (#17717)

    * rearrange files
    
    * Squashed commit of the following:
    
    commit ec32b5b
    Author: DreamySkrell <>
    Date:   Sat Oct 28 22:32:05 2023 +0200
    
        ccc
    
    commit be750e6
    Author: DreamySkrell <>
    Date:   Sat Oct 28 22:01:02 2023 +0200
    
        cc
    
    commit 1ecd9af
    Author: DreamySkrell <>
    Date:   Sat Oct 28 21:57:38 2023 +0200
    
        c
    
    commit 159d100
    Author: DreamySkrell <>
    Date:   Sat Oct 28 21:40:40 2023 +0200
    
        nav_ert_dock kill
    
    commit b767a25
    Author: DreamySkrell <>
    Date:   Sat Oct 28 21:24:34 2023 +0200
    
        a
    
    commit aa01eec
    Author: DreamySkrell <>
    Date:   Sat Oct 28 21:09:48 2023 +0200
    
        NAV_HORIZON_DOCK_ALL
    
    commit 4564bfd
    Author: DreamySkrell <>
    Date:   Sat Oct 28 20:55:45 2023 +0200
    
        burglar and raider to use NAV_HORIZON_EXTERIOR_ALL_DECKS and SNEAKY
    
    commit ec7564f
    Author: DreamySkrell <>
    Date:   Sat Oct 28 20:43:17 2023 +0200
    
        merc shuttle to use NAV_HORIZON_EXTERIOR_ALL_DECKS
    
    commit d306934
    Author: DreamySkrell <>
    Date:   Fri Oct 27 00:00:41 2023 +0200
    
        fix merc and skipjack area/template_noop
    
    commit 0600a34
    Author: DreamySkrell <>
    Date:   Thu Oct 26 22:28:45 2023 +0200
    
        merc ship generic dock landmark huh
    
    commit c985062
    Author: DreamySkrell <>
    Date:   Thu Oct 26 20:37:55 2023 +0200
    
        sane landmark tags
    
    commit 56d9052
    Author: DreamySkrell <>
    Date:   Thu Oct 26 20:11:55 2023 +0200
    
        /horizon/dock/deck_3/port_3
    
    commit 846d737
    Author: DreamySkrell <>
    Date:   Thu Oct 26 20:03:17 2023 +0200
    
        landmark/horizon/deck -> landmark/horizon/exterior/deck
    
    commit ef5c3d1
    Author: DreamySkrell <>
    Date:   Thu Oct 26 20:02:17 2023 +0200
    
        landmark/horizon/dock -> landmark/horizon/dock/deck_3/...
    
    commit 1716ef2
    Author: DreamySkrell <>
    Date:   Thu Oct 26 19:54:21 2023 +0200
    
        docks ruler helpers
    
    commit 18c66a3
    Author: DreamySkrell <>
    Date:   Thu Oct 26 19:47:27 2023 +0200
    
        a
    
    commit 0f2fc45
    Author: DreamySkrell <>
    Date:   Thu Oct 26 19:43:19 2023 +0200
    
        horizon/nav -> horizon/hangar
    
    commit e13a523
    Author: DreamySkrell <>
    Date:   Thu Oct 26 19:41:08 2023 +0200
    
        sccv_horizon_shuttle_landmarks.dm
    
    * Squashed commit of the following:
    
    commit 4d7052b
    Author: DreamySkrell <>
    Date:   Sun Oct 29 14:18:40 2023 +0100
    
        tests rerun please
    
    commit ae04980
    Author: DreamySkrell <>
    Date:   Sun Oct 29 13:25:26 2023 +0100
    
        oops
    
    commit 176ea80
    Author: DreamySkrell <>
    Date:   Sun Oct 29 12:54:25 2023 +0100
    
        tests rerun please
    
    commit 5cf7db9
    Author: DreamySkrell <>
    Date:   Sun Oct 29 12:45:07 2023 +0100
    
        c
    
    commit f93887a
    Author: DreamySkrell <>
    Date:   Sun Oct 29 12:43:47 2023 +0100
    
        jjjjjjjjjjjj
    
    commit 697542a
    Author: DreamySkrell <>
    Date:   Sun Oct 29 12:25:32 2023 +0100
    
        a
    
    commit a83373a
    Author: DreamySkrell <>
    Date:   Sun Oct 29 12:17:47 2023 +0100
    
        ay
    
    commit baf447a
    Author: DreamySkrell <>
    Date:   Sun Oct 29 11:05:38 2023 +0100
    
        a
    
    * sprites
    
    * code and mapping wip...
    
    * huhhhh
    
    * agony
    
    * docs idk
    
    * intrepid idk
    
    * almost working...
    
    * i fucking love docks
    
    * 568
    
    * m
    
    * kkkkkkkkkkkkkkk
    
    * helper in own file
    
    * a
    
    * tags
    
    * huh
    
    * a
    
    * 1 pixel
    
    * intrepid mf
    
    * spark mf
    
    * access
    
    * guidelines
    
    * g
    
    * gd
    
    * hnyfgjdtjtsdyjdtyj
    
    * m
    
    * c
    
    * a
    
    * fix canary and ert shuttle docking controller tags
    
    * huhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
    
    * remove old changelogs
    
    * sprite
    
    * bad docs removal
    
    ---------
    
    Co-authored-by: DreamySkrell <>
    DreamySkrell committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a253fcb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5ef9bac View commit details
    Browse the repository at this point in the history