upstream merge 12/01/25 #2709

deltanedas · 2025-01-12T08:49:44Z

About the PR

chameleon pda gaming
appraisal tool has a sound, made fake appraisal tool use it
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
dotnet 9

Media

incredible

Changelog
🆑

add: Merged last week's changes from upstream.

* 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

* 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

…interrupted (#34093) Initial commit

Make 3.png a PNG

* Remove Undesirable Laws * empty

* 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]>

…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]>

added pricegun sound Co-authored-by: dylanhunter <[email protected]>

* Update tables.yml * Remove Extra base: state_ * Update tables.yml

* 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

* 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

* fix rainbow plushie inhands * address requested changes * attribute sprites

@deltanedas

* 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]>

* 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]>

Adds collision with bullets to lights

* Remove kessler, zombeteors gameodes * Probably should keep the protos in case an admin wants to torture players secretly * address slart review

github-actions · 2025-01-12T08:50:20Z

RSI Diff Bot; head commit d19a1c1 merging into 7ca7d9c
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 d19a1c1

IamVelcroboy · 2025-01-12T15:27:10Z

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

deltanedas · 2025-01-12T23:17:27Z

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 · 2025-01-13T00:06:31Z

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

IamVelcroboy · 2025-01-13T15:37:32Z

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

Yeah, I guess I'm just wondering if using explosives to detach the AI should still be a valid strat since these tiles can't be exploded now?

Lyndomen · 2025-01-13T20:17:42Z

ok yeah real, only big one we ask is that for now, no indestructible tiles default mapped. if john techie snips ai, skill issue on sec+ai

deltanedas · 2025-01-13T21:10:43Z

theyre already unsnippable/rcd/pryable its just now it doesnt get blown up

CybersunOperative · 2025-01-14T06:13:24Z

this got approval from direction six hours ago but i forgor :(
anyways its good now!!! :3

sleepyyapril · 2025-01-14T06:25:11Z

.NET 9 causes this space-wizards/space-station-14#34418

deltanedas · 2025-01-14T14:10:19Z

its some pc skill issue if anyone has it they can give full logs and specs

github-actions · 2025-01-14T14:51:54Z

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

sleepyyapril · 2025-01-14T22:37:58Z

its some pc skill issue if anyone has it they can give full logs and specs

I have full logs, it doesn't say Anything. It's .NET 9

deltanedas · 2025-01-15T15:38:40Z

also waiting on space-wizards/RobustToolbox#5607 to be released

sleepyyapril · 2025-01-15T20:36:04Z

also waiting on space-wizards/RobustToolbox#5607 to be released

released

Alpaccalypse and others added 30 commits January 12, 2025 07:44

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

Automatic changelog update

bde90cc

Bugfix for the AI player's eye getting stuck when their broadcast is …

cd3d35b

…interrupted (#34093) Initial commit

Make JPEG a PNG (#34176)

600da77

Make 3.png a PNG

Removed Undesirable Ion Storm Verbs (#34175)

cfd53c4

* Remove Undesirable Laws * empty

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]>

Automatic changelog update

a31f82f

Added pricegun sound (#34119)

c8a77a1

added pricegun sound Co-authored-by: dylanhunter <[email protected]>

Automatic changelog update

dd555f2

Separate Tables n' Counters (#32673)

ab60e55

* Update tables.yml * Remove Extra base: state_ * Update tables.yml

Automatic changelog update

5a51573

Automatic changelog update

e2d5936

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

Automatic changelog update

7303437

update and clean up deltav pdas

0524813

Automatic changelog update

341bda0

Automatic changelog update

3a8d59a

Fix rainbow lizard plushie inhands (#34128)

174d8ce

* fix rainbow plushie inhands * address requested changes * attribute sprites

Automatic changelog update

7f13086

Automatic changelog update

17604f4

Adds bullet collision to station lights (#34070)

e841e6e

Adds collision with bullets to lights

Automatic changelog update

3f1f95f

Make station anchor hitbox less insufferable (#34217)

5ebd355

Automatic changelog update

420631c

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

github-actions bot added the Changes: Audio Changes any audio files label Jan 12, 2025

deltanedas added 2 commits January 12, 2025 08:57

remove FastAccessors from deep frier

8f9e62e

22ad62d

deltanedas requested a review from a team as a code owner January 12, 2025 09:01

deltanedas added 2 commits January 12, 2025 09:03

untroll footprint

ad05ba0

other fix

111724d

Lyndomen self-requested a review January 13, 2025 20:18

github-actions bot added the S: Merge Conflict Fix your PR! label Jan 14, 2025

merge master

fa50ae5

github-actions bot removed the S: Merge Conflict Fix your PR! label Jan 14, 2025

6ec871e

deltanedas force-pushed the upstream-ops branch from 4b3e62e to 6ec871e Compare January 15, 2025 15:26

deltanedas and others added 2 commits January 15, 2025 21:42

c541d7b

Update RT to v239.0.1 (#34454)

d19a1c1

deltanedas merged commit 5e6d099 into DeltaV-Station:master Jan 16, 2025
14 of 15 checks passed

deltanedas deleted the upstream-ops branch January 16, 2025 12:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upstream merge 12/01/25 #2709

upstream merge 12/01/25 #2709

deltanedas commented Jan 12, 2025 •

edited

Loading

github-actions bot commented Jan 12, 2025 •

edited

Loading

IamVelcroboy commented Jan 12, 2025

deltanedas commented Jan 12, 2025

Lyndomen commented Jan 13, 2025

IamVelcroboy commented Jan 13, 2025

Lyndomen commented Jan 13, 2025

deltanedas commented Jan 13, 2025

CybersunOperative commented Jan 14, 2025

sleepyyapril commented Jan 14, 2025

deltanedas commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

sleepyyapril commented Jan 14, 2025

deltanedas commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

upstream merge 12/01/25 #2709

upstream merge 12/01/25 #2709

Conversation

deltanedas commented Jan 12, 2025 • edited Loading

About the PR

Media

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

IamVelcroboy commented Jan 12, 2025

deltanedas commented Jan 12, 2025

Lyndomen commented Jan 13, 2025

IamVelcroboy commented Jan 13, 2025

Lyndomen commented Jan 13, 2025

deltanedas commented Jan 13, 2025

CybersunOperative commented Jan 14, 2025

sleepyyapril commented Jan 14, 2025

deltanedas commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

sleepyyapril commented Jan 14, 2025

deltanedas commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

deltanedas commented Jan 12, 2025 •

edited

Loading

github-actions bot commented Jan 12, 2025 •

edited

Loading