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 Guns (#385) #587

Merged
merged 7 commits into from
Dec 10, 2023
Merged

Energy Guns (#385) #587

merged 7 commits into from
Dec 10, 2023

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Nov 16, 2023 •
edited
Loading

About the PR

The Head of Security special energy gun and the normal energy gun from TG.

Why / Balance

The sheriff deserves a new tool and this one has two firemode, using the same amount of shots as the TG version. It can shoot disabler bolts and projectile lasers specifically made for it (None hitscan).

It spawns on the back slot of sheriff.

Technical details

A new system and component was made for the EnergyGun that allows for it to change between lethal and disable firemode while also changing sprites. It's the stunbaton and firemode system duct taped together.

Media

DeltaV-Station/Delta-v#385

Breaking changes

N/A

Changelog
🆑 FluffiestFloof, dvir01

  • add: Added the X-01 MultiPhase Energy Gun for the Sheriff.

@FluffiestFloof @DEATHB4DEFEAT @dvir001
Energy Guns (new-frontiers-14#385)
2caa17a 
* gee

* forgor comments

* licence for audio

* Update equipped-BELT.png

* Makes the sprite change but shitcode

Because shitcode makes everyone happy

* it only got two of them firemodes lets not lie

* We can name this appropriately now

* Apply 3 suggestions from code review

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: Fluffiest Floofers <[email protected]>

* update sources

* Energy Gun + more firemodes

its still energygun only

---------

Signed-off-by: Fluffiest Floofers <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 16, 2023 •
edited
Loading

RSI Diff Bot; head commit eb53f7f merging into 956cbe8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi

State Old New Status
base Added
disabler-inhand-left Added
disabler-inhand-right Added
icon Added
lethal-inhand-left Added
lethal-inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mode-disabler Added
mode-lethal Added
mode-stun Added
special-inhand-left Added
special-inhand-right Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi

State Old New Status
base Added
disabler-inhand-left Added
disabler-inhand-right Added
equipped-BELT Added
icon Added
lethal-inhand-left Added
lethal-inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mode-disabler Added
mode-ion Added
mode-lethal Added
special-inhand-left Added
special-inhand-right Added

Edit: diff updated after eb53f7f

@dvir001
Copy link
Contributor Author

dvir001 commented Nov 16, 2023

This will need some changes before we can consider a merge, leaving this as WIP

@Cheackraze
Copy link
Member

please be more descriptive for changes like this. The lack of info and the PR and 46 changed files is going to make me ignore this since I have no idea what the intent even is.

@dvir001
Copy link
Contributor Author

dvir001 commented Nov 17, 2023 •
edited
Loading

please be more descriptive for changes like this. The lack of info and the PR and 46 changed files is going to make me ignore this since I have no idea what the intent even is.

Sorry I was in the middle of fixing it, you got here before I got to add it

Note there is still needed changes on code level, so its still draft, working on it

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Dec 4, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Dec 4, 2023
@dvir001 dvir001 marked this pull request as ready for review December 4, 2023 21:18
@dvir001
Copy link
Contributor Author

dvir001 commented Dec 4, 2023

Its ready for frontier now.

@Cheackraze Cheackraze self-requested a review December 10, 2023 18:37
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 10, 2023
@Cheackraze Cheackraze merged commit 7182e2d into new-frontiers-14:master Dec 10, 2023
11 of 12 checks passed
FrontierATC added a commit that referenced this pull request Dec 10, 2023
@FrontierATC
Automatic Changelog (#587)
806f88e
@Icepicked Icepicked mentioned this pull request Sep 9, 2024
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze approved these changes

Assignees
No one assigned
Labels
Status: Needs Review This PR is awaiting reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dvir001 @Cheackraze @FluffiestFloof