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

upstream merge 12/01/25 #2709

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open

upstream merge 12/01/25 #2709

wants to merge 82 commits into from

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Jan 12, 2025 •
edited
Loading

About the PR

  • chameleon pda gaming
  • appraisal tool has a sound, made fake appraisal tool use it :trollface:
  • air alarms have a copy threshold button
  • escape pod directional sign for mapping
  • moved secret weights to SecretDeltaV so upstream changes no longer affect it
  • ghost boo rarely makes vending machines spooky
  • radiator bends for those shitty tegs with 20 radiators in series :trollface:
  • dotnet 9

Media

incredible
08:06:51

Changelog
🆑

  • add: Merged last week's changes from upstream.

Alpaccalypse and others added 30 commits January 12, 2025 07:44
@Alpaccalypse
Corrected all ghost role names to title case. (#34155)
2d45bb8 
* Corrected all ghost role names to title case.

* Removes full stop from Hamlet's title.

* Updated ghost role names not in the main ghost roles .ftl

* Two capitals corrections
@Alpaccalypse
Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
31e3a3f 
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml
@PJBot
Automatic changelog update
bde90cc
@chromiumboy
Bugfix for the AI player's eye getting stuck when their broadcast is …
cd3d35b 
…interrupted (#34093)

Initial commit
@Aeshus
Make JPEG a PNG (#34176)
600da77 
Make 3.png a PNG
@Aeshus
Removed Undesirable Ion Storm Verbs (#34175)
cfd53c4 
* Remove Undesirable Laws

* empty
@DylanWhittingham
added basic admin logs for PDA notekeeper notes (#34118)
8165b3e 
* added basic admin logs for PDA notekeeper notes

* formatting

* added new LogType 'PdaInteract' and changed PDA notekeeper logs to it

---------

Co-authored-by: dylanhunter <[email protected]>
@PJBot
Automatic changelog update
a31f82f
@Alpaccalypse @slarticodefast @Errant-4
Sprites defined for all non-generic computer boards. Added new syndic…
cd08942 
…ate computer board sprite. (#34104)

* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.

* Added new sprite to meta.json and updated attribution.

* Reformatted module.rsi meta.json to match other meta file styles.

* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.

* Corrected indentation spacing for currently edited entities.

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

* add pr link to attribution

---------

Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: Errant <[email protected]>
@DylanWhittingham
Added pricegun sound (#34119)
c8a77a1 
added pricegun sound

Co-authored-by: dylanhunter <[email protected]>
@PJBot
Automatic changelog update
dd555f2
@ps3moira
Separate Tables n' Counters (#32673)
ab60e55 
* Update tables.yml

* Remove Extra base: state_

* Update tables.yml
@PJBot
Automatic changelog update
5a51573
@SlamBamActionman
Add Chameleon PDA (#30514)
7992a69 
* V1 commit

* Remove PDA name and unnecessary pda state

* Adds PDA to Chameleon backpack & thief toolbox

* Change to use AppearanceDataInit

* Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied

* Revert PDA name (this will be changed to another way later)

* Update PDA name updating to new system

* Fix yaml, and fix Agent ID chameleon

* Updated based on review
@PJBot
Automatic changelog update
e2d5936
@FairlySadPanda
Add some ion storm actions to replace removed ones (#34180)
ed40e80 
* Add some ion storm actions to replace removed ones

* Remove other country references, replace

* Some more tuning of the storm values, removing real-world countries

* boldy basics
@PJBot
Automatic changelog update
7303437
update and clean up deltav pdas
0524813
@PJBot
Automatic changelog update
341bda0
@PJBot
Automatic changelog update
3a8d59a
@ArtisticRoomba
Fix rainbow lizard plushie inhands (#34128)
174d8ce 
* fix rainbow plushie inhands

* address requested changes

* attribute sprites
@deltanedas @Centronias @ScarKy0
wielding refactor/fixes (#32188)
916c78c 
* refactor wieldable events

* fix inconsitency with wielding and use updated events

* wieldable cosmetic refactoring

* Update Content.Shared/Wieldable/Events.cs

Co-authored-by: Centronias <[email protected]>

* real

Co-authored-by: ScarKy0 <[email protected]>

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Centronias <[email protected]>
Co-authored-by: ScarKy0 <[email protected]>
@PJBot
Automatic changelog update
7f13086
@Errant-4 @Aeshus @slarticodefast
Lobby chat width and custom lobby titles (#33783)
bf062d8 
* lobby name cvar

* panel width

* skrek

* server name localization fix

* comment format fix

Co-authored-by: Thomas <[email protected]>

* remove redundant newline

Co-authored-by: Thomas <[email protected]>

* string.empty

Co-authored-by: Thomas <[email protected]>

* use SetWidth

* Update Resources/Locale/en-US/lobby/lobby-gui.ftl

---------

Co-authored-by: Thomas <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
@PJBot
Automatic changelog update
17604f4
@SpaceRox1244
Adds bullet collision to station lights (#34070)
e841e6e 
Adds collision with bullets to lights
@PJBot
Automatic changelog update
3f1f95f
@ArtisticRoomba
Make station anchor hitbox less insufferable (#34217)
5ebd355
@PJBot
Automatic changelog update
420631c
@ArtisticRoomba
Remove kessler and zombeteors gamemodes from the secret pool (#34051)
9d5661d 
* Remove kessler, zombeteors gameodes

* Probably should keep the protos in case an admin wants to torture players secretly

* address slart review
PJBot and others added 8 commits January 12, 2025 08:17
@PJBot
Automatic changelog update
ebb7f89
@justdie12
Bended radiator (#34251)
6d89d79
@PJBot
Automatic changelog update
88b2c0d
@ElectroJr
Remove Entity<T> data-fields (#34083)
87e570c
@PJB3005
Update submodule, .NET 9 (#34320)
58496b9
@Errant-4
Hotfix the randomly occurring DeleteAllThenGhost test failures (#33582)
cc4a697 
* clear mindrole on component shutdown

* let it go
@Errant-4 @slarticodefast
Role Types (#33420)
e7cd9bc 
* mindcomponent namespace

* wip MindRole stuff

* admin player tab

* mindroletype comment

* mindRolePrototype redesign

* broken param

* wip RoleType implementation

* basic role type switching for antags

* traitor fix

* fix AdminPanel update

* the renameningTM

* cleanup

* feature uncreeping

* roletypes on mind roles

* update MindComponent.RoleType when MindRoles change

* ghostrole configuration

* ghostrole config improvements

* live update of roleType on the character window

* logging stuff and notes

* remove thing no one asked for

* weh

* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* move roletypeprototype to its own file, minor note stuff

* remove Roletype.Created

* log stuff

* roletype setup for ghostroles and autotraitor reinforcements

* ghostrole type configs

* adjustable admin overlay

* cleanup

* fix this in its own PR

* silicon antagonist

* borg stuff

* mmi roletype handling

* spawnable borg roletype handling

* weh

* ghost role cleanup

* weh

* RoleEvent update

* polish

* log stuff

* admin overlay config

* ghostrolecomponent cleanup

* weh

* admin overlay code cleanup

* minor cleanup

* Obsolete MindRoleAddedEvent

* comment

* minor code cleanup

* MindOnDoGreeting fix

* Role update message

* fix duplicate job greeting for cyborgs

* fix emag job message dupe

* nicer-looking role type update

* crew aligned

* syndicate assault borg role fix

* fix test fail

* fix a merge mistake

* fix LoneOp role type

* Update Content.Client/Administration/AdminNameOverlay.cs

Co-authored-by: slarticodefast <[email protected]>

* Update Content.Shared/Roles/SharedRoleSystem.cs

Co-authored-by: slarticodefast <[email protected]>

* comment formatting

Co-authored-by: slarticodefast <[email protected]>

* change logging category

Co-authored-by: slarticodefast <[email protected]>

* fix a space

Co-authored-by: slarticodefast <[email protected]>

* use MindAddRoles

Co-authored-by: slarticodefast <[email protected]>

* get MindComponent from TryGetMind

Co-authored-by: slarticodefast <[email protected]>

* move var declaration outside loop

* remove TryComp

* take RoleEnum behind the barn

* don't use ensurecomp unnecessarily

* cvar comments

* toggleableghostrolecomponent documentation

* skrek

* use EntProtoId

* mindrole config

* merge baserolecomponent into basemindrolecomponent

* ai and borg silicon role tweaks

* formatting

Co-authored-by: slarticodefast <[email protected]>

* I will end you (the color)

Co-authored-by: slarticodefast <[email protected]>

* use LocId type for a locale id

* update RoleEvent documentation

* update RoleEvent documentation

* remove obsolete MindRoleAddedEvent

* refine MindRolesUpdate()

* use dependency

Co-authored-by: slarticodefast <[email protected]>

* inject dependency

Co-authored-by: slarticodefast <[email protected]>

* roleType.Name no longer required

* reformatted draw code logic

* GhostRoleMarkerRoleComponent comment

* minor SharedRoleSystem cleanup

* StartingMindRoleComponent, unhardcode roundstart silicon

* Update Content.Shared/Roles/SharedRoleSystem.cs

* remove a whitespace

---------

Co-authored-by: slarticodefast <[email protected]>
@PJBot
Automatic changelog update
7bf15d4
@deltanedas deltanedas requested review from a team as code owners January 12, 2025 08:49
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files labels Jan 12, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 12, 2025 •
edited
Loading

RSI Diff Bot; head commit 111724d merging into 5e225a6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Effects/fire_greyscale.rsi

State Old New Status
3 Modified

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster53_legit Modified

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
rainbowlizardplush-inhand-left Added
rainbowlizardplush-inhand-right Added
rainbowlizardplush Added

Resources/Textures/Objects/Misc/module.rsi

State Old New Status
cpu_syndicate Added

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
direction_pods Added

Edit: diff updated after 111724d

@deltanedas deltanedas requested a review from a team as a code owner January 12, 2025 09:01
@IamVelcroboy
Copy link
Member

We'll have to assess how indestructible tiles are used on some of the maps.

@deltanedas
Copy link
Member Author

from what ive seen theyre in the gas miners to prevent miners getting unanchored by anything + to connect ai sats so johnny the techie cant snip the ai off

@Lyndomen
Copy link
Contributor

24 hour direction review time, only thing i see is we might tweak vending machine ops

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.