Xeno strain resetting #7841
Merged
Xeno strain resetting #7841
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as off-topic.
This comment was marked as off-topic.
Drulikar
requested changes
Dec 20, 2024
There was a problem hiding this comment.
As mentioned on discord: This is ripe for bugs and exploitation.
- Just recreate the xeno. Look at de-evolve to see what all ought to be transfered
- Consider just refactoring de-evolve at this point since there's 3 places that effectively want the same code: deevolve verb, queen deevolve action, and now this.
cm13-github
added a commit
that referenced
this pull request
Dec 31, 2024
cm13-github
added a commit
that referenced
this pull request
Dec 31, 2024
This was referenced Dec 31, 2024
Closed
Open
cm13-github
added a commit
that referenced
this pull request
Dec 31, 2024
|
Off TM until fixed |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Git-Nivrak
force-pushed
the
strainreset
branch
from
ebd5df8 to
92c94b0
Compare
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
# About the pull request Adds the "M10 Auto Pistol" as a primary "side-arm". Gives it a custom holster much like the m39 one, but can hold only the M10 + 8 magazines of "pistol ammo". Also adds various M10 ammo types boxes, normal HV, extended and drum (even larger extended). Also side-note - also fixes the broken m39 holster gun camo icons and adds the missing "urban" and "jungle" too. Tested the gun, may need some tweaking, but it works well as a hyper-fast-firing side-arm with low damage, should be fun. Also the guns sounds/balance may be up for change if necessary, especially the sound. # Explain why it's good for the game Basically for a while now I've always wanted a new type of "SMG", I requested that someone make one, instead I got the M10 - Auto Pistol, which is equally as cool as a new SMG, and perhaps even more unique. We don't have any types of fully automatic pistols, and it's something that I'm sure players would enjoy, as it's more of a side-arm then a primary weapon like the M39 is currently. Generally it won't change much in the gameplay loop, rather just give you an additional option of playstyle. It will really just be an interesting alternative to the current side-arms, without taking away what makes them unique but being unique in itself. It also is lore-accurate to the games at least. Here's the wiki-page for it if you want more specific information: https://avp.fandom.com/wiki/M10_Auto_Pistol I want to thank **Frans_Feiffer** for their amazing sprites, without them this whole thing wouldn't have come to fruition. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary>  <a href="https://drive.google.com/file/d/1kgqPovSrnjRLx-MwNKQZA6iYpUpW-UD6/view?usp=sharing">Video of the Gun in action</a> </details> # Changelog :cl: Zenith, Frans_Feiffer add: Added M10 Auto Pistol, new belt, magazines and boxes to standard marine vendors fix: fixes the m39 holster sprites not showing correct camo soundadd: added new M10 gunshot sound /:cl: --------- Co-authored-by: Blundir <[email protected]>
harryob
requested changes
Jan 3, 2025
code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Outdated
Show resolved
Hide resolved
code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Outdated
Show resolved
Hide resolved
code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Outdated
Show resolved
Hide resolved
code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Outdated
Show resolved
Hide resolved
code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Outdated
Show resolved
Hide resolved
harryob
approved these changes
Jan 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Allows xenos to reset their strain, first use is free after that it can be used every 40 minutes
Explain why it's good for the game
Allows players to change their strain if they do not enjoy playing it anymore or the round has went on for long enough it became basically useless - happier players >> profit. (You could also make a point for new players that accidently clicked a strain out of curiosity and now want to reset it)
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
add: Xenomorphs can now reset their strain, first use is free then it can be done once every 40 minutes.
/:cl: