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.

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

Adds a new salvager weapon: The Makeshift Laser Rifle #15856

Merged
merged 70 commits into from Dec 22, 2023

Conversation

unfunnyperson
Copy link
Contributor

@unfunnyperson unfunnyperson commented Sep 16, 2023

[FEATURE] [GAME OBJECTS] [INPUT] [WIKI]

About the PR

Adds a new salvager weapon!
image

The weapon is a 2 handed laser weapon.
It fits on backs as well.
It uses large energy cells and uses 1250 energy per shot to create a 20 damage laser.

different cells used
image
image

The weapon can be used in-hand to adjust the firerate. This is between 0.2 and 1 seconds
image

If the gun is fired too much within a short period of time or the gun is emped the gun will burst into flame and the gun's cell will be drained!
image
After cooling down the gun needs to be repaired
image
Steps:

  1. Wirecutters to remove burnt wires
  2. Add 10 wires to replace burnt wires
  3. remove and replace power cell/light tube

The meltdown combined with the adjustable firerate allows a player to choose a slower firerate for a more reliable gun or a faster firerate for higher dps.

Using a rigged light tube will cause the gun to explode on use.

Using a wrench on the rifle will remove the battery
Using wirecutters will remove the light tube

A new battery/light tube can be added to the gun by clicking on it with the respective item

Why's this needed?

More variety in salvager weapons provides a more interesting gameplay experience. This weapon is designed around being less powerful than the survival rifle but has more ammo sources than the rifle as compensation.

Changelog

(u)UnfunnyPerson
(+)Added a new salvager weapon, the makeshift laser rifle.

@keywordlabeler keywordlabeler bot added A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features labels Sep 16, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Sep 16, 2023
@keywordlabeler keywordlabeler bot added the E-Input-Wanted Input and feedback are wanted. Also posts a discussion thread on the forums. label Sep 16, 2023
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 16, 2023
@unfunnyperson unfunnyperson marked this pull request as ready for review October 27, 2023 22:38
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Nov 6, 2023
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Nov 11, 2023
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Nov 26, 2023
@Azrun Azrun self-assigned this Nov 30, 2023
@Azrun Azrun removed the S-Stale An inactive PR that has had no updates in the past two weeks label Nov 30, 2023
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
code/obj/item/gun/energy.dm Outdated Show resolved Hide resolved
@Azrun
Copy link
Contributor

Azrun commented Dec 2, 2023

Gun gets into broken state if cell was rigged. Consider handling COMSIG_PARENT_PRE_DISPOSING?

@Azrun
Copy link
Contributor

Azrun commented Dec 2, 2023

Should light tube adjust projectile color?

@unfunnyperson
Copy link
Contributor Author

Should light tube adjust projectile color?

That would be cool but I can't figure out how to do it

@unfunnyperson
Copy link
Contributor Author

unfunnyperson commented Dec 7, 2023

figured out a way to do colored lasers

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Dec 18, 2023
@github-actions github-actions bot added S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict and removed S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict labels Dec 21, 2023
@Azrun Azrun merged commit aede33e into goonstation:master Dec 22, 2023
22 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 22, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change E-Input-Wanted Input and feedback are wanted. Also posts a discussion thread on the forums. S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants