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

Terra Expermental Energy weapons series #6719

Merged
merged 28 commits into from May 12, 2021
Merged

Terra Expermental Energy weapons series #6719

merged 28 commits into from May 12, 2021

Conversation

David-Stormwell
Copy link
Contributor

@David-Stormwell David-Stormwell commented Apr 29, 2021 •
edited

About The Pull Request

Adds a entire brand new set of lasers guns!

Extra lore bits for the guns come later once we flesh out more of the game.

Why It's Good For The Game

Removing that old yee ass lasgun and replacing it with some nice stuff! Also, each of the guns have a purpose, as they are quite different from your ballistic counterparts, with more utility , plus rechargeable ammo!
As they have no aimmode, these guns are now created to be fast and armor shredding assault weapons, the spearhead of any deathball.

Changelog

🆑 David Stormwell, Tiviplus, MJP, Kuro, RenGusta
add: Added a entire set of TE Laser guns!
del: Removed the Yee old Lasgun from current marine vendors.
balance: Laser guns do seem to affect balance a tad!
fix: fixed a few things
soundadd: Added a bunch of new sounds and sights for the guns!
imageadd: Added a bunch of new sounds and sights for the guns!
/:cl:

@David-Stormwell
Part one
0f27cbd 
Just need to add them to the vendors and fix weapon attachment offsets+add the correct attachment themselves and that'll be all.
@tgstation-server tgstation-server added Balance Changes to functionality that modifies how effective certain methods are at powergaming. Feature New interesting mechanics with new interesting bugs Removal Feature removal due to maintainibility or design direction. Sound Sound change. Sprites Changes to .dmi file. labels Apr 29, 2021
@David-Stormwell
Copy link
Contributor Author

tfw don't even know what i deleted

@Redory
Copy link
Contributor

Redory commented Apr 29, 2021

tfw don't even know what i deleted

del: Removed the Yee old Lasgun from current marine vendors.

@XSlayer300
Copy link
Contributor

So what, all lasers are blue instead of red?

David-Stormwell and others added 6 commits May 6, 2021 23:47
@David-Stormwell @XSlayer300
Apply suggestions from code review
af27b0d 
alright.

Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@David-Stormwell @XSlayer300
Update code/modules/projectiles/guns/energy.dm
22e0091 
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@David-Stormwell @XSlayer300
Update code/modules/projectiles/guns/energy.dm
ab5256a 
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@David-Stormwell @XSlayer300
Update code/modules/projectiles/guns/energy.dm
4b8364a 
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@David-Stormwell @XSlayer300
Update code/modules/projectiles/guns/energy.dm
4e302db 
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@David-Stormwell @XSlayer300
Update code/modules/projectiles/guns/energy.dm
54bb8f0 
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@gazzmaz4
Copy link

gazzmaz4 commented May 7, 2021

can't swallow the batteries
5/10

@Dolth Dolth mentioned this pull request May 7, 2021
Closed
@TiviPlus
Copy link
Member

TiviPlus commented May 9, 2021

laser mg or whatever is apparently too powerful

@TiviPlus TiviPlus added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 9, 2021
@David-Stormwell
Copy link
Contributor Author

laser mg or whatever is apparently too powerful

wuht

@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label May 11, 2021
@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 12, 2021
@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label May 12, 2021
@David-Stormwell David-Stormwell changed the title Terra Expermental Energy series! Terra Expermental Energy weapons series May 12, 2021
@David-Stormwell
dunno
be497fa 
what even
@David-Stormwell
Copy link
Contributor Author

please god let this be done I want to move on with other projects

@TiviPlus TiviPlus added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 12, 2021
@SplinterGP
Copy link
Member

laser mg or whatever is apparently too powerful

please explain and dissert, this aint any usefull, having high sunder is fine, sunder is quick to heal AND its a mechanic, should be used

@TiviPlus
Copy link
Member

laser mg or whatever is apparently too powerful

please explain and dissert, this aint any usefull, having high sunder is fine, sunder is quick to heal AND its a mechanic, should be used

????

@TiviPlus TiviPlus merged commit b9f4ccf into tgstation:master May 12, 2021
tgstation-server added a commit that referenced this pull request May 12, 2021
@tgstation-server
Automatic changelog generation for PR #6719 [ci skip]
eedfdc7
XSlayer300
XSlayer300 reviewed May 12, 2021
View reviewed changes
code/modules/projectiles/magazines/energy.dm

/obj/item/cell/lasgun/lasrifle/marine
name = "\improper Terra Experimental standard battery"
desc = "A specialized high density battery used to power most standard marine laser guns. It is simply known as the TE power cell"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no period at the end of the sentence

we4troikhbe narmigbnij3wq5jtn34w2u

@David-Stormwell David-Stormwell deleted the Laser-Tech branch May 13, 2021 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XSlayer300 XSlayer300 XSlayer300 left review comments

@Pariah919 Pariah919 Pariah919 left review comments

@TiviPlus TiviPlus TiviPlus approved these changes

@TheBimmer231 TheBimmer231 Awaiting requested review from TheBimmer231

@SplinterGP SplinterGP Awaiting requested review from SplinterGP

Assignees
No one assigned
Labels
Balance Changes to functionality that modifies how effective certain methods are at powergaming. Feature New interesting mechanics with new interesting bugs Removal Feature removal due to maintainibility or design direction. Sound Sound change. Sprites Changes to .dmi file. Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@David-Stormwell @Redory @XSlayer300 @SplinterGP @Kuro020 @TiviPlus @gazzmaz4 @Pariah919 @tgstation-server