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

Energy weapon gameplay enhancement #2677

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open

Energy weapon gameplay enhancement #2677

wants to merge 82 commits into from

Commits on Mar 20, 2024

  1. limb sprite addition test 

    hopefully will add another set of limbs to the augmentor once I finish  converting the sprites
    @Pockets-byte
    Pockets-byte authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    f6a1bbc View commit details
    Browse the repository at this point in the history

  2. adds inital sprites for augments 

    mostly from paradise, I made the veymed ones from nsv sprites
    @Pockets-byte
    Pockets-byte committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    84f5e84 View commit details
    Browse the repository at this point in the history

  3. Added a number of augment skins from paradise/bay

    @Pockets-byte
    Pockets-byte committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    f195f10 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Add comments to augment icon lists

    @Pockets-byte
    Pockets-byte authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    cb4f10d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    3ff6f12 View commit details
    Browse the repository at this point in the history

  3. moved augment sprites to NSV directory

    @Pockets-byte
    Pockets-byte committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    13d3284 View commit details
    Browse the repository at this point in the history

  4. fixed the bad, replaced misplaced files, and fixed paths

    @Pockets-byte
    Pockets-byte committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    b810d0b View commit details
    Browse the repository at this point in the history

  5. added a little more detail to the comment

    @Pockets-byte
    Pockets-byte authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    fee976e View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Update code/game/machinery/aug_manipulator.dm

    @Bokkiewokkie
    Bokkiewokkie authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    b48910a View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0628c34 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored May 6, 2024
    Configuration menu
    Copy the full SHA
    95cadb1 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored May 14, 2024
    Configuration menu
    Copy the full SHA
    eeaa255 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored May 22, 2024
    Configuration menu
    Copy the full SHA
    37c75c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Merge branch 'BeeStation:master' into patch-1

    @Pockets-byte
    Pockets-byte authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    0e585ba View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. energy weapons rework? 

    gotta cherry pick this out
    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    118c6aa View commit details
    Browse the repository at this point in the history

  2. blah minigame

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    67c2c21 View commit details
    Browse the repository at this point in the history

  3. Update phaser.dm

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    3a6cb59 View commit details
    Browse the repository at this point in the history

  4. it works now

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5c10d26 View commit details
    Browse the repository at this point in the history

  5. A

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    d6fda76 View commit details
    Browse the repository at this point in the history

  6. little bit of balancing stuff, some bugfixing

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    123a928 View commit details
    Browse the repository at this point in the history

  7. AAAAAAAAAAAAAAAAA game no work

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5ff9d82 View commit details
    Browse the repository at this point in the history

  8. tgui hell

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9ef2982 View commit details
    Browse the repository at this point in the history

  9. why

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ff8852a View commit details
    Browse the repository at this point in the history

  10. AAAAAAAAAAAAAA

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    05c6630 View commit details
    Browse the repository at this point in the history

  11. heat management stuff!

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    587bba8 View commit details
    Browse the repository at this point in the history

  12. magic cooling is really dead now

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8555e0c View commit details
    Browse the repository at this point in the history

  13. AAAAAAAAAAAA

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    16e47ee View commit details
    Browse the repository at this point in the history

  14. removes slowprocess

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4d7ad96 View commit details
    Browse the repository at this point in the history

  15. removes atmos cooling. beginning of game-magic cooling

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a5020e6 View commit details
    Browse the repository at this point in the history

  16. AAAAAAAAAAAAAaaaaaaaa

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ae3ef3d View commit details
    Browse the repository at this point in the history

  17. Update Aetherwhisp2.dmm

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2cf2cd5 View commit details
    Browse the repository at this point in the history

  18. A

    @Pockets-byte
    Pockets-byte committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    eb5e1c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. blah

    @Pockets-byte
    Pockets-byte committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    0f84efc View commit details
    Browse the repository at this point in the history

  2. cooling work

    @Pockets-byte
    Pockets-byte committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    91256ad View commit details
    Browse the repository at this point in the history

  3. icons for testing

    @Pockets-byte
    Pockets-byte committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ca43fb8 View commit details
    Browse the repository at this point in the history

  4. AAAAAAAAaaaaaaaaaaaaaaaaaaaa subspace cooler work

    @Pockets-byte
    Pockets-byte committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    de4e85d View commit details
    Browse the repository at this point in the history

  5. "works"

    @Pockets-byte
    Pockets-byte committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    5b1febc View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. subspace heat management v1 partial completion

    @Pockets-byte
    Pockets-byte committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    b629386 View commit details
    Browse the repository at this point in the history

  2. no more punching subspace units

    @Pockets-byte
    Pockets-byte committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    8ba19dc View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. hapazard balancing and prep for venting

    @Pockets-byte
    Pockets-byte committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    20bd0ed View commit details
    Browse the repository at this point in the history

  2. venting work, makes the BSA exempt from Energy mechanics

    @Pockets-byte
    Pockets-byte committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    4f6492a View commit details
    Browse the repository at this point in the history

  3. venting things

    @Pockets-byte
    Pockets-byte committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    db043f6 View commit details
    Browse the repository at this point in the history

  4. uncomments

    @Pockets-byte
    Pockets-byte committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    9b97e85 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. venting, and more balance stuff

    @Pockets-byte
    Pockets-byte committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    feb5d39 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    506c1f8 View commit details
    Browse the repository at this point in the history

  3. fixes the damage done to the wisp and maps new energy weapon bits

    @Pockets-byte
    Pockets-byte committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a217d41 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    eb7f898 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. I don't know what I'm doing 

    help

Co-Authored-By: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

test

Squashed commit of the following:

commit 945041d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Tue Jul 16 00:15:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 9cb02c5
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 22:04:04 2024 +0000

    Automatic changelog compile [ci skip]

commit 939793d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:38:11 2024 -0500

    Automatic changelog generation for PR BeeStation#2692 [ci skip]

commit ae25ec5
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:37:35 2024 -0300

    Fixes small typo in the NC reminder (BeeStation#2692)

commit c649dea
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:37:02 2024 -0500

    Automatic changelog generation for PR BeeStation#2689 [ci skip]

commit 8a2a79d
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:36:22 2024 -0300

    Re-adds the basic plasma cutter back into its respective node. (BeeStation#2689)

commit dfeb981
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 19:03:52 2024 +0000

    Automatic changelog compile [ci skip]

commit 284e333
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:13:22 2024 -0500

    Automatic changelog generation for PR BeeStation#2678 [ci skip]

commit 5408a33
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:12:43 2024 +0200

    Only /overmaps are passed to after_enter() (BeeStation#2678)

commit 1c03630
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:12:12 2024 -0500

    Automatic changelog generation for PR BeeStation#2675 [ci skip]

commit ffed942
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:11:57 2024 -0500

    Automatic changelog generation for PR BeeStation#2676 [ci skip]

commit f3bbe83
Author: Kenionatus <kenionatus@techie.com>
Date:   Fri Jul 12 20:11:33 2024 +0200

    Sort projectiles fx.dm better (BeeStation#2675)

commit 08f874b
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:10:55 2024 +0200

    Improves a little bit of cursed weapon code (BeeStation#2676)

commit 7b2eb24
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 18:05:04 2024 +0000

    Automatic changelog compile [ci skip]

commit c445ae1
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:00:46 2024 -0500

    Automatic changelog generation for PR BeeStation#2681 [ci skip]

commit c5326c6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jul 12 20:00:09 2024 +0200

    Makes shields hits only spawn one visual (which is actually aligned with the ship) (BeeStation#2681)

commit 580f275
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 17:04:00 2024 +0000

    Automatic changelog compile [ci skip]

commit ac2fc1c
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:54:55 2024 -0500

    Automatic changelog generation for PR BeeStation#2671 [ci skip]

commit 9ea99c5
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:54:19 2024 -0600

    adds a playable solgov fighter, and a fighter lasercannon  (BeeStation#2671)

commit c649731
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:52:43 2024 -0500

    Automatic changelog generation for PR BeeStation#2669 [ci skip]

commit 6ced45c
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:52:00 2024 -0600

    Adds a solgov variant of the squad vendor (BeeStation#2669)

commit ee6f637
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 22:04:41 2024 +0000

    Automatic changelog compile [ci skip]

commit e5ceeaf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 16:16:16 2024 -0500

    Automatic changelog generation for PR BeeStation#2670 [ci skip]

commit 6337c91
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 5 15:15:36 2024 -0600

    Adds relayed laser projectiles (BeeStation#2670)

    Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>

commit e7abbcc
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 00:14:35 2024 +0000

    Automatic changelog compile [ci skip]

commit 03f4807
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 19:04:11 2024 +0000

    Automatic changelog compile [ci skip]

commit 3d87385
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 13:51:16 2024 -0500

    Automatic changelog generation for PR BeeStation#2663 [ci skip]

commit 2b48323
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 28 20:50:39 2024 +0200

    Removes integrity failure value from all overmap entities (BeeStation#2663)

commit e1004ae
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sun Jun 23 00:15:57 2024 +0000

    Automatic changelog compile [ci skip]

commit 0ee1b10
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 22:04:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 386288e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:50:06 2024 -0500

    Automatic changelog generation for PR BeeStation#2668 [ci skip]

commit 879aea1
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:49:26 2024 +0200

    Updates the armour pumps to account for lag properly (BeeStation#2668)

commit f844e33
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:48:40 2024 -0500

    Automatic changelog generation for PR BeeStation#2661 [ci skip]

commit 501304d
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 21 14:48:04 2024 -0700

    Atlas Armor Alterations (BeeStation#2661)

commit aaf1109
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:46:25 2024 -0500

    Automatic changelog generation for PR BeeStation#2653 [ci skip]

commit cf8d193
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:45:49 2024 +0200

    Properly registers small craft in overmap ships and fixes sscrit explosions (BeeStation#2653)

commit 56ee105
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 00:14:15 2024 +0000

    Automatic changelog compile [ci skip]

commit 6d0981e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 21:03:53 2024 +0000

    Automatic changelog compile [ci skip]

commit 48d538a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:31:57 2024 -0500

    Automatic changelog generation for PR BeeStation#2665 [ci skip]

commit 2b0d18c
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 14 13:31:22 2024 -0700

    Even more Atlas Mapping Fixes (BeeStation#2665)

commit b31ef9d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jun 14 22:23:33 2024 +0200

    Bump braces from 3.0.2 to 3.0.3 in /tgui (BeeStation#2682)

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit cfe0108
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:55 2024 -0500

    Automatic changelog generation for PR BeeStation#2659 [ci skip]

commit 0b47f83
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:48 2024 -0500

    Automatic changelog generation for PR BeeStation#2660 [ci skip]

commit a6a4a7c
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:21:17 2024 -0600

    Fixes Shells are not appropriately handling the presence of powder bags. (BeeStation#2659)

commit 01caa93
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:21:05 2024 +0200

    Adds the ability to (de)construct pool ladders (BeeStation#2660)

commit 0681152
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:20:01 2024 -0500

    Automatic changelog generation for PR BeeStation#2657 [ci skip]

commit 9657baf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:19:26 2024 -0500

    Automatic changelog generation for PR BeeStation#2658 [ci skip]

commit 57cd724
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:19:21 2024 -0600

    Fixes borgs duplicating ammunition with the munition clamp upgrade (BeeStation#2657)

commit 37579a6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:18:48 2024 +0200

    Fixes some Engineering design issues and Hangar airlocks on Gladius (BeeStation#2658)

commit 0c4a4ff
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 19:04:57 2024 +0000

    Automatic changelog compile [ci skip]

commit cf293ae
Author: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date:   Fri Jun 14 20:29:29 2024 +0200

    Updates forgotten armor values and syndicate armor stacking during boarding (BeeStation#2638)

commit 4a8b53a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 13:23:36 2024 -0500

    Automatic changelog generation for PR BeeStation#2646 [ci skip]

commit d067eee
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 14 20:22:52 2024 +0200

    Adds digitigrade robotic legs (BeeStation#2646)

commit afe5367
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 16:04:03 2024 +0000

    Automatic changelog compile [ci skip]

Revert "Squashed commit of the following:"

This reverts commit 57ff137.

Revert "test"

This reverts commit 0ee8584.

Revert "I don't know what I'm doing"

This reverts commit 197c80d.
    @DeltaFire15 @Pockets-byte
    DeltaFire15 authored and Pockets-byte committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b5e13c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Research and fixing comments 

    the gameplay loop theoretically works now
    @Pockets-byte
    Pockets-byte committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    cec528d View commit details
    Browse the repository at this point in the history

  2. please let this fix the merge conflict

    @Pockets-byte
    Pockets-byte committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    255781d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    6307cc6 View commit details
    Browse the repository at this point in the history

  4. fixes everything

    @Pockets-byte
    Pockets-byte committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    0bfeaeb View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Sep 1, 2024
    Configuration menu
    Copy the full SHA
    9f82af6 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Update job_changes.dm temporarily

    @Pockets-byte
    Pockets-byte authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    3f60748 View commit details
    Browse the repository at this point in the history

  2. Update job_changes.dm

    @Pockets-byte
    Pockets-byte authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    e625c42 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Delete nsv13_unit_test_focus_file.dm

    @Pockets-byte
    Pockets-byte authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    329b988 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
    @Pockets-byte @Bokkiewokkie
    Pockets-byte and Bokkiewokkie authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    1c2eac4 View commit details
    Browse the repository at this point in the history

  3. Delete job_changes.dm 

    plushie sailing into distance.gif
    @Pockets-byte
    Pockets-byte authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    733e882 View commit details
    Browse the repository at this point in the history

  4. mistake

    @Pockets-byte
    Pockets-byte authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    20366cf View commit details
    Browse the repository at this point in the history

  5. Revert "Delete job_changes.dm" 

    This reverts commit 733e882.
    @Pockets-byte
    Pockets-byte committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    786a43c View commit details
    Browse the repository at this point in the history

  6. MINOR SPELLING MISTAKE 

    Death
    @Pockets-byte
    Pockets-byte authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    d5bbe5d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    1794197 View commit details
    Browse the repository at this point in the history

  2. new sprite

    @Pockets-byte
    Pockets-byte committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    ba1b6ad View commit details
    Browse the repository at this point in the history

  3. applies sprites

    @Pockets-byte
    Pockets-byte committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    a4f1b4a View commit details
    Browse the repository at this point in the history

  4. Update phaser.dm 

    Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
    @Pockets-byte @DeltaFire15
    Pockets-byte and DeltaFire15 authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    7bbf638 View commit details
    Browse the repository at this point in the history

  5. Update phaser.dm 

    Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
    @Pockets-byte @DeltaFire15
    Pockets-byte and DeltaFire15 authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    091defc View commit details
    Browse the repository at this point in the history

  6. Fixes venting, maybe? 

    Sus
    @Pockets-byte
    Pockets-byte authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    2d534b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. fixes some of the issues, moves energy weapon vars, etc 

    more examine states
    @Pockets-byte
    Pockets-byte committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ddb1999 View commit details
    Browse the repository at this point in the history

  2. storage sprite

    @Pockets-byte
    Pockets-byte committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    7ef0ecd View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. null reference exception!

    @Pockets-byte
    Pockets-byte committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    acbeb40 View commit details
    Browse the repository at this point in the history

  2. Update nsv13/code/modules/munitions/ship_weapons/energy_weapons/phase… 

    …r.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
    @Pockets-byte @DeltaFire15
    Pockets-byte and DeltaFire15 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    d211a01 View commit details
    Browse the repository at this point in the history

  3. small stuff

    @Pockets-byte
    Pockets-byte committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    8d3ff18 View commit details
    Browse the repository at this point in the history

  4. no more multi-linking

    @Pockets-byte
    Pockets-byte committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    e815574 View commit details
    Browse the repository at this point in the history

  5. Update subspacecooling.dm

    @Pockets-byte
    Pockets-byte committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    490e929 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. "quick" fix

    @Pockets-byte
    Pockets-byte committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    a4bd409 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    f8b7374 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Oct 19, 2024
    Configuration menu
    Copy the full SHA
    e57ea3f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. funny stock item for de-looting, and variables to use later

    @Pockets-byte
    Pockets-byte committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    58bcbf7 View commit details
    Browse the repository at this point in the history

  2. comment

    @Pockets-byte
    Pockets-byte committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    4e41766 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'energy-weapon-gameplay' of https://github.com/Pockets-b… 

    …yte/NSV13 into energy-weapon-gameplay
    @Pockets-byte
    Pockets-byte committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    f6ba70b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'BeeStation:master' into energy-weapon-gameplay

    @Pockets-byte
    Pockets-byte authored Oct 27, 2024
    Configuration menu
    Copy the full SHA
    b5668ba View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Variable name was taken

    @Pockets-byte
    Pockets-byte authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    2f4706a View commit details
    Browse the repository at this point in the history