-
Notifications
You must be signed in to change notification settings - Fork 414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Random Announcer System [PORT] #2652
Open
Monotheonist
wants to merge
37
commits into
DeltaV-Station:master
Choose a base branch
from
Monotheonist:randomannouncersys
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,946
−315
Open
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
ba41ae6
random announcer system port from einstein engines
Darkmajia 0442f49
robust fixes for announcement issues
Darkmajia 56ff915
doing it sensible style
Darkmajia a3198f0
multiple announcement sounds, announcer volume fix
Darkmajia 7563c2e
CVars, yay.
Monotheonist bebd361
The great Einsteins Engineing
Monotheonist 978e690
I am in misery (more Cvars)
Monotheonist f8809f8
quick fixes for shuttle dock/meteor swarm announcements
Darkmajia 9384659
we're still in hell
Monotheonist 6a65692
end of file newline ops
Monotheonist 6cbfcd6
Oh my goodness it's almost not broken
Monotheonist 3912e45
works now, apparently...?
Monotheonist a51b3c7
Y'know what, fuck everyone else, lmao!!
Monotheonist 0412d02
Namespaces locale for announcers
Monotheonist 031d7c9
Untested but this might fix the test fails :tm:
Monotheonist 68e5411
don't forget the snails fool
Monotheonist 7e9c1c1
Un-nullable, therefore false.
Monotheonist 94269ea
Gas leak
Monotheonist 437e38b
Sinking ships often leak and I'm plugging the holes with these commits
Monotheonist afd13e6
Is that everything, Linter?!
Monotheonist b463728
IT SAID NO!!!!!!!! RAHHHHHHHHHH
Monotheonist 272e448
Probably the final attempt to appease the linter for this (at least I…
Monotheonist 09e025a
Conflictless locale gaming part one (and also adding greytide virus t…
Monotheonist 5b26441
I FORGOT!
Monotheonist 15fd731
Conflictless locale gaming part two
Monotheonist a701e48
Comments (CS / XAML)
Monotheonist bc4e520
Finishes locale gaming for real
Monotheonist a4c6a7f
Pure Idiocy
Monotheonist 9c5de08
Fixing Xenovents error
Monotheonist 6e4ef46
Moving to deltaV files, if we don't want them here we can revert and …
Monotheonist 92ca70a
Attributions YML
Monotheonist 8241f83
Merge branch 'master' into randomannouncersys
Monotheonist 56183a4
THIS DOES NOT HAVE AN ANNOUNCEMENT. IT IS NEVER CALLED.
Monotheonist 2ddd5b0
Merge branch 'randomannouncersys' of https://github.com/Monotheonist/…
Monotheonist f28f338
Radezolid's review (Incomplete)
Monotheonist d2d763a
Merge branch 'master' into randomannouncersys
Monotheonist e5d3f64
Merge branch 'randomannouncersys' of https://github.com/Monotheonist/…
Monotheonist File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Is that everything, Linter?!
commit afd13e6a47c65d356967367027c3f978e0a24d14
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,7 +129,7 @@ | |
parent: BaseGameRule | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true #Impstation Random Announcer System | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
minimumPlayers: 25 | ||
weight: 5 | ||
duration: 1 | ||
|
@@ -144,7 +144,7 @@ | |
parent: BaseGameRule | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add to the comment what the locale was before same as the rest of them. |
||
minimumPlayers: 15 | ||
weight: 5 | ||
duration: 1 | ||
|
@@ -351,7 +351,7 @@ | |
parent: BaseStationEventLongDelay | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
earliestStart: 20 #DeltaV - was 15 | ||
minimumPlayers: 15 | ||
weight: 7.5 # DeltaV - was 5 | ||
|
@@ -365,7 +365,7 @@ | |
parent: BaseStationEventShortDelay | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
earliestStart: 20 | ||
minimumPlayers: 15 | ||
weight: 5 | ||
|
@@ -384,7 +384,7 @@ | |
parent: BaseStationEventShortDelay | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: station-event-vent-creatures-start-announcement | ||
startAnnouncement: true # Impstation Random Announcer Port | ||
startAudio: | ||
path: /Audio/Announcements/attention.ogg | ||
earliestStart: 20 | ||
|
@@ -405,7 +405,7 @@ | |
parent: BaseStationEventShortDelay | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
earliestStart: 20 | ||
minimumPlayers: 15 | ||
weight: 5 | ||
|
@@ -421,7 +421,7 @@ | |
parent: BaseStationEventShortDelay | ||
components: | ||
- type: StationEvent | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
earliestStart: 45 # DeltaV - was 20 | ||
minimumPlayers: 30 # DeltaV - was 20 | ||
weight: 1 # DeltaV - was 1.5 | ||
|
@@ -515,7 +515,7 @@ | |
weight: 5 # DeltaV - Was 8 now 5 | ||
minimumPlayers: 15 | ||
maxOccurrences: 1 # can only happen once per round | ||
startAnnouncement: true | ||
startAnnouncement: true # Impstation: Random Announcer System | ||
duration: null # the rule has to last the whole round not 1 second | ||
occursDuringRoundEnd: false | ||
- type: PrecognitionResult # DeltaV - Precogniton | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't delete the lines, comment them out with a DeltaV comment stating why it was commented out.
Also state what the locale was before you changed it.