Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Oh this was a mistake (I dont know how to delete this) #33828

Closed
wants to merge 607 commits into from
Closed

Oh this was a mistake (I dont know how to delete this) #33828

wants to merge 607 commits into from

Conversation

Ermucat
Copy link

@Ermucat Ermucat commented Dec 11, 2024 •
edited
Loading

No description provided.

spanky-spanky and others added 30 commits October 9, 2024 19:46
@spanky-spanky
Invalid fix.
de906cf
@KeldWolf
Merge pull request ss14-harmony#113 from ss14-harmony/upstream20241009
2178ce6 
Upstream20241009
@KeldWolf
Merge pull request ss14-harmony#112 from ss14-harmony/spanky-packed
835729d 
Packed Update
@spanky-spanky
Adds custom in-game logo.
e5ebe75
Added custom end of round voice lines clipped from Lilten videos.
d56c798
@spanky-spanky
Merge pull request ss14-harmony#114 from ss14-harmony/spanky-logo
0321e31 
Harmony Logo
@KeldWolf
Update attributions.yml
ea3f940 
Fixed sources to point to their respective YouTube videos. 

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
@KeldWolf
Merge pull request ss14-harmony#115 from ss14-harmony/RoundEndLinesv1
9d86265 
Added custom end of round voice lines clipped from Lilten videos.
@spanky-spanky
Changes game window name. (ss14-harmony#116)
ac8415b
@Dogbone10
Add Syndicate Diplomacy ship for Admin spawning (ss14-harmony#118)
dbb80a6
@FluffMe
Role timer fixes for lawyer, mime, bartender, chef, and ta
51d6a21
@spanky-spanky
More Packed changes.
80f1e34
@spanky-spanky
fix
b3a4cbd
@spanky-spanky
Add Barratry.
b0196be
@spanky-spanky
Merge pull request ss14-harmony#121 from ss14-harmony/fix-role-timers
0fd4253 
Role timer fixes for lawyer, mime, bartender, chef, and technical assistant
@spanky-spanky
Removes overflow job from prototype.
9a87916
@spanky-spanky
More map adjusts.
e1ce65c
@Tofsel
Addition of four more posters (ss14-harmony#120)
e3d7479 
* Add files via upload

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>

* Add files via upload

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>

---------

Signed-off-by: Denetth <117494542+Tofsel@users.noreply.github.com>
@KeldWolf
Merge pull request ss14-harmony#123 from ss14-harmony/spanky-detroit
0a78ca3 
Add Barratry
@KeldWolf
Merge pull request ss14-harmony#122 from ss14-harmony/spanky-packed
808c310 
Packed Update
Upstream merge for Oct. 16, 2024
6c2ad41
@liltenhead
roolz change
5330ce1
@KeldWolf
Merge pull request ss14-harmony#125 from ss14-harmony/upstream20241016
f61bfa4 
Upstream20241016
@FluffMe
changelog update
5e31501
@KeldWolf
Merge pull request ss14-harmony#126 from ss14-harmony/changelog-updat…
b99972f 
…e17102024

Changelog update 17102024
@KeldWolf
Merge pull request ss14-harmony#124 from liltenhead/Roolz
d123422 
Minor rule change and clarification
@SlamBamActionman
Xeno Beta 1.3.2
e06ec13
@SlamBamActionman
Fix invalid in map, update chapel
c007d0d
@Unisol
added labeler to nukie oupost
f29630e
@spanky-spanky
Merge pull request ss14-harmony#128 from SlamBamActionman/Harmony/xen…
c2063b6 
…o-update-1

Xeno Beta 1.3.2
spanky-spanky and others added 11 commits December 3, 2024 15:42
@spanky-spanky
Adjusts gamemode weights after recent discussion.
6b62038
@KeldWolf
Merge pull request ss14-harmony#223 from ss14-harmony/spanky-secret
bd411e0 
Adjust Gamemode Weight (Reduce Nukies + Add Extended)
@KeldWolf
Merge pull request ss14-harmony#211 from ss14-harmony/changelog20241125
5893397 
Changelog20241125
upstream merge for Dec 4 2024
ff35afb
@liltenhead
law update (ss14-harmony#226)
652a42a
@KeldWolf
Update PostMapInitTest.cs
db3c93a 
Added missing ,

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
@FluffMe
Add changelog for PRs ss14-harmony#223 and ss14-harmony#226
8a734fc
@KeldWolf
Merge pull request ss14-harmony#227 from ss14-harmony/changelog20241205
d78051d 
Changelog20241205
@KeldWolf
Merge pull request ss14-harmony#225 from ss14-harmony/upstream20241204
3094b94 
Upstream20241204
@BoskiYourk
Requested Captain Clothing (ss14-harmony#224)
434bd54 
Co-authored-by: BoskiYourk <175783845+BoskiYourk@users.noreply.guthub.com>
@Ermucat
Adds the thingy yeah
ccdcfc7
@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines. Changes: UI Changes: Might require knowledge of UI design or code. Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting or visual design. Changes: Audio Changes: Might require knowledge of audio. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted and removed S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines. labels Dec 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Ermucat Ermucat changed the title Ports "Teach a lesson" Objective from Oh this was a mistake (I dont know how to delete this) Dec 11, 2024
@Ermucat Ermucat closed this Dec 11, 2024
@FATFSAAM2
Copy link
Contributor

this is so controversial i want this person BANNED!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Partmedia Partmedia Awaiting requested review from Partmedia Partmedia is a code owner

@nikthechampiongr nikthechampiongr Awaiting requested review from nikthechampiongr nikthechampiongr is a code owner

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

@Emisse Emisse Awaiting requested review from Emisse Emisse is a code owner

Assignees
No one assigned
Labels
Changes: Audio Changes: Might require knowledge of audio. Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting or visual design. Changes: UI Changes: Might require knowledge of UI design or code. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.