Adds a plantable UA flag in the CIC armoury #6492
Conversation
github-actions
bot
added
Sprites
|
Now all we need is sprites for every caste that has a flag impaling into them |
| @@ -416,7 +416,7 @@ | |||
|
|
|||
| var/offset_x = worn_x_dimension | |||
| var/offset_y = worn_y_dimension | |||
| if(inhands) | |||
| if(inhands == 1 || inhands == 0) | |||
There was a problem hiding this comment.
what is the purpose of this
There was a problem hiding this comment.
the 64x64 right inhands are broken because if(ifhands) is only valid for the value 1 and having an item in your right hand sets the inhands variable to 0
There was a problem hiding this comment.
There is no point to this if check then. It can only ever possibly be 1 or 0
|
Might want to consider a optional ID lock set to CIC/SLs that can be turned on or off once the flag is planted. So some PFC doesn't steal the flag that was planted in the FOB. |
…y into walls and space + an extra safety check
i was following the checks from sentry code and weirdly enough they don't seem to check for space turfs either. space sentries are real apparently. fixed now, tho. thanks for checking it out |
|
noticed one issue, it gets deleted by the slightest explosion |
|
good catch. i'll change how the flag handles damage a bit later once i have the time |
…ayering issue and other minor nits
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
stale exempt until reviewed |
Drulikar
added
Stale Exempt
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
# About the pull request Removes a sound without a name (`sound/effects/.wav`) that is never used. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Even in the PR that introduced it (#6492) never used it, and it has no description or purpose. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog No player facing changes.
About the pull request
adds a plantable united americas flag in the CIC armoury.
it takes 6 seconds to hoist up and to take down. raising the flag while on harm intent will produce a unique warcry. if the flag is raised while there are more than 14 nearby marines, a stronger rallying cry will played with 40% of the marines automatically *warcry-ing. this has a 90 second cooldown.
the code should be relatively modular (i think?? i'm not very good at coding and all the code is spaghetti-y), so adding in a UPP variant should be a piece of cake. if some feels up to it, at least.
i am no spriter either, so they might not be super pretty but they're !!animated!!
Explain why it's good for the game
i don't know how to explain this besides it being pretty soulful and and one of the few good ideas from the ideaguys forum. might be a pretty decent way to coordinate marine pushes/holds? who knows
Testing Photographs and Procedure
Screenshots & Videos
raising.the.flag.on.kutjevo.mp4
taking.the.flag.down.mp4
Changelog
🆑
add: The CIC armoury now contains a plantable flag of the United Americas.
/:cl: