Changeling Playtest #64
Merged
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 cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content. https://github.com/frosty-dev/ss14-wwdp/pull/10 Signed-off-by: Timemaster99 <[email protected]> Co-authored-by: ThereDrD <[email protected]> Co-authored-by: Jeff <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: Azzy <[email protected]>
This cherry-pick's Wizden's Antag Refactor, which is needed for all future antag updates, as well as for me to cherry-pick over Cultists(Who are going to need some editing to fit the antag refactor), Changelings, Heretics, and Wizards. I actually selected the White-Dream-Public version of the Antag Refactor, due to it having commits made tailored to our repository, so it comes prepackaged with all the changes necessary for our repo-specific content. https://github.com/frosty-dev/ss14-wwdp/pull/10 Signed-off-by: Timemaster99 <[email protected]> Co-authored-by: ThereDrD <[email protected]> Co-authored-by: Jeff <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: Timemaster99 <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: Azzy <[email protected]>
* ling gamemode * more shit * gaming * Update game_presets.yml * Update secret_weights.yml * gaming 2 * shittery * fart * fart 2 * gorbing * balance stasis again * fart * goobing * chat is this real? * real. * g * fucking chemical regen i fucking hate it i hate you i hate everythi * fart * fart 2 * Add _timing * fart 3 * fart 5 * fart 6: electrical boogaloo --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <[email protected]>
* ling gamemode * more shit * gaming * Update game_presets.yml * Update secret_weights.yml * gaming 2 * shittery * fart * fart 2 * gorbing * balance stasis again * fart * goobing * chat is this real? * real. * g * fucking chemical regen i fucking hate it i hate you i hate everythi * fart * fart 2 * Add _timing * fart 3 * fart 5 * fart 6: electrical boogaloo * balance issue --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <[email protected]>
…ay matches traitor (#412) * Adds "Calm" Variants of gamerules, for dual antag gamemodes/admin usage * Create presets-dualantag.ftl * Update presets-dualantag.ftl * Update presets-dualantag.ftl * Update presets-dualantag.ftl * Adds Dual Antag Presets * Update secret_weights.yml * Update roundstart.yml * Update roundstart.yml * forgot about that~ - Thieves removed from dual antag * Update presets-dualantag.ftl * Piras weights - These seem to push the no major pretty low at 60%, may have to change later based on player feedback but that requires these weights to be played first. * really, me?
* fixel * Fuck the pixel up harder. --------- Co-authored-by: Aidenkrz <[email protected]>
* ling gamemode * more shit * gaming * Update game_presets.yml * Update secret_weights.yml * gaming 2 * shittery * fart * fart 2 * gorbing * balance stasis again * fart * goobing * chat is this real? * real. * g * fucking chemical regen i fucking hate it i hate you i hate everythi * fart * fart 2 * Add _timing * fart 3 * fart 5 * fart 6: electrical boogaloo * balance issue * fart * holy shit!! * gorber * gorbing time * init * fart 10 --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <[email protected]> Co-authored-by: Fishbait <[email protected]>
* gaming * real! * real 3! * fuck * great * ungreat * gnomes are here. * g * fuck * raaagh cleanup * fart * ghfghdfghfbvd * boobooboo --------- Co-authored-by: whateverusername0 <whateveremail>
* gaming * real! * real 3! * fuck * great * ungreat * gnomes are here. * g * fuck * raaagh cleanup * fart * ghfghdfghfbvd * boobooboo * RAAAAAAAAAAAAGH * zased --------- Co-authored-by: whateverusername0 <whateveremail>
* gaming * real! * real 3! * fuck * great * ungreat * gnomes are here. * g * fuck * raaagh cleanup * fart * ghfghdfghfbvd * boobooboo * RAAAAAAAAAAAAGH * zased * the unholy shitfix * small chaeng --------- Co-authored-by: whateverusername0 <whateveremail>
…d to action events and BackgroundOn field (#27682) * Add ActionPerformedEvent and ActionsSystem.SetIfBiggerCooldown * Add action id to action events and backgroundon field to action component
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 9fa8477 merging into c93299b Resources/Textures/Goobstation/Changeling/Guidebook/guidebook_changeling.rsi
Resources/Textures/Goobstation/Changeling/arm_blade.rsi
Resources/Textures/Goobstation/Changeling/bone_shard.rsi
Resources/Textures/Goobstation/Changeling/changeling_abilities.rsi
Resources/Textures/Goobstation/Changeling/changeling_biomass.rsi
Resources/Textures/Goobstation/Changeling/changeling_chemicals.rsi
Resources/Textures/Goobstation/Changeling/ling_armor.rsi
Resources/Textures/Goobstation/Changeling/ling_armor_helmet.rsi
Resources/Textures/Goobstation/Changeling/ling_spacesuit.rsi
Resources/Textures/Goobstation/Changeling/ling_spacesuit_helmet.rsi
Resources/Textures/Goobstation/Changeling/shields.rsi
Resources/Textures/Interface/Misc/job_icons.rsi
|
VMSolidus
added a commit
to VMSolidus/deep-station-14
that referenced
this pull request
Aug 18, 2024
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.
This is all shitcode.