Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dropship turf direction sprites #3642

Merged
merged 34 commits into from
Feb 26, 2024
Merged

Dropship turf direction sprites #3642

merged 34 commits into from
Feb 26, 2024

Commits on Jun 15, 2023

  1. added kugamos dropship sprites and reworked mapping

    @mullenpaul
    mullenpaul committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    e51f044 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. found directional ert shuttle sprites

    @mullenpaul
    mullenpaul committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    6dd9b6f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. Fixes pods 

    Fixes pods
    @Nanu308
    Nanu308 committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    51084f8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Nanu308/forpaul 

    Fixes pods
    @mullenpaul
    mullenpaul authored Jun 18, 2023
    Configuration menu
    Copy the full SHA
    055d16f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Doors

    @nauticall
    nauticall committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    2fc9756 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. More doors!

    @nauticall
    nauticall committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    0903cbc View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Merge pull request #2 from nauticall/dropship-doors 

    Dropship doors
    @mullenpaul
    mullenpaul authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    6ba1877 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. reoriented sprites and door rotate into signal handler

    @mullenpaul
    mullenpaul committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    5059ca2 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. got the rear ramp working

    @mullenpaul
    mullenpaul committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    c087d6e View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. saving old work

    @mullenpaul
    mullenpaul committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    1728743 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dropship_rotation_sprites 

    # Conflicts:
#	code/modules/shuttle/shuttles/dropship.dm
#	maps/shuttles/dropship_alamo.dmm
#	maps/shuttles/dropship_normandy.dmm
    @mullenpaul
    mullenpaul committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    5e2cfdf View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. saving existing changes

    @mullenpaul
    mullenpaul committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    a3533f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dropship_rotation_sprites

    @mullenpaul
    mullenpaul committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    a95af59 View commit details
    Browse the repository at this point in the history

  3. trying to resolve issues with tile rotation

    @mullenpaul
    mullenpaul committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    5daac42 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge branch 'master' into dropship_rotation_sprites

    @mullenpaul
    mullenpaul committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    33e1a8c View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Merge branch 'cmss13-devs:master' into dropship_rotation_sprites

    @mullenpaul
    mullenpaul authored Oct 5, 2023
    Configuration menu
    Copy the full SHA
    53d73db View commit details
    Browse the repository at this point in the history

  2. ported the window sprites across for dropships

    @mullenpaul
    mullenpaul committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    a83b6f5 View commit details
    Browse the repository at this point in the history

  3. remove prefered direction in dropships

    @mullenpaul
    mullenpaul committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d84025b View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Merge branch 'master' into dropship_rotation_sprites 

    # Conflicts:
#	code/modules/shuttle/computers/dropship_computer.dm
    @mullenpaul
    mullenpaul committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    10bce7c View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

  1. Merge branch 'master' into dropship_rotation_sprites 

    # Conflicts:
#	code/game/machinery/doors/multi_tile.dm
    @mullenpaul
    mullenpaul committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    8a544cc View commit details
    Browse the repository at this point in the history

  2. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    d018104 View commit details
    Browse the repository at this point in the history

  3. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    99e0424 View commit details
    Browse the repository at this point in the history

  4. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    3944707 View commit details
    Browse the repository at this point in the history

  5. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    76ebd0d View commit details
    Browse the repository at this point in the history

  6. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    c41c661 View commit details
    Browse the repository at this point in the history

  7. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    183855b View commit details
    Browse the repository at this point in the history

  8. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    8fcce63 View commit details
    Browse the repository at this point in the history

  9. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    0cc09ab View commit details
    Browse the repository at this point in the history

  10. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    fffad4c View commit details
    Browse the repository at this point in the history

  11. Update code/game/machinery/doors/multi_tile.dm 

    Co-authored-by: harryob <[email protected]>
    @mullenpaul @harryob
    mullenpaul and harryob authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    145600c View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge branch 'master' into dropship_rotation_sprites 

    # Conflicts:
#	code/game/machinery/doors/door.dm
#	code/game/machinery/doors/multi_tile.dm
#	maps/shuttles/dropship_alamo.dmm
#	maps/shuttles/dropship_normandy.dmm
    @mullenpaul
    mullenpaul committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    b573275 View commit details
    Browse the repository at this point in the history

  2. revert superfluous changes

    @mullenpaul
    mullenpaul committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    f0264ce View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. removed instanced value changes

    @mullenpaul
    mullenpaul committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    504b238 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. resolve merge conflicts

    @mullenpaul
    mullenpaul committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    3b530eb View commit details
    Browse the repository at this point in the history