Skip to content

[WIP]Energy weapon gameplay enhancement #2677

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

Open
Pockets-byte wants to merge 143 commits into
base: master
Choose a base branch
from
Open

[WIP]Energy weapon gameplay enhancement #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
f6a1bbc
limb sprite addition test
Pockets-byte Mar 20, 2024
84f5e84
adds inital sprites for augments
Pockets-byte Mar 20, 2024
f195f10
Added a number of augment skins from paradise/bay
Pockets-byte Mar 20, 2024
cb4f10d
Add comments to augment icon lists
Pockets-byte Mar 24, 2024
3ff6f12
Merge branch 'BeeStation:master' into patch-1
Pockets-byte Mar 24, 2024
13d3284
moved augment sprites to NSV directory
Pockets-byte Mar 24, 2024
b810d0b
fixed the bad, replaced misplaced files, and fixed paths
Pockets-byte Mar 24, 2024
fee976e
added a little more detail to the comment
Pockets-byte Mar 24, 2024
b48910a
Update code/game/machinery/aug_manipulator.dm
Bokkiewokkie Mar 29, 2024
0628c34
Merge branch 'BeeStation:master' into patch-1
Pockets-byte Apr 27, 2024
95cadb1
Merge branch 'BeeStation:master' into patch-1
Pockets-byte May 6, 2024
eeaa255
Merge branch 'BeeStation:master' into patch-1
Pockets-byte May 14, 2024
37c75c6
Merge branch 'BeeStation:master' into patch-1
Pockets-byte May 22, 2024
0e585ba
Merge branch 'BeeStation:master' into patch-1
Pockets-byte Jun 1, 2024
118c6aa
energy weapons rework?
Pockets-byte Jun 5, 2024
67c2c21
blah minigame
Pockets-byte Jun 5, 2024
3a6cb59
Update phaser.dm
Pockets-byte Jun 5, 2024
5c10d26
it works now
Pockets-byte Jun 5, 2024
d6fda76
A
Pockets-byte Jun 5, 2024
123a928
little bit of balancing stuff, some bugfixing
Pockets-byte Jun 5, 2024
5ff9d82
AAAAAAAAAAAAAAAAA game no work
Pockets-byte Jun 5, 2024
9ef2982
tgui hell
Pockets-byte Jun 5, 2024
ff8852a
why
Pockets-byte Jun 5, 2024
05c6630
AAAAAAAAAAAAAA
Pockets-byte Jun 5, 2024
587bba8
heat management stuff!
Pockets-byte Jun 5, 2024
8555e0c
magic cooling is really dead now
Pockets-byte Jun 5, 2024
16e47ee
AAAAAAAAAAAA
Pockets-byte Jun 5, 2024
4d7ad96
removes slowprocess
Pockets-byte Jun 5, 2024
a5020e6
removes atmos cooling. beginning of game-magic cooling
Pockets-byte Jun 5, 2024
ae3ef3d
AAAAAAAAAAAAAaaaaaaaa
Pockets-byte Jun 5, 2024
2cf2cd5
Update Aetherwhisp2.dmm
Pockets-byte Jun 5, 2024
eb5e1c5
A
Pockets-byte Jun 5, 2024
0f84efc
blah
Pockets-byte Jun 6, 2024
91256ad
cooling work
Pockets-byte Jun 6, 2024
ca43fb8
icons for testing
Pockets-byte Jun 6, 2024
de4e85d
AAAAAAAAaaaaaaaaaaaaaaaaaaaa subspace cooler work
Pockets-byte Jun 6, 2024
5b1febc
"works"
Pockets-byte Jun 6, 2024
b629386
subspace heat management v1 partial completion
Pockets-byte Jun 7, 2024
8ba19dc
no more punching subspace units
Pockets-byte Jun 7, 2024
20bd0ed
hapazard balancing and prep for venting
Pockets-byte Jun 8, 2024
4f6492a
venting work, makes the BSA exempt from Energy mechanics
Pockets-byte Jun 8, 2024
db043f6
venting things
Pockets-byte Jun 8, 2024
9b97e85
uncomments
Pockets-byte Jun 8, 2024
feb5d39
venting, and more balance stuff
Pockets-byte Jun 9, 2024
506c1f8
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Jun 9, 2024
a217d41
fixes the damage done to the wisp and maps new energy weapon bits
Pockets-byte Jun 9, 2024
eb7f898
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Jun 14, 2024
b5e13c0
I don't know what I'm doing
DeltaFire15 Jun 28, 2024
cec528d
Research and fixing comments
Pockets-byte Aug 25, 2024
255781d
please let this fix the merge conflict
Pockets-byte Aug 25, 2024
6307cc6
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Aug 25, 2024
0bfeaeb
fixes everything
Pockets-byte Aug 25, 2024
9f82af6
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Sep 1, 2024
3f60748
Update job_changes.dm temporarily
Pockets-byte Sep 6, 2024
e625c42
Update job_changes.dm
Pockets-byte Sep 6, 2024
329b988
Delete nsv13_unit_test_focus_file.dm
Pockets-byte Sep 7, 2024
1c2eac4
Apply suggestions from code review
Pockets-byte Sep 7, 2024
733e882
Delete job_changes.dm
Pockets-byte Sep 7, 2024
20366cf
mistake
Pockets-byte Sep 7, 2024
786a43c
Revert "Delete job_changes.dm"
Pockets-byte Sep 7, 2024
d5bbe5d
MINOR SPELLING MISTAKE
Pockets-byte Sep 7, 2024
1794197
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Sep 8, 2024
ba1b6ad
new sprite
Pockets-byte Sep 8, 2024
a4f1b4a
applies sprites
Pockets-byte Sep 8, 2024
7bbf638
Update phaser.dm
Pockets-byte Sep 8, 2024
091defc
Update phaser.dm
Pockets-byte Sep 8, 2024
2d534b0
Fixes venting, maybe?
Pockets-byte Sep 8, 2024
ddb1999
fixes some of the issues, moves energy weapon vars, etc
Pockets-byte Sep 9, 2024
7ef0ecd
storage sprite
Pockets-byte Sep 9, 2024
acbeb40
null reference exception!
Pockets-byte Sep 10, 2024
d211a01
Update nsv13/code/modules/munitions/ship_weapons/energy_weapons/phase…
Pockets-byte Sep 10, 2024
8d3ff18
small stuff
Pockets-byte Sep 10, 2024
e815574
no more multi-linking
Pockets-byte Sep 10, 2024
490e929
Update subspacecooling.dm
Pockets-byte Sep 10, 2024
a4bd409
"quick" fix
Pockets-byte Sep 14, 2024
f8b7374
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Sep 14, 2024
e57ea3f
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Oct 19, 2024
58bcbf7
funny stock item for de-looting, and variables to use later
Pockets-byte Oct 27, 2024
4e41766
comment
Pockets-byte Oct 27, 2024
f6ba70b
Merge branch 'energy-weapon-gameplay' of https://github.com/Pockets-b…
Pockets-byte Oct 27, 2024
b5668ba
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Oct 27, 2024
2f4706a
Variable name was taken
Pockets-byte Oct 30, 2024
9a8dca7
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Nov 21, 2024
e786cb1
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Feb 16, 2025
964966b
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Mar 8, 2025
5439017
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Apr 27, 2025
cbbe6b8
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte May 2, 2025
c2bcd25
Merge remote-tracking branch 'upstream/master' into energy-weapon-gam…
Pockets-byte May 16, 2025
1d1338e
fixed wisp mapping. gun maint lockout. heatsink sprite, partially ani…
Pockets-byte May 16, 2025
de35388
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Jul 5, 2025
b59cbfc
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Oct 22, 2025
0340693
Merge remote-tracking branch 'upstream/master' into energy-weapon-gam…
Pockets-byte Jan 25, 2026
6bedf04
returns the variables....
Pockets-byte Jan 25, 2026
340fcd1
slight messup
Pockets-byte Jan 25, 2026
9ba209c
AAAAAAAAAAAAA
Pockets-byte Jan 25, 2026
aace05e
help.
Pockets-byte Jan 26, 2026
998eab3
might've fixed it
Pockets-byte Jan 26, 2026
b01a9d4
puts the maintainable var into prefabs and explodes the hack on the BSA
Pockets-byte Jan 26, 2026
9528aa5
I don't know how to use VSCODE
Pockets-byte Jan 26, 2026
26b52dc
LIGHT!
Pockets-byte Jan 26, 2026
7511546
touches the whisp gunnery room. fixes cooler decon. blurb about maint…
Pockets-byte Jan 26, 2026
1dbb07e
inital minigame efforts
Pockets-byte Jan 26, 2026
039d911
ds13 minigame works now
Pockets-byte Jan 26, 2026
0c21290
range check
Pockets-byte Jan 26, 2026
c67a9f4
autodoc commenting. minigame continues on it's own
Pockets-byte Jan 26, 2026
3592869
arbitrary energy weapon buffs to compensate for having lower cadence …
Pockets-byte Jan 27, 2026
08b1b0b
laser pdcs no longer require maintinece. slight buffs to all phaser w…
Pockets-byte Jan 29, 2026
c70b788
buffs burst phaser heat per shot because they're kinda weak
Pockets-byte Jan 29, 2026
f2058ee
test balance stuff
Pockets-byte Jan 29, 2026
c8ffc2d
slightly buffs ams because of the requirement to maintain it now
Pockets-byte Jan 29, 2026
3e81e7c
I don't know why this was changed.
Pockets-byte Jan 29, 2026
1058c5b
overload anims. ion cannon sprites.
Pockets-byte Feb 4, 2026
30d1e8b
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Feb 12, 2026
dd2e3b4
commens out overlays
Pockets-byte Feb 21, 2026
ba7e5b3
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Apr 1, 2026
4d5aa50
slight balancing pass, bug fixes
Pockets-byte Apr 28, 2026
0f5ceea
makes burst phasers stronger, and gives them a heat based boost in da…
Pockets-byte Apr 28, 2026
7bafac0
makes deconstructing energy weapons to avoid having to maintain them …
Pockets-byte Apr 28, 2026
70c5fcd
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA…
Pockets-byte May 3, 2026
ebdc82e
I AM SO MAD
Pockets-byte May 4, 2026
aaf70e1
removes map changes for multi-targeting testing
Pockets-byte May 4, 2026
ed46619
bla
Pockets-byte May 4, 2026
4b430d7
gimballed pulse phasers
Pockets-byte May 4, 2026
0cc4ce3
fixes mistake in after fire()
Pockets-byte May 4, 2026
f07bb5a
maint_wear() added
Pockets-byte May 4, 2026
ce75d83
overlay no worky
Pockets-byte May 5, 2026
ab2edae
masking stuff
Pockets-byte May 5, 2026
6955bce
testing testing testing testing
Pockets-byte May 5, 2026
606e16c
icon state
Pockets-byte May 5, 2026
db66a1c
blah
Pockets-byte May 5, 2026
f3c4da0
AAAAA
Pockets-byte May 5, 2026
49172a5
ack.
Pockets-byte May 5, 2026
795d516
filterfilterfilterfilterfilterfilterfilterfilterfilterfilterfilterfil…
Pockets-byte May 5, 2026
4212c0c
temperature gauge on energy weapons
Pockets-byte May 5, 2026
ed0a726
null handling
Pockets-byte May 5, 2026
9245692
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte May 10, 2026
a4c5233
I might've forgotten to commit
Pockets-byte Jun 22, 2026
c975b2c
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Jun 28, 2026
d645dc5
vnc energy-ified
Pockets-byte Jun 28, 2026
3b94f2c
revamped overheat gauge
Pockets-byte Aug 17, 2026
d98a30e
makes HUD not update when there's nothing to update
Pockets-byte Aug 17, 2026
4cd385d
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Aug 18, 2026
1f86501
Merge branch 'BeeStation:master' into energy-weapon-gameplay
Pockets-byte Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
475 changes: 232 additions & 243 deletions _maps/map_files/Aetherwhisp/Aetherwhisp2.dmm
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 1 addition & 14 deletions _maps/map_files/Aetherwhisp/job_changes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@

// If you continue to complain that munitechs have nothing to do, then I guess you really have nothing to do now don't you?
// I'm replacing your job with bridge officers who are perfectly capable of pushing a button on lasers
// MAP_REMOVE_JOB(master_at_arms)
MAP_REMOVE_JOB(munitions_tech)

/datum/job/munitions_tech/New()
..()
MAP_JOB_CHECK
total_positions = 0
spawn_positions = 0

/datum/job/master_at_arms/New()
..()
MAP_JOB_CHECK
total_positions = 0
spawn_positions = 0
// this file should be obsolete

#undef JOB_MODIFICATION_MAP_NAME
Loading
Loading