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

Changelog20241112 #33273

Closed
wants to merge 498 commits into from
Closed

Changelog20241112 #33273

wants to merge 498 commits into from

Conversation

FluffMe
Copy link
Contributor

@FluffMe FluffMe commented Nov 12, 2024

Changelog update

BuildTools and others added 30 commits September 21, 2024 07:24
Upstream merge for Sept. 21, 2024
7180cd0
@KeldWolf
Merge pull request #72 from ss14-harmony/upstream20240921
e83bb59 
Upstream20240921
@jack-thedragon95
New options menu name for hud
e6ba367 
changes theme name in options-menu.ftl to some thing more

Signed-off-by: jack-thedragon95 <[email protected]>
@jack-thedragon95
wrong name guh
3be3172 
Signed-off-by: jack-thedragon95 <[email protected]>
@jack-thedragon95
Update hud.yml
fdf2442 
Signed-off-by: jack-thedragon95 <[email protected]>
@jack-thedragon95
Update themes.yml
cde366e 
Signed-off-by: jack-thedragon95 <[email protected]>
@jack-thedragon95
Merge pull request #65 from ss14-harmony/harmony-purple-hud
34d7906 
new hud theme
@FluffMe
Delete misspelled folder "Loadlouts"
a3693c6
@FluffMe
Add "brown bandana" as a headwear option for Cargo Techs
654d9a3
@FluffMe
Add "red bandana" as a headwear option for Security Officers
eee0948
@FluffMe
Add "noir trenchcoat" as a outer clothing option for Detectives
4595214
@FluffMe
Add "Harmony" to all IDs just in case
c81f82d
@KeldWolf
Merge pull request #71 from ss14-harmony/LevitatingTree-new-posters-2
6667dbc 
 Add 4 more posters by LevitatingTree
@KeldWolf
Merge pull request #73 from ss14-harmony/adjust-loadouts
d695cbd 
Add Drobe-available items to Loadouts -- red bandana for SecOff, brown bandana for CargoTech, noir coat for Det
Upstream merge for Sept. 23, 2024
aededaf
@KeldWolf
Merge pull request #74 from ss14-harmony/upstream20240923
84484b7 
Upstream20240923
@Unisol
Sunset soda, Aviation, Espresso martini
38c7228
@Unisol
copyright update
21406b1
@Unisol
Moving changes to harmony subfolders
0663208
@Unisol
Second pass at moving files to harmony subfolders
2cb4cad
@Unisol
reverting whitespace changes in soda.ftl
32333e3
@Unisol
reverting whitespace changes in soda.ftl, for real this time
72d32c3
@FluffMe
Delete alcohol.ftl
7ba8481
@FluffMe
Delete soda.ftl
e1a3b8b
@FluffMe
Update alcohol.yml
3ae9dcd
@FluffMe
Update soda.yml
14b38e3
@FluffMe
Re-create soda.ftl
c128006
@FluffMe
Recreate alcohol.ftl
dc84ed5
@FluffMe
Readd locale string to soda.yml
e5e9217
@FluffMe
Readd locale strings to alcohol.yml
6579871
FluffMe and others added 20 commits November 9, 2024 15:27
@FluffMe
Sort crewManifest by name
66934fb
@FluffMe
Add DieselMohawk as a code owner for sprites and lobby art
2b669b4
@KeldWolf
Merge pull request #173 from ss14-harmony/codeowners/add-DieselMohawk
484efa7 
CODEOWNERS: add DieselMohawk
@BoskiYourk
Bluesec Updates/Changes (#172)
6bc04af 
* Blue Sec Updates/Changes

* Oopsies, forgot to comit this one

* Updating Files To Fit Requested Changes

---------

Co-authored-by: BoskiYourk <[email protected]>
@KeldWolf
Merge pull request #167 from elisarek/patubranch
2a86b3f 
Added a new lobbyscreen
@KeldWolf
Merge pull request #169 from ss14-harmony/cargo-qol/sort-crew-list
137f535 
Sort the crew members in the cargo order crew dropdown by name
Upstream merge for Nov 10, 2024
bfa4ab5
@FluffMe
Changelog for PRs 172, 167, 169
6fddf97
@FluffMe
Fix unparsed tags in changelog entry
03b1902
@Unisol
Janitorial toolbox (#171)
29cc352 
* added janitorial toolbox

* resolved minor review issues

* changed licensing to AGPL3

* Revert "changed licensing to AGPL3"

This reverts commit 00dd383.
@FluffMe
Changelog for PR 171
97aa07f
@FluffMe
Relocate Harmony lobbyscreens
f45e5bc
@KeldWolf
Merge pull request #174 from ss14-harmony/upstream20241110
17cec28 
Upstream20241110
@BoskiYourk @DieselMohawk
Return of the Sheriff Hat (#176)
cc9e7b7 
* HoS All Included

* Removes the Copyrighten term stetson from the hat

* Updating copyright again, OOPS!

* Update meta.json to correct version given by Fluffme

Signed-off-by: DieselMohawk <[email protected]>

---------

Signed-off-by: DieselMohawk <[email protected]>
Co-authored-by: BoskiYourk <[email protected]>
Co-authored-by: DieselMohawk <[email protected]>
@FluffMe
Add PR 176 changelog
6d63625
@KeldWolf
Merge pull request #175 from ss14-harmony/changelog20241111
b473a74 
Changelog20241111
@KeldWolf
Merge pull request #177 from ss14-harmony/housekeeping/relocate-lobby…
5461570 
…screens

Relocate Harmony lobbyscreens
Upped volume and new post round audios added
f2ec0ca
@FluffMe
Merge pull request #178 from ss14-harmony/PostRoundVolumeUp
192111b 
Upped volume and new post round audios added
@FluffMe
add PR 178 changelog
0db1c65
@FluffMe FluffMe closed this Nov 12, 2024
@FluffMe
Copy link
Contributor Author

FluffMe commented Nov 12, 2024

REEEE

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Nov 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 0db1c65 merging into a1966d8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Harmony/Clothing/Head/Hats/hoswidebrimhat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Head/Hoods/Coat/hoodcaptainarmored.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_Harmony/Clothing/Neck/Misc/instructormantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_Harmony/Clothing/Neck/Misc/serverpins.rsi

State Old New Status
axolotl-equipped Added
axolotl Added
cosmatic-drift-equipped Added
cosmatic-drift Added
delta-v-equipped Added
delta-v Added
frontier-equipped Added
frontier Added
leviathan-equipped Added
leviathan Added
lizard-equipped Added
lizard Added
miros-equipped Added
miros Added
salamander-equipped Added
salamander Added

Resources/Textures/_Harmony/Clothing/Neck/Misc/vulturepin.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_Harmony/Clothing/OuterClothing/WinterCoats/coatcaparmored.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpskirt/hop_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/hop_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/hos_blue.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/security_blue.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Decals/Overlays/greyscale.rsi

State Old New Status
full Added

Resources/Textures/_Harmony/Decals/ss14sign.rsi

State Old New Status
ss14sign1 Added
ss14sign2 Added
ss14sign3 Added

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

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

Assignees
No one assigned
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.