constitution rifle, magnum disabler, railgun #123
Conversation
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json
Outdated
Show resolved
Hide resolved
…tery_guns.yml Used doc's description for the railgun Co-authored-by: TheDoctor1977 <[email protected]>
…i.rsi/meta.json Co-authored-by: TheDoctor1977 <[email protected]>
|
conflicts murdered |
hoping to god this works
fixed the energy shotgun being not real
|
i'm almost entirely sure that test fails are fake, yaml and debug say theres something without an id field but everything i added has an id field, including the energy shotgun from wizmerge, diff rsi and pr title case are still broken |
|
fails are real, not sure whats causing them but they are real. |
| @@ -889,7 +889,80 @@ | |||
| price: 750 | |||
|
|
|||
| - type: entity | |||
| name: energy shotgun | |||
| name: railgun | |||
There was a problem hiding this comment.
putting this in this file will cause merge conflicts later
| @@ -261,6 +261,49 @@ | |||
| collection: WeakHit | |||
| forceSound: true | |||
|
|
|||
| - type: entity | |||
There was a problem hiding this comment.
this will also cause a merge conflict later, you should have a seperate file for these.
| @@ -209,6 +209,29 @@ | |||
| proto: CartridgeAntiMateriel | |||
| - type: StaticPrice | |||
| price: 0 | |||
|
|
|||
There was a problem hiding this comment.
again, move them to something like Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
|
i don't have the energy, time, nor resources to fix the merge conflict bullshit |
|
closing, dustys is probably better |
|
No it's not. |
Fixes the pronouns in the character preview to not show they/them pronouns for characters that use it/its <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This just adds another condition in the fluent file that controls the character preview text. Essentially, characters that use it/its pronouns will go from: "This is [character]. They are X years old." to "This is [character]. It is X years old." --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Probably test it, maybe. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Azzy - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview.
Description
Adds the Constitution rifle from Helldivers, (renamed) a magnum disabler dealing more burn and stamina damage at the cost of lower capacity, and a railgun that acts like a 3-shot pulse rifle that slowly recharges.
TODO
already did it all lol
Changelog
🆑