Cherrypicks 4 (#393)
* Immovable Rod changes (#26757) * Adds non randomized rod velocity (#27123) * adds non randomized rod velocity * Adds despawn suffix to despawn rod * make fire spreading scale with mass (#27202) * make fire spreading scale with mass * realer --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * lower max firestacks to 10, refactor flammable (#27159) * lower max firestacks to 10, refactor flammable * fix * uncap fire stack damage, lower fire stack damage * fix fire spread round removal (#27986) * fix a resolve debug assert * rewrite fire spread --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * fire troll fix (#28034) Co-authored-by: deltanedas <@deltanedas:kde.org> * Hide doafters if you're in a container (#29487) * Hide doafters if you're in a container * Out of the loop --------- Co-authored-by: plykiya <plykiya@protonmail.com> * Add ghost role raffles (#26629) * Add ghost role raffles * GRR: Fix dialogue sizing, fix merge * GRR: Add raffle deciders (winner picker) * GRR: Make settings prototype based with option to override * GRR: Use Raffles folder and namespace * GRR: DataFieldify and TimeSpanify * GRR: Don't actually DataFieldify HashSet<ICommonSession>s * GRR: add GetGhostRoleCount() + docs * update engine on branch * Ghost role raffles: docs, fix window size, cleanup, etc * GRR: Admin UI * GRR: Admin UI: Display initial/max/ext of selected raffle settings proto * GRR: Make a ton of roles raffled * Make ERT use short raffle timer (#27830) Co-authored-by: plykiya <plykiya@protonmail.com> * gives loneops a proper ghost role raffle (#27841) * shorten short raffle (#28685) * - fix: Conflicts. * - fix. --------- Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
This commit is contained in:
3
Resources/Prototypes/GhostRoleRaffles/deciders.yml
Normal file
3
Resources/Prototypes/GhostRoleRaffles/deciders.yml
Normal file
@@ -0,0 +1,3 @@
|
||||
- type: ghostRoleRaffleDecider
|
||||
id: default
|
||||
decider: !type:RngGhostRoleRaffleDecider {}
|
||||
15
Resources/Prototypes/GhostRoleRaffles/settings.yml
Normal file
15
Resources/Prototypes/GhostRoleRaffles/settings.yml
Normal file
@@ -0,0 +1,15 @@
|
||||
# for important antag roles (nukie reinforcements, ninja, etc.)
|
||||
- type: ghostRoleRaffleSettings
|
||||
id: default
|
||||
settings:
|
||||
initialDuration: 30
|
||||
joinExtendsDurationBy: 10
|
||||
maxDuration: 90
|
||||
|
||||
# for roles that don't matter too much or are available plentifully (e.g. space carp)
|
||||
- type: ghostRoleRaffleSettings
|
||||
id: short
|
||||
settings:
|
||||
initialDuration: 10
|
||||
joinExtendsDurationBy: 2
|
||||
maxDuration: 15
|
||||
Reference in New Issue
Block a user