From c6739b2c89517361cd44ecdc0c1e82e9d8ad24a2 Mon Sep 17 00:00:00 2001
From: Mora <46364955+TrixxedHeart@users.noreply.github.com>
Date: Thu, 3 Jul 2025 18:49:27 -0500
Subject: [PATCH 001/214] Adjust uplink buy button to be under item icon
(#38596)
* Adjusted uplink buy button to be under item icon
* Put the discount subtext under the icon
* Indent fixes, added margin
---------
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
---
.../Store/Ui/StoreListingControl.xaml | 36 ++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index 3142f1cb06..b779672726 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -1,24 +1,28 @@
-
+
-
-
-
+
-
-
-
+
+
+
+
+
+
From 86488417143e04a606bcc96d714fe02aba900dc7 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Thu, 3 Jul 2025 23:50:33 +0000
Subject: [PATCH 002/214] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index cf05e28dbe..775ffdec30 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: lzk228
- changes:
- - message: Borgs, clowns and mimes now can choose a custom name in loadouts.
- type: Tweak
- id: 8222
- time: '2025-04-18T02:32:03.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/35170
- author: DogZeroX
changes:
- message: Added Experiment plushie from the game Scav Prototype!
@@ -3886,3 +3879,11 @@
id: 8733
time: '2025-07-03T18:51:40.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/38689
+- author: TrixxedHeart
+ changes:
+ - message: Moved Syndicate Uplink TC purchase button beneath the respective item's
+ icon.
+ type: Tweak
+ id: 8734
+ time: '2025-07-03T23:49:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/38596
From 35dfaa0ff7a87829464e1c4f4676e04ace1fc0ef Mon Sep 17 00:00:00 2001
From: Andrew Malcolm O'Neill <105134723+maland1@users.noreply.github.com>
Date: Fri, 4 Jul 2025 01:04:27 +0100
Subject: [PATCH 003/214] More guidebook fixes (#38699)
* First commit
- Resolving a few different pages, fixing typos and updating spellings and phrasing to be more coherent.
* More slight changes
* Reverting slightly the salvage page change
* Fixing Science wording inconsistency
* Few other small guidebook fixes
- Updating NukeOps page to properly refer to "Corpsman" rather than "Agent".
- Typo and slight wording change in Traitors.xml.
- Updating small typos in Antagonists.xml and Zombies.xml pages.
---
.../ServerInfo/Guidebook/Antagonist/Antagonists.xml | 2 +-
.../Guidebook/Antagonist/MinorAntagonists.xml | 8 +++++---
.../Guidebook/Antagonist/Nuclear Operatives.xml | 6 +++---
Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml | 4 ++--
Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml | 10 +++++-----
Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml | 4 ++--
Resources/ServerInfo/Guidebook/Cargo/Salvage.xml | 10 +++++-----
Resources/ServerInfo/Guidebook/Science/Robotics.xml | 6 +++---
.../Guidebook/Science/ScannersAndVessels.xml | 2 +-
Resources/ServerInfo/Guidebook/Science/Science.xml | 6 +++---
Resources/ServerInfo/Guidebook/Security/Defusal.xml | 2 +-
Resources/ServerInfo/Guidebook/Security/Forensics.xml | 8 ++++----
Resources/ServerInfo/Guidebook/Security/Security.xml | 2 +-
13 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
index 2572c906b0..4e6daf8ba2 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
@@ -8,7 +8,7 @@
## Various Antagonists
Antagonists can take many forms, like:
- - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and decieve.
+ - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and deceive.
- [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves.
- [textlink="Revolutionaries" link="Revolutionaries"] who are intent on taking control of the station from the inside.
- [textlink="Nuclear operatives" link="Nuclear Operatives"], with the goal of infiltrating and destroying the station.
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
index e051f1e9d1..52a7986963 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -1,7 +1,7 @@
# Minor Antagonists
- Most if not all Minor Antagonists are ghost-controlled roles that gives dead people new ways to cause chaos around the station. They are spawned by random events.
+ Minor Antagonists are ghost-controlled roles that give dead people a second chance to interact (and cause chaos!) around the station. They are spawned by random events.
# Paradox Clone
@@ -9,7 +9,9 @@
- A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart. They have no special abilities, but are have identical appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the orginal and who is the clone, unless you know your fellow crewmembers well.
+ A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart.
+
+They have no special abilities, but are identical in appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the original and who is the clone... unless you know your fellow crewmembers well!
# Revenant
@@ -70,5 +72,5 @@
Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see.
- Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
- - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
+ - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move through, but are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
index 11149bab66..83288140c1 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
@@ -16,16 +16,16 @@
## Operatives
Your team will be made up of several different roles, which are:
- [bold]Operatives[/bold], standard soldiers who can take up the grunt work.
- - The [bold]Agent[/bold] who works with reagents to make medicines or chemical weapons.
+ - The [bold]Corpsman[/bold] who works with reagents to make medicines or chemical weapons.
- The [bold]Commander[/bold] who draws up the plan and leads the team.
-
+
- If you have been selected as the Agent or Commander but don't feel ready, one of your teammates can take responsibility.
+ If you have been selected as the Corpsman or Commander but don't feel ready, one of your teammates can take over your responsibilities.
## The Disk
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 5943f52bbf..cc15d01feb 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -68,12 +68,12 @@
Alternatively, your objectives may require you to [italic][color=cyan]die a glorious death.[/color][/italic] [bold]Make sure you don't come back from the dead,[/bold] or else you may wake up in cuffs.
- ## Appropiation
+ ## Appropriation
More often than not, you'll have to [italic][color=cyan]steal a possession of a department head.[/color][/italic]
The target may be in their office, or on their person. It may become necessary to kill whoever is carrying it, if you cannot pickpocket them.
- You may be tasked with:
+ Some of the things you may be tasked with include:
- Stealing the [color=yellow]Captain[/color]'s [bold]ID Card[/bold], [bold]antique laser pistol[/bold], [bold]jetpack[/bold], or [bold]nuclear authentication disk[/bold].
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
index c932092a63..2d0056c21f 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
@@ -1,6 +1,6 @@
# Zombies
-
+
[color=#999999][italic]"They're coming to get you, Barbara!"[/italic][/color]
@@ -11,10 +11,10 @@
Zombies are conversion antagonists that infect all beings that they bite with [color=#7e916e]Romerol[/color], a deadly, contagious virus that can easily spread if not contained.
-
+
- ## Inital Infected
+ ## Initial Infected
You are patient zero. You have [color=#7e916e]Romerol[/color] coursing through your veins and you have a grand desire to share it with every single flesh being you see.
Upon learning of your infection, [italic]all bets are off[/italic]. You have only so much time before you turn, and you want to [bold]maximize your chances of taking over the station.[/bold]
@@ -43,10 +43,10 @@
If you're infected but not zombified yet, using [color=#86caf7]Ambuzol[/color] will cure you but won't prevent re-infection. [color=#1274b5]Ambuzol Plus[/color] will cure and prevent re-infection only while alive.
-
+
-
+
diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
index 7e74d5d796..e9fdebc805 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
@@ -23,11 +23,11 @@
- With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods. Most departments will give you what you need by asking for it with a Bounty Manifest.
+ With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods, but most departments will give you what you need if you ask for it with a Bounty Manifest.
Once you have collected the goods, return to the cargo bay and put the goods inside an empty [color=cyan]Crate[/color]. After everything is in the crate, close it, and then apply the Bounty Manifest to it.
- To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should say that it confirms that the bounty has been completed.
+ To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should show a confirmation that the bounty has been completed.
## Selling Bounties
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
index 9e9c3833f9..9cab9aced2 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
@@ -7,7 +7,7 @@
## Preparations
- Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will die before seeing any profits!
+ Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will likely die before seeing any profits!
@@ -15,7 +15,7 @@
- Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with something rather than nothing.
+ Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with your starting gear rather than nothing.
@@ -44,7 +44,7 @@
While you can technically mine and gather ore with just a PKA and a Backpack, Salvagers start with more specialized gear for the task.
- - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. Also, it works as a melee weapon!
+ - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. It also works as a handy melee weapon!
- [color=cyan]Ore Bag[/color]: When equipped in your belt slot, this magnetizes nearby ore and automatically picks it up for you.
@@ -109,7 +109,7 @@
- [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
+ [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc.) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
Debris is sprinkled with numerous threats. Bloodthirsty [color=red]Space Carp[/color] and [color=red]Sharkminnows[/color] infest them, eager to rush any Salvagers that come nearby. [color=red]Landmines[/color] are also rarely found aboard debris, capable of incapacitating the unwary explorer.
@@ -160,7 +160,7 @@
The [color=purple]Science Department[/color] is a crucial partner for Salvage. Science depends on Salvage for both basic materials (steel, plastic, glass) and advanced materials (silver, gold, plasma, and uranium), and Salvage relies on Science for the upgraded equipment that makes their work easier.
- Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice-versa.
+ Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice versa.
diff --git a/Resources/ServerInfo/Guidebook/Science/Robotics.xml b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
index 0244c1da42..599befc252 100644
--- a/Resources/ServerInfo/Guidebook/Science/Robotics.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
@@ -1,6 +1,6 @@
# Robotics
- The science team has the ability to create several unique types of robots to suit the station's needs. In order to begin, you'll want to research [color=#a4885c]Robotics[/color] technology.
+ The science team has the ability to create several unique types of robots to suit the station's needs. In order to begin, you'll want to research the [color=#a4885c]Robotics[/color] technology.
## Exosuit Fabricator
@@ -28,7 +28,7 @@
[color=#a4885c]Bots[/color] are small, simple automata which can perform simple tasks, such as cleaning. They don't use power cells, but are quite fragile. Making these will require parts which can be made at an exosuit fabricator.
- To make a bot, open the [color=#a4885c]Construction Menu[/color] and go to the "Utilities" category (or just search "bot") and you'll have the whole list of recipes. In order to assemble the bot, you must have the parts outlined by the recipe close to you and click [color=#a4885c]Build[/color], after a few seconds your newly created silicon servant should appear at your feet!
+ To make a bot, open the [color=#a4885c]Construction Menu[/color] and go to the "Utilities" category (or just search "bot") and you'll have the whole list of recipes. In order to assemble the bot, you must have the parts outlined by the recipe close to you and click [color=#a4885c]Build[/color], after a few seconds your newly created silicon servant should appear at your feet!
## Mechs
@@ -47,7 +47,7 @@
- For example, both of the circuit boards above are necessary to create a ripley mech, and cannot be used to make any other mech.
+ For example, both of the circuit boards above are necessary to create a Ripley mech, and cannot be used to make any other mech.
To start making a mech, print their harness in the fabricator and insert the limbs, you can [color=#a4885c]examine[/color] it to see how to proceed with construction once all limbs are in place.
- Every mech requires some combination of wires, tool usage, and their own unique circuit boards to construct after the chassis has been assembled. Most mechs have two or more unique circuit boards. For example, the [color=#a4885c]Ripley[/color] mech requires a [color=#a4885c]ripley controls module[/color] board and a [color=#a4885c]ripley peripherals module[/color] board.
diff --git a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
index d2662519cb..c42e28fc39 100644
--- a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
@@ -1,7 +1,7 @@
## Anomaly Scanner
-The Anomaly Scanner is used to gather various information on anomalies. They can be found inside of the lockers in the science department.
+The Anomaly Scanner is used to gather various information on anomalies. They can be found inside the lockers in the science department.
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index e3de7738c7..99bcd714cf 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -1,6 +1,6 @@
# Science
-[color=#c96dbf]Science[/color], often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station.
+[color=#c96dbf]Science[/color], often called Research and Development, is a job consisting of generating research points to unlock new technologies and using said technologies to produce new items at lathes to help out the station.
## Personnel
[color=#c96dbf]Science[/color]'s staff is made up of Research Assistants and Scientists. [color=#c96dbf]Science[/color] is run by the Research Director.
@@ -9,7 +9,7 @@
-
+
## Technologies
@@ -37,7 +37,7 @@ Each Discipline tree has up to 3 tiers of technologies. At the start the only ti
In order to progress further, you have to research up to [color=brown]75%[/color] of the current tier to move to the next one. So in order to unlock T2 researches you need to research 75% of T1.
-Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless... you find some other way around it, probably should ask your [color=purple]Research Director[/color].
+Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless you can find some other way around it... you should probably ask your [color=purple]Research Director[/color].
## Lathes
diff --git a/Resources/ServerInfo/Guidebook/Security/Defusal.xml b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
index 583b8a34c7..8ebd71a346 100644
--- a/Resources/ServerInfo/Guidebook/Security/Defusal.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
@@ -69,5 +69,5 @@
- [color=green]Mend the wire[/color]: Mending the wire will re-enable the bolts.
[color=#a4885c]Dummy Wire[/color]
- - Dummy wires don't do anything. You can pulse, cut, and mend them freely and they will not affect the bomb at all.
+ - Dummy wires don't do anything. You can pulse, cut, and mend them freely without affecting the bomb at all.
diff --git a/Resources/ServerInfo/Guidebook/Security/Forensics.xml b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
index 733969b5a6..936bf299c0 100644
--- a/Resources/ServerInfo/Guidebook/Security/Forensics.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
@@ -3,7 +3,7 @@
There are a lot of tools to help you gather and examine the evidence at your disposal
- # Log probe
+ # LogProbe
This little add-on to your PDA is incredibly useful, just install the cartridge and your PDA will acquire the ability to scan anything with access (like airlocks) and see who has used them recently.
@@ -26,11 +26,11 @@
So be careful before fighting with someone.
- Same scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crimescene.
+ That same forensic scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crime scene.
## I got DNA. How do I recognize whose it is?
- You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint is is.
+ You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint it is.
## Taking Fingerprints
It is also possible to take someone's fingerprints while on scene if you make them take off their gloves and apply a forensic pad to their fingers. No need to run back to [color=#a4885c]Station Records Computer[/color] to check if the butler did it!
@@ -38,7 +38,7 @@
## Fibers
- Whenenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
+ Whenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
There are up to [color=red]26[/color] different types of fibers possible. Can that stop you from solving the case?
diff --git a/Resources/ServerInfo/Guidebook/Security/Security.xml b/Resources/ServerInfo/Guidebook/Security/Security.xml
index 3df94c6b9b..452d75458f 100644
--- a/Resources/ServerInfo/Guidebook/Security/Security.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Security.xml
@@ -33,7 +33,7 @@ It is worth noting that flashes can be both used in a large area ([color=yellow]
## Lethals
-Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substancial fire against any who would stand against the station.
+Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substantial fire against any who would stand against the station.
From 22b2b0561a3a90f14840371bfca5fbe4b74d8ae0 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Fri, 4 Jul 2025 00:05:33 +0000
Subject: [PATCH 004/214] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 775ffdec30..815a1d9317 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: DogZeroX
- changes:
- - message: Added Experiment plushie from the game Scav Prototype!
- type: Add
- id: 8223
- time: '2025-04-18T02:38:34.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/36663
- author: slarticodefast
changes:
- message: Fire extinguishers and sprays now allow you to push the grids you are
@@ -3887,3 +3880,10 @@
id: 8734
time: '2025-07-03T23:49:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/38596
+- author: maland1
+ changes:
+ - message: Updating a number of guidebook pages to be more easily readable and accurate
+ type: Tweak
+ id: 8735
+ time: '2025-07-04T00:04:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/38699
From fba22e831d60402b49398b140763f11df0dd8f0d Mon Sep 17 00:00:00 2001
From: Minerva <218184747+mnva0@users.noreply.github.com>
Date: Fri, 4 Jul 2025 00:50:00 +0000
Subject: [PATCH 005/214] Fixes missing underwear FTLs (#38720)
---
.../Locale/en-US/markings/undergarment.ftl | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/Resources/Locale/en-US/markings/undergarment.ftl b/Resources/Locale/en-US/markings/undergarment.ftl
index 4e2c5c91fa..3740d0573d 100644
--- a/Resources/Locale/en-US/markings/undergarment.ftl
+++ b/Resources/Locale/en-US/markings/undergarment.ftl
@@ -1,21 +1,21 @@
-marking-UndergarmentTopTanktop-tanktop = Tanktop
-marking-UndergarmentTopBinder-binder = Binder
-marking-UndergarmentTopBra-classic = Classic Bra
-marking-UndergarmentTopSportsbra-sports = Sports Bra
+marking-UndergarmentTopTanktop = Tanktop
+marking-UndergarmentTopBinder = Binder
+marking-UndergarmentTopBra = Classic Bra
+marking-UndergarmentTopSportsbra = Sports Bra
-marking-UndergarmentBottomBoxers-boxers = Boxers
-marking-UndergarmentBottomBriefs-briefs = Briefs
-marking-UndergarmentBottomSatin-satin = Satin
+marking-UndergarmentBottomBoxers = Boxers
+marking-UndergarmentBottomBriefs = Briefs
+marking-UndergarmentBottomSatin = Satin
-marking-UndergarmentTopTanktopVox-tanktop_vox = Tanktop
-marking-UndergarmentTopBinderVox-binder_vox = Binder
-marking-UndergarmentTopBraVox-classic_vox = Classic Bra
-marking-UndergarmentTopSportsbraVox-sports_vox = Sports Bra
+marking-UndergarmentTopTanktopVox = Tanktop
+marking-UndergarmentTopBinderVox = Binder
+marking-UndergarmentTopBraVox = Classic Bra
+marking-UndergarmentTopSportsbraVox = Sports Bra
-marking-UndergarmentBottomBoxersVox-boxers_vox = Boxers
-marking-UndergarmentBottomBriefsVox-briefs_vox = Briefs
-marking-UndergarmentBottomSatinVox-satin_vox = Satin
+marking-UndergarmentBottomBoxersVox = Boxers
+marking-UndergarmentBottomBriefsVox = Briefs
+marking-UndergarmentBottomSatinVox = Satin
-marking-UndergarmentBottomBoxersReptilian-boxers_reptilian = Boxers
-marking-UndergarmentBottomBriefsReptilian-briefs_reptilian = Briefs
-marking-UndergarmentBottomSatinReptilian-satin_reptilian = Satin
+marking-UndergarmentBottomBoxersReptilian = Boxers
+marking-UndergarmentBottomBriefsReptilian = Briefs
+marking-UndergarmentBottomSatinReptilian = Satin
From 9186b65b14e1294552c3e10dcbc1eb5ffd974927 Mon Sep 17 00:00:00 2001
From: Tayrtahn
Date: Thu, 3 Jul 2025 21:11:31 -0400
Subject: [PATCH 006/214] Validate `ShaderPrototype` IDs (#38728)
* Convert all shader prototype string literals to protoids in overlays
* Convert more shader prototype literal strings to protoids
* Convert ValidatePrototypeId to ProtoId
* Later
---
Content.Benchmarks/SpawnEquipDeleteBenchmark.cs | 7 +++++--
Content.Client/Atmos/Overlays/GasTileOverlay.cs | 4 +++-
.../CombatMode/ColoredScreenBorderOverlay.cs | 4 +++-
Content.Client/Cooldown/CooldownGraphic.cs | 4 +++-
Content.Client/DoAfter/DoAfterOverlay.cs | 4 +++-
Content.Client/Drowsiness/DrowsinessOverlay.cs | 4 +++-
Content.Client/Drugs/RainbowOverlay.cs | 4 +++-
Content.Client/Drunk/DrunkOverlay.cs | 4 +++-
Content.Client/Explosion/ExplosionOverlay.cs | 4 +++-
Content.Client/Eye/Blinding/BlindOverlay.cs | 7 +++++--
Content.Client/Eye/Blinding/BlurryVisionOverlay.cs | 7 +++++--
Content.Client/Flash/FlashOverlay.cs | 4 +++-
.../Components/InteractionOutlineComponent.cs | 11 ++++-------
Content.Client/Interaction/DragDropSystem.cs | 14 ++++++--------
Content.Client/Light/AmbientOcclusionOverlay.cs | 12 ++++++++----
Content.Client/Light/SunShadowOverlay.cs | 4 +++-
Content.Client/Mapping/MappingOverlay.cs | 4 +++-
.../Movement/Systems/FloorOcclusionSystem.cs | 4 +++-
Content.Client/Outline/TargetOutlineSystem.cs | 13 +++++--------
Content.Client/Overlays/BlackAndWhiteOverlay.cs | 4 +++-
Content.Client/Overlays/NoirOverlay.cs | 4 +++-
.../Overlays/StencilOverlay.RestrictedRange.cs | 4 ++--
Content.Client/Overlays/StencilOverlay.Weather.cs | 4 ++--
Content.Client/Overlays/StencilOverlay.cs | 6 +++++-
Content.Client/Paper/UI/StampLabel.xaml.cs | 4 +++-
Content.Client/Paper/UI/StampWidget.xaml.cs | 4 +++-
.../UI/ParticleAcceleratorControlMenu.xaml.cs | 3 ++-
Content.Client/Popups/PopupOverlay.cs | 4 +++-
.../Radiation/Overlays/RadiationPulseOverlay.cs | 4 +++-
Content.Client/Shuttles/FtlArrivalOverlay.cs | 4 +++-
.../Silicons/StationAi/StationAiOverlay.cs | 10 +++++++---
Content.Client/Singularity/SingularityOverlay.cs | 4 +++-
Content.Client/StatusIcon/StatusIconOverlay.cs | 4 +++-
Content.Client/Stealth/StealthSystem.cs | 4 +++-
.../UI/SurveillanceCameraMonitorWindow.xaml.cs | 4 +++-
.../DamageOverlays/Overlays/DamageOverlay.cs | 8 +++++---
36 files changed, 130 insertions(+), 68 deletions(-)
diff --git a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
index 0638d945aa..9b878eac40 100644
--- a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
+++ b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
@@ -8,6 +8,7 @@ using Robust.Shared;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
namespace Content.Benchmarks;
@@ -18,9 +19,11 @@ namespace Content.Benchmarks;
[Virtual, MemoryDiagnoser]
public class SpawnEquipDeleteBenchmark
{
+ private static readonly EntProtoId Mob = "MobHuman";
+ private static readonly ProtoId CaptainStartingGear = "CaptainGear";
+
private TestPair _pair = default!;
private StationSpawningSystem _spawnSys = default!;
- private const string Mob = "MobHuman";
private StartingGearPrototype _gear = default!;
private EntityUid _entity;
private EntityCoordinates _coords;
@@ -39,7 +42,7 @@ public class SpawnEquipDeleteBenchmark
var mapData = await _pair.CreateTestMap();
_coords = mapData.GridCoords;
_spawnSys = server.System();
- _gear = server.ProtoMan.Index("CaptainGear");
+ _gear = server.ProtoMan.Index(CaptainStartingGear);
}
[GlobalCleanup]
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index cdbcb5b3f6..d91cc29e4c 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -19,6 +19,8 @@ namespace Content.Client.Atmos.Overlays
{
public sealed class GasTileOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
private readonly IEntityManager _entManager;
private readonly IMapManager _mapManager;
private readonly SharedMapSystem _mapSystem;
@@ -54,7 +56,7 @@ namespace Content.Client.Atmos.Overlays
_mapManager = IoCManager.Resolve();
_mapSystem = entManager.System();
_xformSys = xformSys;
- _shader = protoMan.Index("unshaded").Instance();
+ _shader = protoMan.Index(UnshadedShader).Instance();
ZIndex = GasOverlayZIndex;
_gasCount = system.VisibleGasId.Length;
diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index 9ca94fc3b4..749a6839b6 100644
--- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -8,6 +8,8 @@ namespace Content.Client.CombatMode
{
public sealed class ColoredScreenBorderOverlay : Overlay
{
+ private static readonly ProtoId Shader = "ColoredScreenBorder";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -16,7 +18,7 @@ namespace Content.Client.CombatMode
public ColoredScreenBorderOverlay()
{
IoCManager.InjectDependencies(this);
- _shader = _prototypeManager.Index("ColoredScreenBorder").Instance();
+ _shader = _prototypeManager.Index(Shader).Instance();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index 25063f8133..6779e4027a 100644
--- a/Content.Client/Cooldown/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -7,6 +7,8 @@ namespace Content.Client.Cooldown
{
public sealed class CooldownGraphic : Control
{
+ private static readonly ProtoId Shader = "CooldownAnimation";
+
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
@@ -15,7 +17,7 @@ namespace Content.Client.Cooldown
public CooldownGraphic()
{
IoCManager.InjectDependencies(this);
- _shader = _protoMan.Index("CooldownAnimation").InstanceUnique();
+ _shader = _protoMan.Index(Shader).InstanceUnique();
}
///
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 6ecd758461..761584e06e 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.DoAfter;
public sealed class DoAfterOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
private readonly IEntityManager _entManager;
private readonly IGameTiming _timing;
private readonly IPlayerManager _player;
@@ -50,7 +52,7 @@ public sealed class DoAfterOverlay : Overlay
var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
_barTexture = _entManager.EntitySysManager.GetEntitySystem().Frame0(sprite);
- _unshadedShader = protoManager.Index("unshaded").Instance();
+ _unshadedShader = protoManager.Index(UnshadedShader).Instance();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
index 1687216b3e..9c47ec2fbe 100644
--- a/Content.Client/Drowsiness/DrowsinessOverlay.cs
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Drowsiness;
public sealed class DrowsinessOverlay : Overlay
{
+ private static readonly ProtoId Shader = "Drowsiness";
+
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -33,7 +35,7 @@ public sealed class DrowsinessOverlay : Overlay
_statusEffects = _sysMan.GetEntitySystem();
- _drowsinessShader = _prototypeManager.Index("Drowsiness").InstanceUnique();
+ _drowsinessShader = _prototypeManager.Index(Shader).InstanceUnique();
}
protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index bfb3815649..a2a431feb6 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -12,6 +12,8 @@ namespace Content.Client.Drugs;
public sealed class RainbowOverlay : Overlay
{
+ private static readonly ProtoId Shader = "Rainbow";
+
[Dependency] private readonly IConfigurationManager _config = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -41,7 +43,7 @@ public sealed class RainbowOverlay : Overlay
_statusEffects = _sysMan.GetEntitySystem();
- _rainbowShader = _prototypeManager.Index("Rainbow").InstanceUnique();
+ _rainbowShader = _prototypeManager.Index(Shader).InstanceUnique();
_config.OnValueChanged(CCVars.ReducedMotion, OnReducedMotionChanged, invokeImmediately: true);
}
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index e01719e62c..1f26e75ffc 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Drunk;
public sealed class DrunkOverlay : Overlay
{
+ private static readonly ProtoId Shader = "Drunk";
+
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -30,7 +32,7 @@ public sealed class DrunkOverlay : Overlay
public DrunkOverlay()
{
IoCManager.InjectDependencies(this);
- _drunkShader = _prototypeManager.Index("Drunk").InstanceUnique();
+ _drunkShader = _prototypeManager.Index(Shader).InstanceUnique();
}
protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index a005d0317b..18cb8f647a 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Explosion;
[UsedImplicitly]
public sealed class ExplosionOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
@@ -26,7 +28,7 @@ public sealed class ExplosionOverlay : Overlay
public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
{
IoCManager.InjectDependencies(this);
- _shader = _proto.Index("unshaded").Instance();
+ _shader = _proto.Index(UnshadedShader).Instance();
_transformSystem = _entMan.System();
_appearance = appearanceSystem;
}
diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs
index 1949b170ab..906f9c954c 100644
--- a/Content.Client/Eye/Blinding/BlindOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlindOverlay.cs
@@ -12,6 +12,9 @@ namespace Content.Client.Eye.Blinding
{
public sealed class BlindOverlay : Overlay
{
+ private static readonly ProtoId GreyscaleShader = "GreyscaleFullscreen";
+ private static readonly ProtoId CircleShader = "CircleMask";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
@@ -27,8 +30,8 @@ namespace Content.Client.Eye.Blinding
public BlindOverlay()
{
IoCManager.InjectDependencies(this);
- _greyscaleShader = _prototypeManager.Index("GreyscaleFullscreen").InstanceUnique();
- _circleMaskShader = _prototypeManager.Index("CircleMask").InstanceUnique();
+ _greyscaleShader = _prototypeManager.Index(GreyscaleShader).InstanceUnique();
+ _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)
{
diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
index b56b091309..dccdac2758 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
@@ -10,6 +10,9 @@ namespace Content.Client.Eye.Blinding
{
public sealed class BlurryVisionOverlay : Overlay
{
+ private static readonly ProtoId CataractsShader = "Cataracts";
+ private static readonly ProtoId CircleShader = "CircleMask";
+
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -33,8 +36,8 @@ namespace Content.Client.Eye.Blinding
public BlurryVisionOverlay()
{
IoCManager.InjectDependencies(this);
- _cataractsShader = _prototypeManager.Index("Cataracts").InstanceUnique();
- _circleMaskShader = _prototypeManager.Index("CircleMask").InstanceUnique();
+ _cataractsShader = _prototypeManager.Index(CataractsShader).InstanceUnique();
+ _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
_circleMaskShader.SetParameter("CircleMinDist", 0.0f);
_circleMaskShader.SetParameter("CirclePow", NoMotion_Pow);
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 8e41c382dd..824efb78f3 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Flash
{
public sealed class FlashOverlay : Overlay
{
+ private static readonly ProtoId FlashedEffectShader = "FlashedEffect";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -27,7 +29,7 @@ namespace Content.Client.Flash
public FlashOverlay()
{
IoCManager.InjectDependencies(this);
- _shader = _prototypeManager.Index("FlashedEffect").InstanceUnique();
+ _shader = _prototypeManager.Index(FlashedEffectShader).InstanceUnique();
_flash = _entityManager.System();
_statusSys = _entityManager.System();
}
diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
index 9803920257..8d1d8cd07d 100644
--- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
+++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
@@ -7,17 +7,14 @@ namespace Content.Client.Interactable.Components
[RegisterComponent]
public sealed partial class InteractionOutlineComponent : Component
{
+ private static readonly ProtoId ShaderInRange = "SelectionOutlineInrange";
+ private static readonly ProtoId ShaderOutOfRange = "SelectionOutline";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
private const float DefaultWidth = 1;
- [ValidatePrototypeId]
- private const string ShaderInRange = "SelectionOutlineInrange";
-
- [ValidatePrototypeId]
- private const string ShaderOutOfRange = "SelectionOutline";
-
private bool _inRange;
private ShaderInstance? _shader;
private int _lastRenderScale;
@@ -65,7 +62,7 @@ namespace Content.Client.Interactable.Components
{
var shaderName = inRange ? ShaderInRange : ShaderOutOfRange;
- var instance = _prototypeManager.Index(shaderName).InstanceUnique();
+ var instance = _prototypeManager.Index(shaderName).InstanceUnique();
instance.SetParameter("outline_width", DefaultWidth * renderScale);
return instance;
}
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index fe23866535..a1af9f9e20 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -29,6 +29,10 @@ namespace Content.Client.Interaction;
///
public sealed class DragDropSystem : SharedDragDropSystem
{
+ private static readonly ProtoId ShaderDropTargetInRange = "SelectionOutlineInrange";
+
+ private static readonly ProtoId ShaderDropTargetOutOfRange = "SelectionOutline";
+
[Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
@@ -54,12 +58,6 @@ public sealed class DragDropSystem : SharedDragDropSystem
// mousedown event so it can be treated like a regular click
private const float MaxMouseDownTimeForReplayingClick = 0.85f;
- [ValidatePrototypeId]
- private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
-
- [ValidatePrototypeId]
- private const string ShaderDropTargetOutOfRange = "SelectionOutline";
-
///
/// Current entity being dragged around.
///
@@ -113,8 +111,8 @@ public sealed class DragDropSystem : SharedDragDropSystem
Subs.CVar(_cfgMan, CCVars.DragDropDeadZone, SetDeadZone, true);
- _dropTargetInRangeShader = _prototypeManager.Index(ShaderDropTargetInRange).Instance();
- _dropTargetOutOfRangeShader = _prototypeManager.Index(ShaderDropTargetOutOfRange).Instance();
+ _dropTargetInRangeShader = _prototypeManager.Index(ShaderDropTargetInRange).Instance();
+ _dropTargetOutOfRangeShader = _prototypeManager.Index(ShaderDropTargetOutOfRange).Instance();
// needs to fire on mouseup and mousedown so we can detect a drag / drop
CommandBinds.Builder
.BindBefore(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false, true), new[] { typeof(SharedInteractionSystem) })
diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs
index f771dbe9fc..4caf654494 100644
--- a/Content.Client/Light/AmbientOcclusionOverlay.cs
+++ b/Content.Client/Light/AmbientOcclusionOverlay.cs
@@ -15,6 +15,10 @@ namespace Content.Client.Light;
///
public sealed class AmbientOcclusionOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+ private static readonly ProtoId StencilMaskShader = "StencilMask";
+ private static readonly ProtoId StencilEqualDrawShader = "StencilEqualDraw";
+
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IConfigurationManager _cfgManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
@@ -87,7 +91,7 @@ public sealed class AmbientOcclusionOverlay : Overlay
args.WorldHandle.RenderInRenderTarget(_aoTarget,
() =>
{
- worldHandle.UseShader(_proto.Index("unshaded").Instance());
+ worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
var invMatrix = _aoTarget.GetWorldToLocalMatrix(viewport.Eye!, scale);
foreach (var entry in query.QueryAabb(mapId, worldBounds))
@@ -110,7 +114,7 @@ public sealed class AmbientOcclusionOverlay : Overlay
() =>
{
// Don't want lighting affecting it.
- worldHandle.UseShader(_proto.Index("unshaded").Instance());
+ worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
foreach (var grid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
{
@@ -131,11 +135,11 @@ public sealed class AmbientOcclusionOverlay : Overlay
}, Color.Transparent);
// Draw the stencil texture to depth buffer.
- worldHandle.UseShader(_proto.Index("StencilMask").Instance());
+ worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
worldHandle.DrawTextureRect(_aoStencilTarget!.Texture, worldBounds);
// Draw the Blurred AO texture finally.
- worldHandle.UseShader(_proto.Index("StencilEqualDraw").Instance());
+ worldHandle.UseShader(_proto.Index(StencilEqualDrawShader).Instance());
worldHandle.DrawTextureRect(_aoTarget!.Texture, worldBounds, color);
args.WorldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs
index a296f95479..f30f4c0409 100644
--- a/Content.Client/Light/SunShadowOverlay.cs
+++ b/Content.Client/Light/SunShadowOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Light;
public sealed class SunShadowOverlay : Overlay
{
+ private static readonly ProtoId MixShader = "Mix";
+
public override OverlaySpace Space => OverlaySpace.BeforeLighting;
[Dependency] private readonly IClyde _clyde = default!;
@@ -150,7 +152,7 @@ public sealed class SunShadowOverlay : Overlay
viewport.LightRenderTarget.GetWorldToLocalMatrix(eye, scale);
worldHandle.SetTransform(invMatrix);
- var maskShader = _protoManager.Index("Mix").Instance();
+ var maskShader = _protoManager.Index(MixShader).Instance();
worldHandle.UseShader(maskShader);
worldHandle.DrawTextureRect(_target.Texture, worldBounds, Color.Black.WithAlpha(alpha));
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index ed44b43d52..e461440996 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Mapping;
public sealed class MappingOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
[Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -35,7 +37,7 @@ public sealed class MappingOverlay : Overlay
_sprite = _entities.System();
_state = state;
- _shader = _prototypes.Index("unshaded").Instance();
+ _shader = _prototypes.Index(UnshadedShader).Instance();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 44573f8e08..6520d98ac9 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Client.Movement.Systems;
public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
{
+ private static readonly ProtoId HorizontalCut = "HorizontalCut";
+
[Dependency] private readonly IPrototypeManager _proto = default!;
private EntityQuery _spriteQuery;
@@ -48,7 +50,7 @@ public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
if (!_spriteQuery.Resolve(sprite.Owner, ref sprite.Comp, false))
return;
- var shader = _proto.Index("HorizontalCut").Instance();
+ var shader = _proto.Index(HorizontalCut).Instance();
if (sprite.Comp.PostShader is not null && sprite.Comp.PostShader != shader)
return;
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 0d9b9787ae..73d45a17a9 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -15,6 +15,9 @@ namespace Content.Client.Outline;
///
public sealed class TargetOutlineSystem : EntitySystem
{
+ private static readonly ProtoId ShaderTargetValid = "SelectionOutlineInrange";
+ private static readonly ProtoId ShaderTargetInvalid = "SelectionOutline";
+
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -70,12 +73,6 @@ public sealed class TargetOutlineSystem : EntitySystem
private Vector2 LookupVector => new(LookupSize, LookupSize);
- [ValidatePrototypeId]
- private const string ShaderTargetValid = "SelectionOutlineInrange";
-
- [ValidatePrototypeId]
- private const string ShaderTargetInvalid = "SelectionOutline";
-
private ShaderInstance? _shaderTargetValid;
private ShaderInstance? _shaderTargetInvalid;
@@ -85,8 +82,8 @@ public sealed class TargetOutlineSystem : EntitySystem
{
base.Initialize();
- _shaderTargetValid = _prototypeManager.Index(ShaderTargetValid).InstanceUnique();
- _shaderTargetInvalid = _prototypeManager.Index(ShaderTargetInvalid).InstanceUnique();
+ _shaderTargetValid = _prototypeManager.Index(ShaderTargetValid).InstanceUnique();
+ _shaderTargetInvalid = _prototypeManager.Index(ShaderTargetInvalid).InstanceUnique();
}
public void Disable()
diff --git a/Content.Client/Overlays/BlackAndWhiteOverlay.cs b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
index 785d1dad7f..251a9534a2 100644
--- a/Content.Client/Overlays/BlackAndWhiteOverlay.cs
+++ b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
public sealed partial class BlackAndWhiteOverlay : Overlay
{
+ private static readonly ProtoId Shader = "GreyscaleFullscreen";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class BlackAndWhiteOverlay : Overlay
public BlackAndWhiteOverlay()
{
IoCManager.InjectDependencies(this);
- _greyscaleShader = _prototypeManager.Index("GreyscaleFullscreen").InstanceUnique();
+ _greyscaleShader = _prototypeManager.Index(Shader).InstanceUnique();
ZIndex = 10; // draw this over the DamageOverlay, RainbowOverlay etc.
}
diff --git a/Content.Client/Overlays/NoirOverlay.cs b/Content.Client/Overlays/NoirOverlay.cs
index d2a6cbe8b3..f9e468f995 100644
--- a/Content.Client/Overlays/NoirOverlay.cs
+++ b/Content.Client/Overlays/NoirOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
public sealed partial class NoirOverlay : Overlay
{
+ private static readonly ProtoId Shader = "Noir";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class NoirOverlay : Overlay
public NoirOverlay()
{
IoCManager.InjectDependencies(this);
- _noirShader = _prototypeManager.Index("Noir").InstanceUnique();
+ _noirShader = _prototypeManager.Index(Shader).InstanceUnique();
ZIndex = 9; // draw this over the DamageOverlay, RainbowOverlay etc, but before the black and white shader
}
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index d29564caa9..a5efacc16c 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -45,13 +45,13 @@ public sealed partial class StencilOverlay
}, Color.Transparent);
worldHandle.SetTransform(Matrix3x2.Identity);
- worldHandle.UseShader(_protoManager.Index("StencilMask").Instance());
+ worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
var curTime = _timing.RealTime;
var sprite = _sprite.GetFrame(new SpriteSpecifier.Texture(new ResPath("/Textures/Parallaxes/noise.png")), curTime);
// Draw the rain
- worldHandle.UseShader(_protoManager.Index("StencilDraw").Instance());
+ worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
_parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, new Vector2(0.5f, 0f));
}
}
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index b1a521433a..509b946ad4 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -55,13 +55,13 @@ public sealed partial class StencilOverlay
}, Color.Transparent);
worldHandle.SetTransform(Matrix3x2.Identity);
- worldHandle.UseShader(_protoManager.Index("StencilMask").Instance());
+ worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
var curTime = _timing.RealTime;
var sprite = _sprite.GetFrame(weatherProto.Sprite, curTime);
// Draw the rain
- worldHandle.UseShader(_protoManager.Index("StencilDraw").Instance());
+ worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
_parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, Vector2.Zero, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha));
worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index e8461ae5a3..0796be08e1 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -17,6 +17,10 @@ namespace Content.Client.Overlays;
///
public sealed partial class StencilOverlay : Overlay
{
+ private static readonly ProtoId CircleShader = "WorldGradientCircle";
+ private static readonly ProtoId StencilMask = "StencilMask";
+ private static readonly ProtoId StencilDraw = "StencilDraw";
+
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
@@ -43,7 +47,7 @@ public sealed partial class StencilOverlay : Overlay
_sprite = sprite;
_weather = weather;
IoCManager.InjectDependencies(this);
- _shader = _protoManager.Index("WorldGradientCircle").InstanceUnique();
+ _shader = _protoManager.Index(CircleShader).InstanceUnique();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Paper/UI/StampLabel.xaml.cs b/Content.Client/Paper/UI/StampLabel.xaml.cs
index be6d52baea..1750110c4c 100644
--- a/Content.Client/Paper/UI/StampLabel.xaml.cs
+++ b/Content.Client/Paper/UI/StampLabel.xaml.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Paper.UI;
[GenerateTypedNameReferences]
public sealed partial class StampLabel : Label
{
+ private static readonly ProtoId PaperStamp = "PaperStamp";
+
/// A scale that's applied to the text to ensure it
/// fits in the allowed space.
private Vector2 _textScaling = Vector2.One;
@@ -26,7 +28,7 @@ public sealed partial class StampLabel : Label
RobustXamlLoader.Load(this);
var prototypes = IoCManager.Resolve();
- _stampShader = prototypes.Index("PaperStamp").InstanceUnique();
+ _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
}
protected override Vector2 MeasureOverride(Vector2 availableSize)
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index 487e0732b4..a462d40e69 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -12,6 +12,8 @@ namespace Content.Client.Paper.UI;
[GenerateTypedNameReferences]
public sealed partial class StampWidget : PanelContainer
{
+ private static readonly ProtoId PaperStamp = "PaperStamp";
+
private StyleBoxTexture _borderTexture;
private ShaderInstance? _stampShader;
@@ -42,7 +44,7 @@ public sealed partial class StampWidget : PanelContainer
PanelOverride = _borderTexture;
var prototypes = IoCManager.Resolve();
- _stampShader = prototypes.Index("PaperStamp").InstanceUnique();
+ _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
}
protected override void Draw(DrawingHandleScreen handle)
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
index cc5016c4a7..27a585119e 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
@@ -262,6 +262,7 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow
public sealed class PASegmentControl : Control
{
+ private static readonly ProtoId GreyscaleShaderId = "Greyscale";
private readonly ShaderInstance _greyScaleShader;
private readonly TextureRect _base;
private readonly TextureRect _unlit;
@@ -272,7 +273,7 @@ public sealed class PASegmentControl : Control
public PASegmentControl()
{
- _greyScaleShader = IoCManager.Resolve().Index("Greyscale").Instance();
+ _greyScaleShader = IoCManager.Resolve().Index(GreyscaleShaderId).Instance();
AddChild(_base = new TextureRect());
AddChild(_unlit = new TextureRect());
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index cf22c8bbd5..3b3e9cd463 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -16,6 +16,8 @@ namespace Content.Client.Popups;
///
public sealed class PopupOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
private readonly IConfigurationManager _configManager;
private readonly IEntityManager _entManager;
private readonly IPlayerManager _playerMgr;
@@ -48,7 +50,7 @@ public sealed class PopupOverlay : Overlay
_popup = popup;
_controller = controller;
- _shader = protoManager.Index("unshaded").Instance();
+ _shader = protoManager.Index(UnshadedShader).Instance();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index d6e36dd0ad..4cbeaa52f5 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Radiation.Overlays
{
public sealed class RadiationPulseOverlay : Overlay
{
+ private static readonly ProtoId RadiationShader = "Radiation";
+
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -29,7 +31,7 @@ namespace Content.Client.Radiation.Overlays
public RadiationPulseOverlay()
{
IoCManager.InjectDependencies(this);
- _baseShader = _prototypeManager.Index("Radiation").Instance().Duplicate();
+ _baseShader = _prototypeManager.Index(RadiationShader).Instance().Duplicate();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs
index f24a1e9648..185d26f333 100644
--- a/Content.Client/Shuttles/FtlArrivalOverlay.cs
+++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.Shuttles;
///
public sealed class FtlArrivalOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
private EntityLookupSystem _lookups;
@@ -36,7 +38,7 @@ public sealed class FtlArrivalOverlay : Overlay
_maps = _entManager.System();
_sprites = _entManager.System();
- _shader = _protos.Index("unshaded").Instance();
+ _shader = _protos.Index(UnshadedShader).Instance();
}
protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
index 15a8a3a63f..5c84ce0c93 100644
--- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -12,6 +12,10 @@ namespace Content.Client.Silicons.StationAi;
public sealed class StationAiOverlay : Overlay
{
+ private static readonly ProtoId CameraStaticShader = "CameraStatic";
+ private static readonly ProtoId StencilMaskShader = "StencilMask";
+ private static readonly ProtoId StencilDrawShader = "StencilDraw";
+
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
@@ -91,7 +95,7 @@ public sealed class StationAiOverlay : Overlay
() =>
{
worldHandle.SetTransform(invMatrix);
- var shader = _proto.Index("CameraStatic").Instance();
+ var shader = _proto.Index(CameraStaticShader).Instance();
worldHandle.UseShader(shader);
worldHandle.DrawRect(worldBounds, Color.White);
},
@@ -114,11 +118,11 @@ public sealed class StationAiOverlay : Overlay
}
// Use the lighting as a mask
- worldHandle.UseShader(_proto.Index("StencilMask").Instance());
+ worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
worldHandle.DrawTextureRect(_stencilTexture!.Texture, worldBounds);
// Draw the static
- worldHandle.UseShader(_proto.Index("StencilDraw").Instance());
+ worldHandle.UseShader(_proto.Index(StencilDrawShader).Instance());
worldHandle.DrawTextureRect(_staticTexture!.Texture, worldBounds);
worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index e71b6e96b8..39b0758bf1 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -9,6 +9,8 @@ namespace Content.Client.Singularity
{
public sealed class SingularityOverlay : Overlay, IEntityEventSubscriber
{
+ private static readonly ProtoId Shader = "Singularity";
+
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private SharedTransformSystem? _xformSystem = null;
@@ -29,7 +31,7 @@ namespace Content.Client.Singularity
public SingularityOverlay()
{
IoCManager.InjectDependencies(this);
- _shader = _prototypeManager.Index("Singularity").Instance().Duplicate();
+ _shader = _prototypeManager.Index(Shader).Instance().Duplicate();
_shader.SetParameter("maxDistance", MaxDistance * EyeManager.PixelsPerMeter);
_entMan.EventBus.SubscribeEvent(EventSource.Local, this, OnProjectFromScreenToMap);
ZIndex = 101; // Should be drawn after the placement overlay so admins placing items near the singularity can tell where they're going.
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index aff450e657..4d3be5439c 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.StatusIcon;
public sealed class StatusIconOverlay : Overlay
{
+ private static readonly ProtoId UnshadedShader = "unshaded";
+
[Dependency] private readonly IEntityManager _entity = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IGameTiming _timing = default!;
@@ -29,7 +31,7 @@ public sealed class StatusIconOverlay : Overlay
_sprite = _entity.System();
_transform = _entity.System();
_statusIcon = _entity.System();
- _unshadedShader = _prototype.Index("unshaded").Instance();
+ _unshadedShader = _prototype.Index(UnshadedShader).Instance();
}
protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs
index 940f8f154d..5810b9bc85 100644
--- a/Content.Client/Stealth/StealthSystem.cs
+++ b/Content.Client/Stealth/StealthSystem.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Stealth;
public sealed class StealthSystem : SharedStealthSystem
{
+ private static readonly ProtoId Shader = "Stealth";
+
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
@@ -20,7 +22,7 @@ public sealed class StealthSystem : SharedStealthSystem
{
base.Initialize();
- _shader = _protoMan.Index("Stealth").InstanceUnique();
+ _shader = _protoMan.Index(Shader).InstanceUnique();
SubscribeLocalEvent(OnShutdown);
SubscribeLocalEvent(OnStartup);
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index 0fbaf858da..ac82fbff59 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -17,6 +17,8 @@ namespace Content.Client.SurveillanceCamera.UI;
[GenerateTypedNameReferences]
public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
{
+ private static readonly ProtoId CameraStaticShader = "CameraStatic";
+
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
@@ -53,7 +55,7 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow
// This could be done better. I don't want to deal with stylesheets at the moment.
var texture = _resourceCache.GetTexture("/Textures/Interface/Nano/square_black.png");
- var shader = _prototypeManager.Index("CameraStatic").Instance().Duplicate();
+ var shader = _prototypeManager.Index(CameraStaticShader).Instance().Duplicate();
CameraView.ViewportSize = new Vector2i(500, 500);
CameraView.Eye = _defaultEye; // sure
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index de70fe16f8..3eef88f19b 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -9,6 +9,8 @@ namespace Content.Client.UserInterface.Systems.DamageOverlays.Overlays;
public sealed class DamageOverlay : Overlay
{
+ private static readonly ProtoId CircleMaskShader = "GradientCircleMask";
+
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
@@ -49,9 +51,9 @@ public sealed class DamageOverlay : Overlay
{
// TODO: Replace
IoCManager.InjectDependencies(this);
- _oxygenShader = _prototypeManager.Index("GradientCircleMask").InstanceUnique();
- _critShader = _prototypeManager.Index("GradientCircleMask").InstanceUnique();
- _bruteShader = _prototypeManager.Index("GradientCircleMask").InstanceUnique();
+ _oxygenShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+ _critShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+ _bruteShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
}
protected override void Draw(in OverlayDrawArgs args)
From 71d839fec4818453c7ab2a8f04a928fe8bbeee31 Mon Sep 17 00:00:00 2001
From: Tiniest Shark
Date: Thu, 3 Jul 2025 22:02:35 -0400
Subject: [PATCH 007/214] Janitor Tool: Wire Brush (#38667)
* Wow! It's -brush-
* spacing.
* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fixed changes
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
Resources/Audio/Items/attributions.yml | 5 +++
Resources/Audio/Items/wirebrushing.ogg | Bin 0 -> 19141 bytes
.../Locale/en-US/tools/tool-qualities.ftl | 5 ++-
.../Catalog/Fills/Crates/service.yml | 4 +-
.../Prototypes/Catalog/Fills/Items/belt.yml | 1 +
.../Catalog/Fills/Lockers/service.yml | 2 +
.../Entities/Clothing/Belt/belts.yml | 1 +
.../Objects/Specific/Janitorial/janitor.yml | 36 ++++++++++++++++++
.../Construction/Graphs/structures/girder.yml | 8 ++++
.../Recipes/Lathes/Packs/service.yml | 1 +
.../Prototypes/Recipes/Lathes/janitorial.yml | 8 ++++
Resources/Prototypes/tags.yml | 3 ++
Resources/Prototypes/tool_qualities.yml | 7 ++++
.../Guidebook/Service/Janitorial.xml | 1 +
.../Janitorial/wirebrush.rsi/icon.png | Bin 0 -> 546 bytes
.../Janitorial/wirebrush.rsi/inhand-left.png | Bin 0 -> 511 bytes
.../Janitorial/wirebrush.rsi/inhand-right.png | Bin 0 -> 509 bytes
.../Janitorial/wirebrush.rsi/meta.json | 25 ++++++++++++
.../Janitorial/wirebrush.rsi/storage.png | Bin 0 -> 449 bytes
19 files changed, 105 insertions(+), 2 deletions(-)
create mode 100644 Resources/Audio/Items/wirebrushing.ogg
create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 52f0a6c9a2..5a5927c878 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -169,3 +169,8 @@
license: "CC-BY-NC-4.0"
copyright: "Original sound by QEDionium on freesound.org. Coverted to ogg and edited by Prole0 (GitHub)"
source: "https://freesound.org/s/489803/"
+
+- files: ["wirebrushing.ogg"]
+ license: "CC0-1.0"
+ copyright: "Created by romulofs, converted to OGG, and edited by TiniestShark (Github)"
+ source: "https://freesound.org/s/127541/"
diff --git a/Resources/Audio/Items/wirebrushing.ogg b/Resources/Audio/Items/wirebrushing.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..4e54033b4c7073b6f020f490877a00a654ee889c
GIT binary patch
literal 19141
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
Ywdkp(e^B4c9e^U=7}oRi{Y*|(0RM
+
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd46d03a5c86679e31e11b22762ee53323f12a0a
GIT binary patch
literal 546
zcmV+-0^R+IP)Px$+(|@1R9J=Ol}$?mQ51$>O`L)
z`UU-i{y-5ZZCbR7h{}W(sndrxlU5X`O}9)(!aH*d>MZZv;d$P<_nZO#L&=gtvZRpF
zGrMTG-xs904{;Ng=Nz#LF`$z}k*gyEZ<{d;Sw#M45DCUr*5{--#1o@JzB`
z2+xk~L)SGdF0F7~#G3wHjU`CU=Wu&-jqaT&7@VcAPM*tNp;UT6S9cHk2L`dZv1V=*
zpBx|I_U0P*g+k3{qvSokeMs%?+SGimVYs2daBu{kj!wAT?vFJ!t<@xVx!q9nIq15E
z)mVa3d%M<*;_5GuNfv}8XZ7uivZPR}-DBCAbJdJ9PU90%nw?)DcH1M9Q{3aXvKq3F
kOis~{Ca)*)E8ss{Z+P5fja9?0{r~^~07*qoM6N<$f-VL9mjD0&
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0cb615daf09e117efba0a74ac4eabd2fc04d09
GIT binary patch
literal 511
zcmVPx$xk*GpRCt{2+OcZFP!tB>lMY7cBew+t>NE}F&7r0tL~!|l=(2Mfu~JwfaLjS`Oc{`Wuv=Mn(`000000001FGAPVN
zz19>eYu0N`F(}NH){Nb76y5GN+Bw(DP1a6O-ASjgbO8M
zIn7So~vp)G=NN!|PU^tx1BjOC8)9s0sz0``M1G$k+
z&SFnQM4unQ$>-zWoyDHq$fn}xKr4Hxb-F$FHvyaYv^(8i;t!cYVJ_lL|J5xQMfLegOGL&U3o;Q{NvW~@*s@Iz0?*1WD&}_3onXz~p@db*n
zz|T~NEr7IRaTzKuP_P7$W-Km42KRRHRv?@P&d13%l$ig}l9t3#U)m{ejD>Y%))tWQui922CwBN-ldV6IWuC9Htj)
zo4)t+rwc_}1(=q0MP^j~HJRxW_i26&b4p<1&Kkw7s#Cl}r=1q}5EH%rXPtfHqdoI>
zU7sJlPRyw=&i?nEi%dXeTf0PD*WI|PHR*M9K>&mOp3EB)+q;`HZ>&?z;eNs2<|8J0
zO?K-^lblPkQ*}JMO>=JOcq-ow1PZ+ByQR|2^_st}zUzkAhrg+Uf)mXmC%;=U0%~MbHCoI01WL&D1QY{VCzUAbsjOTOIf$l%XzxRIFtq*^C(@y`F-?`=9pMBAm
z>@ZIk%U@f7M+vfRVr7f8VvhrVmE1_PH!zs?(XgM@NxG@aqb@0LHlK
z0(zpySJ+L-Kd@7kW&b0YtL;HxR*>nc=Zl|j|IPpH->;K>x{5Jc9~b|+Td;>EGUP__
rZ`CUsI`>rST@X67*5eB=sd+Tap4RVF2tDnm{r-UW|9iiMG
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
new file mode 100644
index 0000000000..4a9131da5e
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-4.0",
+ "copyright": "Sprites by TiniestShark (Github)",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "storage"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..36997e2cd84887c65d61ada15d6daff9e4ae43d3
GIT binary patch
literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<)t)YnArY;~
z2@-w^+jl&&Us*L{MQUYE(5?UK{qjZ;5jQ72;czR`=}vs_w6VqT7vJIO`tv2{*;gJa
zcyuFi(wP)Rw~4c->)$!#FK=gHFef!ZAaz>ugOn%f2EEf$Bdp7%4;Mc^s}g*M#T+!pGRbj^|Td(Q)-N$zfvat6i;gQu&X%Q~loCIEmJz1;u+
literal 0
HcmV?d00001
From a2ac401db3053122512700a53652c4402231605d Mon Sep 17 00:00:00 2001
From: PJBot
Date: Fri, 4 Jul 2025 02:03:42 +0000
Subject: [PATCH 008/214] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 815a1d9317..7a02e80d6d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
Entries:
-- author: slarticodefast
- changes:
- - message: Fire extinguishers and sprays now allow you to push the grids you are
- standing on when you have magboots on.
- type: Add
- id: 8224
- time: '2025-04-18T03:41:27.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31754
- author: aada
changes:
- message: Filter categories added to the security techfab.
@@ -3887,3 +3879,11 @@
id: 8735
time: '2025-07-04T00:04:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/38699
+- author: TiniestShark
+ changes:
+ - message: Added a Wire Brush to the Janitor's tool kit for scrubbing unsightly
+ rust off of the station's walls!
+ type: Add
+ id: 8736
+ time: '2025-07-04T02:02:35.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/38667
From e82064916a891f835bc09269c721c1e22112ef8c Mon Sep 17 00:00:00 2001
From: Velken <8467292+Velken@users.noreply.github.com>
Date: Fri, 4 Jul 2025 02:08:45 -0300
Subject: [PATCH 009/214] [BUGFIX] Fixed revenant malfunction ability not
working properly only MediBots and Stasis bed (#38664)
* fixed
* clean up
* orks fix smart
* review fix 1
* more requested changes
* less cursed
* more descriptive description
* better wording
---
.../EntitySystems/RevenantSystem.Abilities.cs | 4 ++--
Content.Shared/Emag/Systems/EmagSystem.cs | 15 +++++++++------
.../Prototypes/Entities/Mobs/NPCs/revenant.yml | 2 ++
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 51cbb6d4d5..0ef7b8f533 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -35,6 +35,7 @@ namespace Content.Server.Revenant.EntitySystems;
public sealed partial class RevenantSystem
{
+ [Dependency] private readonly EmagSystem _emagSystem = default!;
[Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly EntityStorageSystem _entityStorage = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -345,8 +346,7 @@ public sealed partial class RevenantSystem
_whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
continue;
- var ev = new GotEmaggedEvent(uid, EmagType.Interaction | EmagType.Access);
- RaiseLocalEvent(ent, ref ev);
+ _emagSystem.TryEmagEffect(uid, uid, ent);
}
}
}
diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index 7aa4303471..912c4bdaea 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -51,9 +51,9 @@ public sealed class EmagSystem : EntitySystem
}
///
- /// Does the emag effect on a specified entity
+ /// Does the emag effect on a specified entity with a specified EmagType. The optional field customEmagType can be used to override the emag type defined in the component.
///
- public bool TryEmagEffect(Entity ent, EntityUid user, EntityUid target)
+ public bool TryEmagEffect(Entity ent, EntityUid user, EntityUid target, EmagType? customEmagType = null)
{
if (!Resolve(ent, ref ent.Comp, false))
return false;
@@ -68,7 +68,9 @@ public sealed class EmagSystem : EntitySystem
return false;
}
- var emaggedEvent = new GotEmaggedEvent(user, ent.Comp.EmagType);
+ var typeToUse = customEmagType ?? ent.Comp.EmagType;
+
+ var emaggedEvent = new GotEmaggedEvent(user, typeToUse);
RaiseLocalEvent(target, ref emaggedEvent);
if (!emaggedEvent.Handled)
@@ -78,7 +80,7 @@ public sealed class EmagSystem : EntitySystem
_audio.PlayPredicted(ent.Comp.EmagSound, ent, ent);
- _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {ent.Comp.EmagType}");
+ _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {typeToUse}");
if (emaggedEvent.Handled)
_sharedCharges.TryUseCharge(chargesEnt);
@@ -87,7 +89,7 @@ public sealed class EmagSystem : EntitySystem
{
EnsureComp(target, out var emaggedComp);
- emaggedComp.EmagType |= ent.Comp.EmagType;
+ emaggedComp.EmagType |= typeToUse;
Dirty(target, emaggedComp);
}
@@ -129,9 +131,10 @@ public sealed class EmagSystem : EntitySystem
[Flags]
[Serializable, NetSerializable]
-public enum EmagType : byte
+public enum EmagType
{
None = 0,
+ All = ~None,
Interaction = 1 << 1,
Access = 1 << 2
}
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 1c70e55d66..13bce86b06 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -6,6 +6,8 @@
name: revenant
description: A spooky ghostie.
components:
+ - type: Emag
+ emagType: All
- type: Input
context: "ghost"
- type: Spectral
From 7b6cc535dd5318c66e2ed5014ae033b34aeb65af Mon Sep 17 00:00:00 2001
From: PJBot
Date: Fri, 4 Jul 2025 05:09:52 +0000
Subject: [PATCH 010/214] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7a02e80d6d..705d1e7d4f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: aada
- changes:
- - message: Filter categories added to the security techfab.
- type: Add
- id: 8225
- time: '2025-04-18T03:52:05.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/35594
- author: Fildrance
changes:
- message: returned deconstruct to the top level option on RCD
@@ -3887,3 +3880,11 @@
id: 8736
time: '2025-07-04T02:02:35.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/38667
+- author: Velken
+ changes:
+ - message: Revenants' malfunction ability now properly works on MediBots and Stasis
+ Beds again.
+ type: Fix
+ id: 8737
+ time: '2025-07-04T05:08:45.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/38664
From 4e73c67d1b277cc5fe857aa865044bdbb520af8a Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Fri, 4 Jul 2025 02:58:56 -0400
Subject: [PATCH 011/214] Tiny Tiny Cleanup of the EyeClosingSystem. (#38734)
Update EyeClosingSystem.cs
---
Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
index 1b62c45af4..68ccf4a6b8 100644
--- a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
@@ -15,7 +15,6 @@ public sealed class EyeClosingSystem : EntitySystem
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;
- [Dependency] private readonly IEntityManager _entityManager = default!;
public override void Initialize()
{
@@ -120,7 +119,7 @@ public sealed class EyeClosingSystem : EntitySystem
var ev = new GetBlurEvent(blindable.Comp.EyeDamage);
RaiseLocalEvent(blindable.Owner, ev);
- if (_entityManager.TryGetComponent(blindable, out var eyelids) && !eyelids.NaturallyCreated)
+ if (EntityManager.TryGetComponent(blindable, out var eyelids) && !eyelids.NaturallyCreated)
return;
if (ev.Blur < BlurryVisionComponent.MaxMagnitude || ev.Blur >= blindable.Comp.MaxDamage)
@@ -135,6 +134,4 @@ public sealed class EyeClosingSystem : EntitySystem
}
}
-public sealed partial class ToggleEyesActionEvent : InstantActionEvent
-{
-}
+public sealed partial class ToggleEyesActionEvent : InstantActionEvent;
From d5d386478401baf8dc83d4298662780f93632a41 Mon Sep 17 00:00:00 2001
From: Minerva <218184747+mnva0@users.noreply.github.com>
Date: Fri, 4 Jul 2025 12:46:23 +0000
Subject: [PATCH 012/214] Typofixes for figurine dialogue (#38737)
* Typofixes for figurine dialogue
* Forgot two
---
Resources/Locale/en-US/datasets/figurines.ftl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index 6d66566c20..c000c37c1e 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -134,9 +134,9 @@ figurines-ce-6 = Power's out again.
figurines-engineer-1 = SINGULOOSE!
figurines-engineer-2 = TESLOOSE!
figurines-engineer-3 = What is AME?
-figurines-engineer-4 = Free insuls at engineering
+figurines-engineer-4 = Free insuls at Engineering!
figurines-engineer-5 = Where'd the power go?
-figurines-engineer-6 = Someone bombed medbay... again...
+figurines-engineer-6 = Someone bombed the medbay... again...
figurines-engineer-7 = Well, why don't you come and fix it?
figurines-atmostech-1 = I put plasma in distro.
@@ -148,7 +148,7 @@ figurines-atmostech-6 = Distro? That's short for disposal.
figurines-atmostech-7 = TEG: Thermal Energy? Gone!
figurines-rd-1 = Blowing up all of the borgs!
-figurines-rd-2 = Tier 3 arsenal? No way.
+figurines-rd-2 = Tier 3 Arsenal? No way.
figurines-rd-3 = Now where did I leave my hardsuit...?
figurines-rd-4 = Now you're thinking with portals!
figurines-rd-5 = The cake is a lie!
@@ -245,22 +245,22 @@ figurines-nukie-3 = The nuke makes boom.
figurines-nukie-4 = What's the code?
figurines-nukie-5 = Commander...? ...That's a balloon...
-figurines-nukie-elite-1 = Not a word in nanotrasen.
+figurines-nukie-elite-1 = Not a word in Nanotrasen.
figurines-nukie-elite-2 = THAT'S A KEG!
-figurines-nukie-elite-3 = Guys are you alive?
+figurines-nukie-elite-3 = Guys, are you alive?
figurines-nukie-elite-4 = Breach and clear!
figurines-nukie-elite-5 = Leave no survivors.
figurines-nukie-elite-6 = Good work, team.
figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
figurines-nukie-commander-2 = Fuckin' flukies.
-figurines-nukie-commander-3 = The syndicate sends its regards.
+figurines-nukie-commander-3 = The Syndicate sends its regards.
figurines-nukie-commander-4 = Failure is not an option.
figurines-nukie-commander-5 = Whoops.
figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day.
figurines-footsoldier-2 = Who will you choose? Them or us? Us or them?
-figurines-footsoldier-3 = Glory to the syndicate!
+figurines-footsoldier-3 = Glory to the Syndicate!
figurines-footsoldier-4 = Down with Nanotrasen!
figurines-footsoldier-5 = I'd rather die than join Nanotrasen.
From 1a2e827674e173a1f0ba9cee9358f925e2e17858 Mon Sep 17 00:00:00 2001
From: Perry Fraser
Date: Fri, 4 Jul 2025 08:48:16 -0400
Subject: [PATCH 013/214] fix: Use PredictedQueueDel for gib spell (#38729)
---
Content.Shared/Gibbing/Systems/GibbingSystem.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
index 8c83de0cf2..9eaadbb970 100644
--- a/Content.Shared/Gibbing/Systems/GibbingSystem.cs
+++ b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
@@ -187,7 +187,7 @@ public sealed class GibbingSystem : EntitySystem
}
if (gibType == GibType.Gib)
- QueueDel(gibbable);
+ PredictedQueueDel(gibbable.Owner);
return true;
}
@@ -292,7 +292,7 @@ public sealed class GibbingSystem : EntitySystem
var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
RaiseLocalEvent(gibbable, ref gibbedEvent);
if (deleteTarget)
- QueueDel(gibbable);
+ PredictedQueueDel(gibbable.Owner);
return localGibs;
}
From d0c067f006cc2f2f63b1bcadb65fbb6bd639d232 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 4 Jul 2025 09:22:26 -0400
Subject: [PATCH 014/214] Fix human skin tone distribution (#38701)
---
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index 05bebea075..7d4a17b337 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -153,8 +153,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
switch (skinType)
{
case HumanoidSkinColor.HumanToned:
- var tone = Math.Round(Humanoid.SkinColor.HumanSkinToneFromColor(newSkinColor));
- newSkinColor = Humanoid.SkinColor.HumanSkinTone((int)tone);
+ newSkinColor = Humanoid.SkinColor.HumanSkinTone(random.Next(0, 101));
break;
case HumanoidSkinColor.Hues:
break;
From bfb73a1aad4f40d40fbdcd0facba155641da32e8 Mon Sep 17 00:00:00 2001
From: Perry Fraser
Date: Fri, 4 Jul 2025 12:15:24 -0400
Subject: [PATCH 015/214] fix: don't default to uncharged sprite state for
cells (#38730)
---
Content.Client/PowerCell/PowerCellSystem.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Content.Client/PowerCell/PowerCellSystem.cs b/Content.Client/PowerCell/PowerCellSystem.cs
index fb40b911d1..8d9dd5ebdd 100644
--- a/Content.Client/PowerCell/PowerCellSystem.cs
+++ b/Content.Client/PowerCell/PowerCellSystem.cs
@@ -48,8 +48,9 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
if (!_sprite.LayerExists((uid, args.Sprite), PowerCellVisualLayers.Unshaded))
return;
+ // If no appearance data is set, rely on whatever existing sprite state is set being correct.
if (!_appearance.TryGetData(uid, PowerCellVisuals.ChargeLevel, out var level, args.Component))
- level = 0;
+ return;
var positiveCharge = level > 0;
_sprite.LayerSetVisible((uid, args.Sprite), PowerCellVisualLayers.Unshaded, positiveCharge);
From c3267c6db03b99017b96c0dfdf4afe3b30a82950 Mon Sep 17 00:00:00 2001
From: Arthur Fiorese de Andrade <170277843+ADM2PLAY@users.noreply.github.com>
Date: Fri, 4 Jul 2025 17:41:49 -0300
Subject: [PATCH 016/214] Fix Hristov description - remove inaccurate technical
specs (#38746)
- Removes inaccurate 'armor piercing 14.5mm shells' reference
- Replaces it with a more funny description, matching the style of the other snipers and guns
- Keeps ammunition type '.60 anti-materiel ammo' specification
- Fixes issue #38590
Co-authored-by: Arthur Fiorese de Andrade
---
.../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 420650afc1..5514db42e6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -54,7 +54,7 @@
name: Hristov
parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
id: WeaponSniperHristov
- description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+ description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
From 3a278bca8bf690d8e2b8553773ac8e7c5b2f544f Mon Sep 17 00:00:00 2001
From: Tayrtahn
Date: Fri, 4 Jul 2025 16:48:55 -0400
Subject: [PATCH 017/214] Validate `ProtoId`s in tests (#38745)
* Convert string literals to protoids in Content.Tests
* Convert string literals to protoids or consts in Content.IntegrationTests
* Fix linter failures
Tricksy static using misled me
---
.../Tests/Atmos/AlarmThresholdTest.cs | 8 +-
.../Tests/Commands/RejuvenateTest.cs | 4 +-
.../Tests/Commands/SuicideCommandTests.cs | 4 +-
.../Construction/Interaction/WindowRepair.cs | 4 +-
.../Tests/Damageable/DamageableTest.cs | 75 +++++++++++--------
.../DestructibleDamageGroupTest.cs | 4 +-
.../DestructibleDamageTypeTest.cs | 4 +-
.../DestructibleDestructionTest.cs | 2 +-
.../DestructibleTestPrototypes.cs | 44 ++++++-----
.../DestructibleThresholdActivationTest.cs | 2 +-
.../Tests/Minds/MindTests.cs | 4 +-
.../Tests/PostMapInitTest.cs | 4 +-
.../Tests/Station/StationJobsTest.cs | 14 ++--
.../Tests/Vending/VendingInteractionTest.cs | 4 +-
.../Tests/VendingMachineRestockTest.cs | 4 +-
Content.Tests/Shared/DamageTest.cs | 23 ++++--
.../Shared/LocalizedDatasetPrototypeTest.cs | 8 +-
17 files changed, 129 insertions(+), 83 deletions(-)
diff --git a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
index 064b4f9a2d..b74c35ba11 100644
--- a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
@@ -7,10 +7,12 @@ namespace Content.IntegrationTests.Tests.Atmos
[TestOf(typeof(AtmosAlarmThreshold))]
public sealed class AlarmThresholdTest
{
+ private const string AlarmThresholdTestDummyId = "AlarmThresholdTestDummy";
+
[TestPrototypes]
- private const string Prototypes = @"
+ private const string Prototypes = $@"
- type: alarmThreshold
- id: AlarmThresholdTestDummy
+ id: {AlarmThresholdTestDummyId}
upperBound: !type:AlarmThresholdSetting
threshold: 5
lowerBound: !type:AlarmThresholdSetting
@@ -30,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Atmos
var prototypeManager = server.ResolveDependency();
AtmosAlarmThreshold threshold = default!;
- var proto = prototypeManager.Index("AlarmThresholdTestDummy");
+ var proto = prototypeManager.Index(AlarmThresholdTestDummyId);
threshold = new(proto);
await server.WaitAssertion(() =>
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index cfc8007306..e4ec7e907a 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -15,6 +15,8 @@ namespace Content.IntegrationTests.Tests.Commands
[TestOf(typeof(RejuvenateSystem))]
public sealed class RejuvenateTest
{
+ private static readonly ProtoId TestDamageGroup = "Toxin";
+
[TestPrototypes]
private const string Prototypes = @"
- type: entity
@@ -62,7 +64,7 @@ namespace Content.IntegrationTests.Tests.Commands
});
// Kill the entity
- DamageSpecifier damage = new(prototypeManager.Index("Toxin"), FixedPoint2.New(10000000));
+ DamageSpecifier damage = new(prototypeManager.Index(TestDamageGroup), FixedPoint2.New(10000000));
damSystem.TryChangeDamage(human, damage, true);
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index b53b87dd5c..61b8d54448 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -53,6 +53,8 @@ public sealed class SuicideCommandTests
components:
- type: MaterialReclaimer";
private static readonly ProtoId CannotSuicideTag = "CannotSuicide";
+ private static readonly ProtoId DamageType = "Slash";
+
///
/// Run the suicide command in the console
/// Should successfully kill the player and ghost them
@@ -144,7 +146,7 @@ public sealed class SuicideCommandTests
mobThresholdsComp = entManager.GetComponent(player);
damageableComp = entManager.GetComponent(player);
- if (protoMan.TryIndex("Slash", out var slashProto))
+ if (protoMan.TryIndex(DamageType, out var slashProto))
damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
});
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
index 6eea519af3..192604edfd 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
@@ -8,6 +8,8 @@ namespace Content.IntegrationTests.Tests.Construction.Interaction;
public sealed class WindowRepair : InteractionTest
{
+ private static readonly ProtoId BluntDamageType = "Blunt";
+
[Test]
public async Task RepairReinforcedWindow()
{
@@ -16,7 +18,7 @@ public sealed class WindowRepair : InteractionTest
// Damage the entity.
var sys = SEntMan.System();
var comp = Comp();
- var damageType = Server.ResolveDependency().Index("Blunt");
+ var damageType = Server.ProtoMan.Index(BluntDamageType);
var damage = new DamageSpecifier(damageType, FixedPoint2.New(10));
Assert.That(comp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero));
await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 69069fc82f..f610ab732e 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -1,9 +1,7 @@
-using System.Linq;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
@@ -14,66 +12,79 @@ namespace Content.IntegrationTests.Tests.Damageable
[TestOf(typeof(DamageableSystem))]
public sealed class DamageableTest
{
+ private const string TestDamageableEntityId = "TestDamageableEntityId";
+ private const string TestGroup1 = "TestGroup1";
+ private const string TestGroup2 = "TestGroup2";
+ private const string TestGroup3 = "TestGroup3";
+ private const string TestDamage1 = "TestDamage1";
+ private const string TestDamage2a = "TestDamage2a";
+ private const string TestDamage2b = "TestDamage2b";
+
+ private const string TestDamage3a = "TestDamage3a";
+
+ private const string TestDamage3b = "TestDamage3b";
+ private const string TestDamage3c = "TestDamage3c";
+
[TestPrototypes]
- private const string Prototypes = @"
+ private const string Prototypes = $@"
# Define some damage groups
- type: damageType
- id: TestDamage1
+ id: {TestDamage1}
name: damage-type-blunt
- type: damageType
- id: TestDamage2a
+ id: {TestDamage2a}
name: damage-type-blunt
- type: damageType
- id: TestDamage2b
+ id: {TestDamage2b}
name: damage-type-blunt
- type: damageType
- id: TestDamage3a
+ id: {TestDamage3a}
name: damage-type-blunt
- type: damageType
- id: TestDamage3b
+ id: {TestDamage3b}
name: damage-type-blunt
- type: damageType
- id: TestDamage3c
+ id: {TestDamage3c}
name: damage-type-blunt
# Define damage Groups with 1,2,3 damage types
- type: damageGroup
- id: TestGroup1
+ id: {TestGroup1}
name: damage-group-brute
damageTypes:
- - TestDamage1
+ - {TestDamage1}
- type: damageGroup
- id: TestGroup2
+ id: {TestGroup2}
name: damage-group-brute
damageTypes:
- - TestDamage2a
- - TestDamage2b
+ - {TestDamage2a}
+ - {TestDamage2b}
- type: damageGroup
- id: TestGroup3
+ id: {TestGroup3}
name: damage-group-brute
damageTypes:
- - TestDamage3a
- - TestDamage3b
- - TestDamage3c
+ - {TestDamage3a}
+ - {TestDamage3b}
+ - {TestDamage3c}
# This container should not support TestDamage1 or TestDamage2b
- type: damageContainer
id: testDamageContainer
supportedGroups:
- - TestGroup3
+ - {TestGroup3}
supportedTypes:
- - TestDamage2a
+ - {TestDamage2a}
- type: entity
- id: TestDamageableEntityId
- name: TestDamageableEntityId
+ id: {TestDamageableEntityId}
+ name: {TestDamageableEntityId}
components:
- type: Damageable
damageContainer: testDamageContainer
@@ -113,20 +124,20 @@ namespace Content.IntegrationTests.Tests.Damageable
{
var coordinates = map.MapCoords;
- sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
+ sDamageableEntity = sEntityManager.SpawnEntity(TestDamageableEntityId, coordinates);
sDamageableComponent = sEntityManager.GetComponent(sDamageableEntity);
sDamageableSystem = sEntitySystemManager.GetEntitySystem();
- group1 = sPrototypeManager.Index("TestGroup1");
- group2 = sPrototypeManager.Index("TestGroup2");
- group3 = sPrototypeManager.Index("TestGroup3");
+ group1 = sPrototypeManager.Index(TestGroup1);
+ group2 = sPrototypeManager.Index(TestGroup2);
+ group3 = sPrototypeManager.Index(TestGroup3);
- type1 = sPrototypeManager.Index("TestDamage1");
- type2a = sPrototypeManager.Index("TestDamage2a");
- type2b = sPrototypeManager.Index("TestDamage2b");
- type3a = sPrototypeManager.Index("TestDamage3a");
- type3b = sPrototypeManager.Index("TestDamage3b");
- type3c = sPrototypeManager.Index("TestDamage3c");
+ type1 = sPrototypeManager.Index(TestDamage1);
+ type2a = sPrototypeManager.Index(TestDamage2a);
+ type2b = sPrototypeManager.Index(TestDamage2b);
+ type3a = sPrototypeManager.Index(TestDamage3a);
+ type3b = sPrototypeManager.Index(TestDamage3b);
+ type3c = sPrototypeManager.Index(TestDamage3c);
});
await server.WaitRunTicks(5);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
index d37de7a504..0da07ad5a1 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
@@ -54,8 +54,8 @@ namespace Content.IntegrationTests.Tests.Destructible
await server.WaitAssertion(() =>
{
- var bruteDamageGroup = sPrototypeManager.Index("TestBrute");
- var burnDamageGroup = sPrototypeManager.Index("TestBurn");
+ var bruteDamageGroup = sPrototypeManager.Index(TestBruteDamageGroupId);
+ var burnDamageGroup = sPrototypeManager.Index(TestBurnDamageGroupId);
DamageSpecifier bruteDamage = new(bruteDamageGroup, FixedPoint2.New(5));
DamageSpecifier burnDamage = new(burnDamageGroup, FixedPoint2.New(5));
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
index 69891cbd89..ccd459668b 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
@@ -49,8 +49,8 @@ namespace Content.IntegrationTests.Tests.Destructible
await server.WaitAssertion(() =>
{
- var bluntDamageType = protoManager.Index("TestBlunt");
- var slashDamageType = protoManager.Index("TestSlash");
+ var bluntDamageType = protoManager.Index(TestBluntDamageTypeId);
+ var slashDamageType = protoManager.Index(TestSlashDamageTypeId);
var bluntDamage = new DamageSpecifier(bluntDamageType, 5);
var slashDamage = new DamageSpecifier(slashDamageType, 5);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index a50238d8f5..4e169e7dfa 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -39,7 +39,7 @@ namespace Content.IntegrationTests.Tests.Destructible
await server.WaitAssertion(() =>
{
var coordinates = sEntityManager.GetComponent(sDestructibleEntity).Coordinates;
- var bruteDamageGroup = sPrototypeManager.Index("TestBrute");
+ var bruteDamageGroup = sPrototypeManager.Index(TestBruteDamageGroupId);
DamageSpecifier bruteDamage = new(bruteDamageGroup, 50);
#pragma warning disable NUnit2045 // Interdependent assertions.
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
index 7ff9242398..872e414ac3 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
@@ -7,48 +7,56 @@ namespace Content.IntegrationTests.Tests.Destructible
public const string DestructibleDestructionEntityId = "DestructibleTestsDestructibleDestructionEntity";
public const string DestructibleDamageTypeEntityId = "DestructibleTestsDestructibleDamageTypeEntity";
public const string DestructibleDamageGroupEntityId = "DestructibleTestsDestructibleDamageGroupEntity";
+ public const string TestBruteDamageGroupId = "TestBrute";
+ public const string TestBurnDamageGroupId = "TestBurn";
+ public const string TestBluntDamageTypeId = "TestBlunt";
+ public const string TestSlashDamageTypeId = "TestSlash";
+ public const string TestPiercingDamageTypeId = "TestPiercing";
+ public const string TestHeatDamageTypeId = "TestHeat";
+ public const string TestShockDamageTypeId = "TestShock";
+ public const string TestColdDamageTypeId = "TestCold";
[TestPrototypes]
public const string DamagePrototypes = $@"
- type: damageType
- id: TestBlunt
+ id: {TestBluntDamageTypeId}
name: damage-type-blunt
- type: damageType
- id: TestSlash
+ id: {TestSlashDamageTypeId}
name: damage-type-slash
- type: damageType
- id: TestPiercing
+ id: {TestPiercingDamageTypeId}
name: damage-type-piercing
- type: damageType
- id: TestHeat
+ id: {TestHeatDamageTypeId}
name: damage-type-heat
- type: damageType
- id: TestShock
+ id: {TestShockDamageTypeId}
name: damage-type-shock
- type: damageType
- id: TestCold
+ id: {TestColdDamageTypeId}
name: damage-type-cold
- type: damageGroup
- id: TestBrute
+ id: {TestBruteDamageGroupId}
name: damage-group-brute
damageTypes:
- - TestBlunt
- - TestSlash
- - TestPiercing
+ - {TestBluntDamageTypeId}
+ - {TestSlashDamageTypeId}
+ - {TestPiercingDamageTypeId}
- type: damageGroup
- id: TestBurn
+ id: {TestBurnDamageGroupId}
name: damage-group-burn
damageTypes:
- - TestHeat
- - TestShock
- - TestCold
+ - {TestHeatDamageTypeId}
+ - {TestShockDamageTypeId}
+ - {TestColdDamageTypeId}
- type: entity
id: {SpawnedEntityId}
@@ -114,10 +122,10 @@ namespace Content.IntegrationTests.Tests.Destructible
!type:AndTrigger
triggers:
- !type:DamageTypeTrigger
- damageType: TestBlunt
+ damageType: {TestBluntDamageTypeId}
damage: 10
- !type:DamageTypeTrigger
- damageType: TestSlash
+ damageType: {TestSlashDamageTypeId}
damage: 10
- type: entity
@@ -131,10 +139,10 @@ namespace Content.IntegrationTests.Tests.Destructible
!type:AndTrigger
triggers:
- !type:DamageGroupTrigger
- damageGroup: TestBrute
+ damageGroup: {TestBruteDamageGroupId}
damage: 10
- !type:DamageGroupTrigger
- damageGroup: TestBurn
+ damageGroup: {TestBurnDamageGroupId}
damage: 10";
}
}
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index 80f750c715..af86e406ef 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Destructible
await server.WaitAssertion(() =>
{
- var bluntDamage = new DamageSpecifier(sPrototypeManager.Index("TestBlunt"), 10);
+ var bluntDamage = new DamageSpecifier(sPrototypeManager.Index(TestBluntDamageTypeId), 10);
sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true);
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index d4d551f4e0..60e98b69fe 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -24,6 +24,8 @@ namespace Content.IntegrationTests.Tests.Minds;
[TestFixture]
public sealed partial class MindTests
{
+ private static readonly ProtoId BluntDamageType = "Blunt";
+
[TestPrototypes]
private const string Prototypes = @"
- type: entity
@@ -144,7 +146,7 @@ public sealed partial class MindTests
await server.WaitAssertion(() =>
{
var damageable = entMan.GetComponent(entity);
- if (!protoMan.TryIndex("Blunt", out var prototype))
+ if (!protoMan.TryIndex(BluntDamageType, out var prototype))
{
return;
}
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 97be2b8705..a7a50a5270 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -77,6 +77,8 @@ namespace Content.IntegrationTests.Tests
"Exo",
};
+ private static readonly ProtoId DoNotMapCategory = "DoNotMap";
+
///
/// Asserts that specific files have been saved as grids and not maps.
///
@@ -254,7 +256,7 @@ namespace Content.IntegrationTests.Tests
return;
var yamlEntities = node["entities"];
- if (!protoManager.TryIndex("DoNotMap", out var dnmCategory))
+ if (!protoManager.TryIndex(DoNotMapCategory, out var dnmCategory))
return;
Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index d68fdafb76..3fee4a146c 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -17,8 +17,10 @@ namespace Content.IntegrationTests.Tests.Station;
[TestOf(typeof(StationJobsSystem))]
public sealed class StationJobsTest
{
+ private const string StationMapId = "FooStation";
+
[TestPrototypes]
- private const string Prototypes = @"
+ private const string Prototypes = $@"
- type: playTimeTracker
id: PlayTimeDummyAssistant
@@ -35,13 +37,13 @@ public sealed class StationJobsTest
id: PlayTimeDummyChaplain
- type: gameMap
- id: FooStation
+ id: {StationMapId}
minPlayers: 0
- mapName: FooStation
+ mapName: {StationMapId}
mapPath: /Maps/Test/empty.yml
stations:
Station:
- mapNameTemplate: FooStation
+ mapNameTemplate: {StationMapId}
stationProto: StandardNanotrasenStation
components:
- type: StationJobs
@@ -87,7 +89,7 @@ public sealed class StationJobsTest
var server = pair.Server;
var prototypeManager = server.ResolveDependency();
- var fooStationProto = prototypeManager.Index("FooStation");
+ var fooStationProto = prototypeManager.Index(StationMapId);
var entSysMan = server.ResolveDependency().EntitySysManager;
var stationJobs = entSysMan.GetEntitySystem();
var stationSystem = entSysMan.GetEntitySystem();
@@ -161,7 +163,7 @@ public sealed class StationJobsTest
var server = pair.Server;
var prototypeManager = server.ResolveDependency();
- var fooStationProto = prototypeManager.Index("FooStation");
+ var fooStationProto = prototypeManager.Index(StationMapId);
var entSysMan = server.ResolveDependency().EntitySysManager;
var stationJobs = entSysMan.GetEntitySystem();
var stationSystem = entSysMan.GetEntitySystem();
diff --git a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
index bcaf4343b6..3645667737 100644
--- a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
@@ -5,6 +5,7 @@ using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Shared.VendingMachines;
+using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests.Vending;
@@ -17,6 +18,7 @@ public sealed class VendingInteractionTest : InteractionTest
private const string RestockBoxProtoId = "InteractionTestRestockBox";
private const string RestockBoxOtherProtoId = "InteractionTestRestockBoxOther";
+ private static readonly ProtoId TestDamageType = "Blunt";
[TestPrototypes]
private const string TestPrototypes = $@"
@@ -196,7 +198,7 @@ public sealed class VendingInteractionTest : InteractionTest
Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero), $"{VendingMachineProtoId} started with unexpected damage.");
// Damage the vending machine to the point that it breaks
- var damageType = ProtoMan.Index("Blunt");
+ var damageType = ProtoMan.Index(TestDamageType);
var damage = new DamageSpecifier(damageType, FixedPoint2.New(100));
await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
await RunTicks(5);
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 4644768901..f30eed0651 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -20,6 +20,8 @@ namespace Content.IntegrationTests.Tests
[TestOf(typeof(VendingMachineSystem))]
public sealed class VendingMachineRestockTest : EntitySystem
{
+ private static readonly ProtoId TestDamageType = "Blunt";
+
[TestPrototypes]
private const string Prototypes = @"
- type: entity
@@ -293,7 +295,7 @@ namespace Content.IntegrationTests.Tests
"Did not start with zero ramen.");
restock = entityManager.SpawnEntity("TestRestockExplode", coordinates);
- var damageSpec = new DamageSpecifier(prototypeManager.Index("Blunt"), 100);
+ var damageSpec = new DamageSpecifier(prototypeManager.Index(TestDamageType), 100);
var damageResult = damageableSystem.TryChangeDamage(restock, damageSpec);
#pragma warning disable NUnit2045
diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs
index 58fa8fbde3..27543e6533 100644
--- a/Content.Tests/Shared/DamageTest.cs
+++ b/Content.Tests/Shared/DamageTest.cs
@@ -15,6 +15,11 @@ namespace Content.Tests.Shared
[TestOf(typeof(DamageGroupPrototype))]
public sealed class DamageTest : ContentUnitTest
{
+ private static readonly ProtoId BruteDamageGroup = "Brute";
+ private static readonly ProtoId RadiationDamageType = "Radiation";
+ private static readonly ProtoId SlashDamageType = "Slash";
+ private static readonly ProtoId PiercingDamageType = "Piercing";
+
private IPrototypeManager _prototypeManager;
private DamageSpecifier _damageSpec;
@@ -29,9 +34,9 @@ namespace Content.Tests.Shared
_prototypeManager.ResolveResults();
// Create a damage data set
- _damageSpec = new(_prototypeManager.Index("Brute"), 6);
- _damageSpec += new DamageSpecifier(_prototypeManager.Index("Radiation"), 3);
- _damageSpec += new DamageSpecifier(_prototypeManager.Index("Slash"), -1); // already exists in brute
+ _damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 6);
+ _damageSpec += new DamageSpecifier(_prototypeManager.Index(RadiationDamageType), 3);
+ _damageSpec += new DamageSpecifier(_prototypeManager.Index(SlashDamageType), -1); // already exists in brute
}
//Check that DamageSpecifier will split groups and can do arithmetic operations
@@ -100,7 +105,7 @@ namespace Content.Tests.Shared
Assert.That(damage, Is.EqualTo(FixedPoint2.New(3)));
// Lets also test the constructor with damage types and damage groups works properly.
- damageSpec = new(_prototypeManager.Index("Brute"), 4);
+ damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 4);
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
@@ -108,7 +113,7 @@ namespace Content.Tests.Shared
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.34))); // doesn't divide evenly, so the 0.01 goes to the last one
- damageSpec = new(_prototypeManager.Index("Piercing"), 4);
+ damageSpec = new(_prototypeManager.Index(PiercingDamageType), 4);
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
}
@@ -121,7 +126,7 @@ namespace Content.Tests.Shared
DamageSpecifier damageSpec = 10 * new DamageSpecifier(_damageSpec);
// Create a modifier set
- var modifierSet = _prototypeManager.Index("ModifierTestSet");
+ var modifierSet = _prototypeManager.Index(ModifierTestSetId);
//damage is initially 20 / 20 / 10 / 30
//Each time we subtract -5 / 0 / 8 / 0.5
@@ -142,8 +147,10 @@ namespace Content.Tests.Shared
Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
}
+ private const string ModifierTestSetId = "ModifierTestSet";
+
// Default damage Yaml
- private string _damagePrototypes = @"
+ private readonly string _damagePrototypes = $@"
- type: damageType
id: Blunt
name: damage-type-blunt
@@ -268,7 +275,7 @@ namespace Content.Tests.Shared
Blunt: 5
- type: damageModifierSet
- id: ModifierTestSet
+ id: {ModifierTestSetId}
coefficients:
Piercing: -2
Slash: 3
diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
index b07b18efa0..77f001bfe1 100644
--- a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
+++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
@@ -12,6 +12,8 @@ namespace Content.Tests.Shared;
[TestOf(typeof(LocalizedDatasetPrototype))]
public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
{
+ private const string TestDatasetId = "Test";
+
private IPrototypeManager _prototypeManager;
[OneTimeSetUp]
@@ -24,9 +26,9 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
_prototypeManager.ResolveResults();
}
- private const string TestPrototypes = @"
+ private const string TestPrototypes = $@"
- type: localizedDataset
- id: Test
+ id: {TestDatasetId}
values:
prefix: test-dataset-
count: 4
@@ -35,7 +37,7 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
[Test]
public void LocalizedDatasetTest()
{
- var testPrototype = _prototypeManager.Index("Test");
+ var testPrototype = _prototypeManager.Index(TestDatasetId);
var values = new ValueList();
foreach (var value in testPrototype.Values)
{
From f09bade8e783bf36bb94718759d5b427ae07bec3 Mon Sep 17 00:00:00 2001
From: Tayrtahn
Date: Fri, 4 Jul 2025 16:55:45 -0400
Subject: [PATCH 018/214] Validate remaining `ProtoId` strings (#38747)
Validate remaining ProtoId strings
---
.../Access/UI/GroupedAccessLevelChecklist.xaml.cs | 4 +++-
Content.Client/Delivery/DeliveryVisualizerSystem.cs | 2 +-
Content.Server/Botany/Systems/MutationSystem.cs | 4 +++-
Content.Server/Cluwne/CluwneSystem.cs | 4 +++-
.../Behaviors/WeightedSpawnEntityBehavior.cs | 4 +++-
Content.Server/EntityEffects/EntityEffectSystem.cs | 4 +++-
.../Gateway/Systems/GatewayGeneratorSystem.cs | 11 ++++++-----
Content.Server/Ghost/GhostSystem.cs | 3 ++-
.../Salvage/SalvageSystem.ExpeditionConsole.cs | 6 +++---
Content.Server/Salvage/SpawnSalvageMissionJob.cs | 2 +-
.../StationEvents/Events/RandomSentienceRule.cs | 7 +++++--
Content.Shared/Body/Systems/SharedBodySystem.Parts.cs | 4 +++-
Content.Shared/Chat/SharedSuicideSystem.cs | 6 ++++--
Content.Shared/Humanoid/NamingSystem.cs | 6 ++++--
14 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
index da68653ce5..4f07c31009 100644
--- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
+++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
@@ -15,6 +15,8 @@ namespace Content.Client.Access.UI;
[GenerateTypedNameReferences]
public sealed partial class GroupedAccessLevelChecklist : BoxContainer
{
+ private static readonly ProtoId GeneralAccessGroup = "General";
+
[Dependency] private readonly IPrototypeManager _protoManager = default!;
private bool _isMonotone;
@@ -63,7 +65,7 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer
// Ensure that the 'general' access group is added to handle
// misc. access levels that aren't associated with any group
- if (_protoManager.TryIndex("General", out var generalAccessProto))
+ if (_protoManager.TryIndex(GeneralAccessGroup, out var generalAccessProto))
_groupedAccessLevels.TryAdd(generalAccessProto, new());
// Assign known access levels with their associated groups
diff --git a/Content.Client/Delivery/DeliveryVisualizerSystem.cs b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
index 846688149f..d5afd34533 100644
--- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs
+++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
@@ -24,7 +24,7 @@ public sealed class DeliveryVisualizerSystem : VisualizerSystem(job, out var icon))
{
- SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index("JobIconUnknown")));
+ SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index(UnknownIcon).Icon));
return;
}
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index 37b68d9475..ee35db48e3 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -9,13 +9,15 @@ namespace Content.Server.Botany;
public sealed class MutationSystem : EntitySystem
{
+ private static ProtoId RandomPlantMutations = "RandomPlantMutations";
+
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private RandomPlantMutationListPrototype _randomMutations = default!;
public override void Initialize()
{
- _randomMutations = _prototypeManager.Index("RandomPlantMutations");
+ _randomMutations = _prototypeManager.Index(RandomPlantMutations);
}
///
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 73476ece17..2bad4e0b96 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -21,6 +21,8 @@ namespace Content.Server.Cluwne;
public sealed class CluwneSystem : EntitySystem
{
+ private static readonly ProtoId GeneticDamageGroup = "Genetic";
+
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -53,7 +55,7 @@ public sealed class CluwneSystem : EntitySystem
RemComp(uid);
RemComp(uid);
RemComp(uid);
- var damageSpec = new DamageSpecifier(_prototypeManager.Index("Genetic"), 300);
+ var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
_damageableSystem.TryChangeDamage(uid, damageSpec);
}
}
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
index e02ed87322..96fa4dd438 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
@@ -19,6 +19,8 @@ namespace Content.Server.Destructible.Thresholds.Behaviors;
[DataDefinition]
public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
{
+ private static readonly EntProtoId TempEntityProtoId = "TemporaryEntityForTimedDespawnSpawners";
+
///
/// A table of entities with assigned weights to randomly pick from
///
@@ -64,7 +66,7 @@ public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
if (SpawnAfter != 0)
{
// if it fails to get the spawner, this won't ever work so just return
- if (!system.PrototypeManager.TryIndex("TemporaryEntityForTimedDespawnSpawners", out var tempSpawnerProto))
+ if (!system.PrototypeManager.TryIndex(TempEntityProtoId, out var tempSpawnerProto))
return;
// spawn the spawner, assign it a lifetime, and assign the entity that it will spawn when despawned
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
index e18b3b1470..54270ca53d 100644
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -48,6 +48,8 @@ namespace Content.Server.EntityEffects;
public sealed class EntityEffectSystem : EntitySystem
{
+ private static readonly ProtoId RandomPickBotanyReagent = "RandomPickBotanyReagent";
+
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly BloodstreamSystem _bloodstream = default!;
[Dependency] private readonly ChatSystem _chat = default!;
@@ -854,7 +856,7 @@ public sealed class EntityEffectSystem : EntitySystem
return;
var chemicals = plantholder.Seed.Chemicals;
- var randomChems = _protoManager.Index("RandomPickBotanyReagent").Fills;
+ var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
// Add a random amount of a random chemical to this set of chemicals
if (randomChems != null)
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 83471cdbc1..a88cf6b428 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -36,8 +36,9 @@ public sealed class GatewayGeneratorSystem : EntitySystem
[Dependency] private readonly SharedSalvageSystem _salvage = default!;
[Dependency] private readonly TileSystem _tile = default!;
- [ValidatePrototypeId]
- private const string PlanetNames = "NamesBorer";
+ private static readonly ProtoId PlanetNames = "NamesBorer";
+ private static readonly ProtoId BiomeTemplate = "Continental";
+ private static readonly ProtoId DungeonConfig = "Experiment";
// TODO:
// Fix shader some more
@@ -101,7 +102,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
var random = new Random(seed);
var mapUid = _maps.CreateMap();
- var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
+ var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
_metadata.SetEntityName(mapUid, gatewayName);
var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset));
@@ -111,7 +112,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
};
AddComp(mapUid, restricted);
- _biome.EnsurePlanet(mapUid, _protoManager.Index("Continental"), seed);
+ _biome.EnsurePlanet(mapUid, _protoManager.Index(BiomeTemplate), seed);
var grid = Comp(mapUid);
@@ -183,7 +184,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
var dungeonRotation = _dungeon.GetDungeonRotation(seed);
var dungeonPosition = (origin + dungeonRotation.RotateVec(new Vector2i(0, dungeonDistance))).Floored();
- _dungeon.GenerateDungeon(_protoManager.Index("Experiment"), args.MapUid, grid, dungeonPosition, seed);
+ _dungeon.GenerateDungeon(_protoManager.Index(DungeonConfig), args.MapUid, grid, dungeonPosition, seed);
// TODO: Dungeon mobs + loot.
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 33de2c6f39..3e09d86189 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -74,6 +74,7 @@ namespace Content.Server.Ghost
private EntityQuery _physicsQuery;
private static readonly ProtoId AllowGhostShownByEventTag = "AllowGhostShownByEvent";
+ private static readonly ProtoId AsphyxiationDamageType = "Asphyxiation";
public override void Initialize()
{
@@ -585,7 +586,7 @@ namespace Content.Server.Ghost
dealtDamage = playerDeadThreshold - damageable.TotalDamage;
}
- DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage);
+ DamageSpecifier damage = new(_prototypeManager.Index(AsphyxiationDamageType), dealtDamage);
_damageable.TryChangeDamage(playerEntity, damage, true);
}
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index a9d8314f57..aa501368de 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -8,8 +8,8 @@ namespace Content.Server.Salvage;
public sealed partial class SalvageSystem
{
- [ValidatePrototypeId]
- public const string CoordinatesDisk = "CoordinatesDisk";
+ public static readonly EntProtoId CoordinatesDisk = "CoordinatesDisk";
+ public static readonly ProtoId PlanetNames = "NamesBorer";
private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
{
@@ -28,7 +28,7 @@ public sealed partial class SalvageSystem
var mission = GetMission(_prototypeManager.Index(missionparams.Difficulty), missionparams.Seed);
data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
- _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index("NamesBorer"), missionparams.Seed));
+ _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index(PlanetNames), missionparams.Seed));
_audio.PlayPvs(component.PrintSound, uid);
UpdateConsoles((station.Value, data));
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index cbce4dc692..8b5e9898ad 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -100,7 +100,7 @@ public sealed class SpawnSalvageMissionJob : Job
destComp.Enabled = true;
_metaData.SetEntityName(
mapUid,
- _entManager.System().GetFTLName(_prototypeManager.Index("NamesBorer"), _missionParams.Seed));
+ _entManager.System().GetFTLName(_prototypeManager.Index(SalvageSystem.PlanetNames), _missionParams.Seed));
_entManager.AddComponent(mapUid);
// Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 3d2e457a34..359c3edae4 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -11,6 +11,9 @@ namespace Content.Server.StationEvents.Events;
public sealed class RandomSentienceRule : StationEventSystem
{
+ private static readonly ProtoId DataSourceNames = "RandomSentienceEventData";
+ private static readonly ProtoId IntelligenceLevelNames = "RandomSentienceEventStrength";
+
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IRobustRandom _random = default!;
protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
@@ -72,8 +75,8 @@ public sealed class RandomSentienceRule : StationEventSystem("RandomSentienceEventData"))),
- ("strength", _random.Pick(_prototype.Index("RandomSentienceEventStrength")))
+ ("data", _random.Pick(_prototype.Index(DataSourceNames))),
+ ("strength", _random.Pick(_prototype.Index(IntelligenceLevelNames)))
),
playDefaultSound: false,
colorOverride: Color.Gold
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 0917197e29..78d270ddc9 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -8,12 +8,14 @@ using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Movement.Components;
using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
namespace Content.Shared.Body.Systems;
public partial class SharedBodySystem
{
+ private static readonly ProtoId BloodlossDamageType = "Bloodloss";
private void InitializeParts()
{
// TODO: This doesn't handle comp removal on child ents.
@@ -178,7 +180,7 @@ public partial class SharedBodySystem
)
{
// TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
- var damage = new DamageSpecifier(Prototypes.Index("Bloodloss"), 300);
+ var damage = new DamageSpecifier(Prototypes.Index(BloodlossDamageType), 300);
Damageable.TryChangeDamage(bodyEnt, damage);
}
}
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index d341ea89a8..4b9eaf24b7 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Shared.Chat;
public sealed class SharedSuicideSystem : EntitySystem
{
+ private static readonly ProtoId FallbackDamageType = "Blunt";
+
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -57,8 +59,8 @@ public sealed class SharedSuicideSystem : EntitySystem
// We don't want structural damage for the same reasons listed above
if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
{
- Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to Blunt");
- damagePrototype = _prototypeManager.Index("Blunt");
+ Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to {FallbackDamageType}");
+ damagePrototype = _prototypeManager.Index(FallbackDamageType);
}
var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index a2085c6692..98afb34015 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -12,6 +12,8 @@ namespace Content.Shared.Humanoid
///
public sealed class NamingSystem : EntitySystem
{
+ private static readonly ProtoId FallbackSpecies = "Human";
+
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -21,8 +23,8 @@ namespace Content.Shared.Humanoid
// Some downstream is probably gonna have this eventually but then they can deal with fallbacks.
if (!_prototypeManager.TryIndex(species, out SpeciesPrototype? speciesProto))
{
- speciesProto = _prototypeManager.Index("Human");
- Log.Warning($"Unable to find species {species} for name, falling back to Human");
+ speciesProto = _prototypeManager.Index(FallbackSpecies);
+ Log.Warning($"Unable to find species {species} for name, falling back to {FallbackSpecies}");
}
switch (speciesProto.Naming)
From 4905e097c8947e2384b0243d920567e08f0e6c3c Mon Sep 17 00:00:00 2001
From: Perry Fraser
Date: Fri, 4 Jul 2025 17:50:44 -0400
Subject: [PATCH 019/214] feat: allow mopping evaporating puddles (#38743)
---
.../Fluids/EntitySystems/AbsorbentSystem.cs | 20 ++++++++++++-------
.../EntitySystems/PuddleSystem.Evaporation.cs | 1 +
.../fluids/components/absorbent-component.ftl | 4 ++--
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 1177c24304..28c36602e1 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -277,17 +277,22 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
if (!_solutionContainerSystem.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
return false;
- // Check if the puddle has any non-evaporative reagents
- if (_puddleSystem.CanFullyEvaporate(puddleSolution))
- {
- _popups.PopupEntity(Loc.GetString("mopping-system-puddle-evaporate", ("target", target)), user, user);
- return true;
- }
-
Solution puddleSplit;
var isRemoved = false;
if (absorber.UseAbsorberSolution)
{
+ // No reason to mop something that 1) can evaporate, 2) is an absorber, and 3) is being mopped with
+ // something that uses absorbers.
+ var puddleAbsorberVolume =
+ puddleSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(puddleSolution));
+ if (puddleAbsorberVolume == puddleSolution.Volume)
+ {
+ _popups.PopupEntity(Loc.GetString("mopping-system-puddle-already-mopped", ("target", target)),
+ user,
+ user);
+ return true;
+ }
+
// Check if we have any evaporative reagents on our absorber to transfer
var absorberSolution = absorberSoln.Comp.Solution;
var available = absorberSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(absorberSolution));
@@ -317,6 +322,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
}
else
{
+ // Note: arguably shouldn't this get all solutions?
puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
// Despawn if we're done
if (puddleSolution.Volume == FixedPoint2.Zero)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
index f92504e74c..245ab8308f 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
@@ -46,6 +46,7 @@ public sealed partial class PuddleSystem
if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
continue;
+ // Yes, this means that 50u water + 50u holy water evaporates twice as fast as 100u water.
foreach ((string evaporatingReagent, FixedPoint2 evaporatingSpeed) in GetEvaporationSpeeds(puddleSolution))
{
var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporatingSpeed;
diff --git a/Resources/Locale/en-US/fluids/components/absorbent-component.ftl b/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
index 51e500a6fe..d6cb60e25e 100644
--- a/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
+++ b/Resources/Locale/en-US/fluids/components/absorbent-component.ftl
@@ -1,7 +1,7 @@
mopping-system-target-container-empty = { CAPITALIZE(THE($target)) } is empty!
mopping-system-target-container-empty-water = { CAPITALIZE(THE($target)) } has no water!
-mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water
-mopping-system-puddle-evaporate = { CAPITALIZE(THE($target)) } is evaporating
+mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water.
+mopping-system-puddle-already-mopped = { CAPITALIZE(THE($target)) } is already mopped.
mopping-system-no-water = { CAPITALIZE(THE($used)) } has no water!
mopping-system-no-hands = You have no hands!
From a4ac8eec82728f636fbf77db7e6931f6dfe71551 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Fri, 4 Jul 2025 21:51:51 +0000
Subject: [PATCH 020/214] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 705d1e7d4f..3ea47a96ae 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: Fildrance
- changes:
- - message: returned deconstruct to the top level option on RCD
- type: Fix
- id: 8226
- time: '2025-04-18T04:50:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/36486
- author: ciaran
changes:
- message: Added a button to scroll back to the bottom of the chat box
@@ -3888,3 +3881,11 @@
id: 8737
time: '2025-07-04T05:08:45.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/38664
+- author: perryprog
+ changes:
+ - message: You can now mop space lube, letting it evaporate faster than it would
+ on its own.
+ type: Tweak
+ id: 8738
+ time: '2025-07-04T21:50:44.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/38743
From b36aedde6bfed7362d4119e2be23d1cf6a675c3a Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sat, 5 Jul 2025 00:19:31 +0200
Subject: [PATCH 021/214] Cleanup warning in StomachSystem (#38748)
you did not see this
---
Content.Shared/Body/Systems/StomachSystem.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/Content.Shared/Body/Systems/StomachSystem.cs b/Content.Shared/Body/Systems/StomachSystem.cs
index d0ecb6b93b..8b2df453a0 100644
--- a/Content.Shared/Body/Systems/StomachSystem.cs
+++ b/Content.Shared/Body/Systems/StomachSystem.cs
@@ -1,7 +1,6 @@
using Content.Shared.Body.Components;
using Content.Shared.Body.Events;
using Content.Shared.Body.Organ;
-using Content.Shared.Body.Events;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
From edbde7b7b99d0286fc01015a3a2c05491115b371 Mon Sep 17 00:00:00 2001
From: Mora <46364955+TrixxedHeart@users.noreply.github.com>
Date: Fri, 4 Jul 2025 18:06:55 -0500
Subject: [PATCH 022/214] Vox scars (#38592)
* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl
* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"
This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.
* locale key fix
* Changed top surgery scar names to be more generalized
* Adjusted face scars
* Formatting fixes
---------
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
---
Resources/Locale/en-US/markings/vox.ftl | 47 +++++++
.../Locale/en-US/markings/vox_tattoos.ftl | 11 --
.../Mobs/Customization/Markings/vox_scars.yml | 118 ++++++++++++++++++
.../Customization/vox_scars.rsi/meta.json | 59 +++++++++
.../vox_scars.rsi/vox_scar_chest.png | Bin 0 -> 3165 bytes
.../vox_scars.rsi/vox_scar_chest_bullets.png | Bin 0 -> 3065 bytes
.../vox_scars.rsi/vox_scar_eye_left.png | Bin 0 -> 3011 bytes
.../vox_scars.rsi/vox_scar_eye_left_small.png | Bin 0 -> 2992 bytes
.../vox_scars.rsi/vox_scar_eye_right.png | Bin 0 -> 3007 bytes
.../vox_scar_eye_right_small.png | Bin 0 -> 2993 bytes
.../vox_scars.rsi/vox_scar_face_1.png | Bin 0 -> 3244 bytes
.../vox_scars.rsi/vox_scar_face_2.png | Bin 0 -> 3126 bytes
.../vox_scars.rsi/vox_scar_neck.png | Bin 0 -> 2978 bytes
.../vox_scar_stomach_bullets.png | Bin 0 -> 3028 bytes
.../vox_scars.rsi/vox_top_surgery_long.png | Bin 0 -> 3002 bytes
.../vox_scars.rsi/vox_top_surgery_short.png | Bin 0 -> 3005 bytes
16 files changed, 224 insertions(+), 11 deletions(-)
create mode 100644 Resources/Locale/en-US/markings/vox.ftl
delete mode 100644 Resources/Locale/en-US/markings/vox_tattoos.ftl
create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png
create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png
diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl
new file mode 100644
index 0000000000..37502bc7e0
--- /dev/null
+++ b/Resources/Locale/en-US/markings/vox.ftl
@@ -0,0 +1,47 @@
+marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
+marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
+
+marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
+marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
+
+marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
+marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
+
+marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
+marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
+
+marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar
+marking-VoxScarEyeRight = Eye Scar (Right)
+
+marking-VoxScarEyeLeft-vox_scar_eye_left = Left Eye Scar
+marking-VoxScarEyeLeft = Eye Scar (Left)
+
+marking-VoxScarTopSurgeryShort-vox_scar_top_surgery_short = Thoracotomy Scar
+marking-VoxScarTopSurgeryShort = Thoracotomy Scar
+
+marking-VoxScarTopSurgeryLong-vox_scar_top_surgery_long = Clamshell Scar
+marking-VoxScarTopSurgeryLong = Clamshell Scar
+
+marking-VoxScarChest-vox_scar_chest = Chest Scar
+marking-VoxScarChest = Chest Scar
+
+marking-VoxScarNeck-vox_scar_neck = Neck Scar
+marking-VoxScarNeck = Neck Scar
+
+marking-VoxScarChestBullets-vox_scar_chest_bullets = Bullet Holes Scar
+marking-VoxScarChestBullets = Chest Scar (Bullets)
+
+marking-VoxScarStomachBullets-vox_scar_stomach_bullets = Bullet Holes Scar
+marking-VoxScarStomachBullets = Stomach Scar (Bullets)
+
+marking-VoxScarFace1-vox_scar_face_1 = Face Scar
+marking-VoxScarFace1 = Face Scar (Large)
+
+marking-VoxScarFace2-vox_scar_face_2 = Face Scar
+marking-VoxScarFace2 = Face Scar (Small)
+
+marking-VoxScarEyeRightSmall-vox_scar_eye_right_small = Right Eye Scar (Small)
+marking-VoxScarEyeRightSmall = Small Eye Scar (Right)
+
+marking-VoxScarEyeLeftSmall-vox_scar_eye_left_small = Left Eye Scar (Small)
+marking-VoxScarEyeLeftSmall = Small Eye Scar (Left)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/markings/vox_tattoos.ftl b/Resources/Locale/en-US/markings/vox_tattoos.ftl
deleted file mode 100644
index f7f3c7292c..0000000000
--- a/Resources/Locale/en-US/markings/vox_tattoos.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
-marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
-
-marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
-marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
-
-marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
-marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
-
-marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
-marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
new file mode 100644
index 0000000000..5998ddc237
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
@@ -0,0 +1,118 @@
+- type: marking
+ id: VoxScarEyeRight
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_eye_right
+
+- type: marking
+ id: VoxScarEyeLeft
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_eye_left
+
+- type: marking
+ id: VoxScarTopSurgeryShort
+ bodyPart: Chest
+ markingCategory: Chest
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_top_surgery_short
+
+- type: marking
+ id: VoxScarTopSurgeryLong
+ bodyPart: Chest
+ markingCategory: Chest
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_top_surgery_long
+
+- type: marking
+ id: VoxScarChest
+ bodyPart: Chest
+ markingCategory: Chest
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_chest
+
+- type: marking
+ id: VoxScarNeck
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_neck
+
+- type: marking
+ id: VoxScarChestBullets
+ bodyPart: Chest
+ markingCategory: Chest
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_chest_bullets
+
+- type: marking
+ id: VoxScarStomachBullets
+ bodyPart: Chest
+ markingCategory: Chest
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_stomach_bullets
+
+- type: marking
+ id: VoxScarFace1
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_face_1
+
+- type: marking
+ id: VoxScarFace2
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_face_2
+
+- type: marking
+ id: VoxScarEyeRightSmall
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_eye_right_small
+
+- type: marking
+ id: VoxScarEyeLeftSmall
+ bodyPart: Head
+ markingCategory: Head
+ speciesRestriction: [Vox]
+ followSkinColor: true
+ sprites:
+ - sprite: Mobs/Customization/vox_scars.rsi
+ state: vox_scar_eye_left_small
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
new file mode 100644
index 0000000000..7e74ffb8b6
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "vox_scar_chest, vox_scar_eye_left, vox_scar_eye_right, vox_scar_top_surgery_long and vox_scar_top_surgery_short drawn by Ubaser, vox_scar_neck, vox_scar_chest_bullets, vox_scar_stomach_bullets, vox_scar_face_1 and vox_scar_face_2 originally drawn by Ktyria(discord) edited by TrixxedHeart, vox_scar_eye_left_small and vox_scar_eye_right_small modified from vox_scar_eye_left and vox_scar_eye_right originally by Boaz1111(github) edited by TrixxedHeart.",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "vox_scar_eye_left",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_eye_right",
+ "directions": 4
+ },
+ {
+ "name": "vox_top_surgery_short",
+ "directions": 4
+ },
+ {
+ "name": "vox_top_surgery_long",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_chest",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_neck",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_chest_bullets",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_stomach_bullets",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_face_1",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_face_2",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_eye_left_small",
+ "directions": 4
+ },
+ {
+ "name": "vox_scar_eye_right_small",
+ "directions": 4
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png
new file mode 100644
index 0000000000000000000000000000000000000000..59c04641bd2ffcdbd570284357a144218536360f
GIT binary patch
literal 3165
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600C)9L_t(|obB47ZUR9N2H;s!
zLa5@QP<8b^3FuRsATPnN8dg$&4%2%SETV?P6hDY&lS}39^d=Mj{{iM^znM!e*>lWH
z&m0E;002O{2h{)o0001hb`PonfD}OMJ-=_aPNdj~&k+G=y=Nk#`|Uy$B2+QDQ`7LceCKSfBbZ_!0yF005xf
zgK7W(0000$y9d<(00000fOZe60RR91008YCR09A20Khgt7XtrWuS7(Yb31JsAYIUw
z)G!P1wcGK%@3W>pj7fmfwI9YDKw5jLpEAq=e6H90vEMt1_n*ihz;U(W>TqxgqO_hl
zfE1}Kdb0ph0RR91008YCR09A20002mJ*Wl%&kpba+>K9=4xDnc00000NkvXXu0mjf
D4e{Ne
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff9bff22762fb324cac8e3d0de03c96c5c2bfe37
GIT binary patch
literal 3065
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R16009L_L_t(|obB2%5`r)gg<*0B
zdRrSkhLy+h7#xR+V@N|w&mGn(GZc<9fh8}I|5bMT_!6+$U}nvk6951J0Cfjx00000
z0Ms3%0RR91_5n00000
z>JHKX00000s5?jl00000pza_I00000fVzV;000000O}6O@!S!p62LRn0Ti_#phz+M
z0soR}0gBiWQpRg1p;`d1000000H`}i0{{R30HE$5&FKL?5^X<_rdW}T00000NkvXX
Hu0mjfzrd`6
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b369711f3b8808825b80ea99f40c6444c0b1feb7
GIT binary patch
literal 3011
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R16007TPL_t(|obB165yC(aMq#cF
z8bG816b?b^h+j~1fVyd2_S#~WdOXVTQs{v_78M10CQCgz;n37raRSp0pG_xmfL;30COdP
z00Ia=Z$J}3009J`H=qe1fB*u}8_)z0KmY;g4QSN^`~VSe(}65(%47fl002ovPDHLk
FV1k)#kaqw8
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc01b19b01ad5553549e93980f1175b95c49669
GIT binary patch
literal 2992
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R16006v6L_t(|obB165yAivL{ZWW
zf(lT0s3Q`E1pzh+nL5Cur~pAXM-LgoPRRQe?7TU5O;s)CTmt|Afb@oF0EPg(Z(S{S
zhh~I5KhFgW0eJSOTDNBx@DBk1002OGLo@&Y002mDhz0-v008L?(EtDd03f{~8UO$Q
z0HilW0{{TP_W@q_Ypu5XNqmo8z!(6J{!*Lv=mMq?00000q&GwZ0001h^oD2v0001x
m-VhA{0002e8=?W2JHQ8hlFxxd>Ki5i0000f6
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R16007HLL_t(|obB1M5dmQog;86F
z1_UY)$pqA~kr7D=NJU1pbr8rzDiCNu9lsuob!YAQD!6mzWv?ow4EkIJ004mWhG+mj
z0eGGdWwcmVE$sPuF5nY@d$TQ*dglWEApigX07!3$1^@s60O<|U00000AiW_P00000
zq&GwZ0001h^oD2v008(tz~gc(aGC%B002ovPDHLkV1mWJ
BkhcH;
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..76efe1412f15126f2450ffa9466407ec88f3a55f
GIT binary patch
literal 2993
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R16006y7L_t(|obB165du*VL_sba
z1QDR{5XVUr76e!n^5OuGA_4^2EJ=Kr`gQ#xnCe=$Lsc#2+yDRofb@oF09pWi?$=uG
z4nu=If6oQ90C-KOT90QJ&|?4q005BQ5DfqT007b(q5%K^06=;}Gynhq07!3$1^@s6
z0O<|U0002c2f+JrtJQYj`~%$$z_02C;5l7tGag+)>i_@%03f{~8UO$Q0HilW0{{R3
nfb@oF00000klqjtz}x}8U1iUKS@@dn00000NkvXXu0mjfwF-zF
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c19ce0cf398a692f66e7f7d234b447119f8377aa
GIT binary patch
literal 3244
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%0Dy!50Qvv`
z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01m?d01m?e$8V@)0000RbVXQn
zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600Fp3L_t(|obB4NO2beT2H-!7
zQw`YaA_NDa3f;sa?J9ypaS;S3T_i7&F;9@KxR^J#Z|Za>)JBs&ojWcZJ9L4Y2PnyGK+UoM03F9M0@s!7
zbNTJfKe=W=&-0|-Y-4kO4*;;XvA&Xn2XX==VI-3tgsT|71_?j_0%-T38Uhf200hwP
zK{W&*009V~-GgcfKmY;|K)VOk5P$##Ab@rcswo7Jgpu^$UQlngCvKU~GiB8-1km$5
zNe2S}KT&QlL
z8IWz2r*Vv$Wi4!rJaApfY91V)>Meo5b){mO7>`DU@5HR}ZCiF4jnZnC@)pR}f6
zXi@@54ZTQ_E-Enz5K6$103tR-RB%L5k){YTDBysjLy@r}iiH7DvFijGMAUI`6dRUF
zWUU$Bym{}eS9UO(Z2>7`&z9wUXbV-Il#&6`Y8GKGQ04S2&F6MJnWNa;Ck|;8QE#r9r;7G||@X{|>
z%+C|c55>;RS}qbKr-&IQTvLXPlM{>K&(BTgi^a?^4mXV>;xX8n8Ce|RasXz}{8imI52H3ZN4bfe_i~WlJ|C&UW9+{8AKoW!}eExnGFE2re(F+`iE_46#!l9
z0Z_aBhs|Iw0E)7{bq;-T9=d#9QpDmcXDh4R++0fmpKB>E=%LdZt9g$j;($`3&Zthxi`{{&gM}5&R^+h%b~yM9Zd3AWW9ETgVfL
z1(`yIK=_}U_z%PWq}jQaiQ4!P(3V&Nr6C$XejWfQDiI(Fdt@un?|lo#M+5oIi_w{w
zo%_#%{(V=tO#a9gB!7-$M?^BX5>d|Vn*3S!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?
z=qPj=x&RGBx1dpI68aT-2O}^EromdU5o`ssU{5#*j)WJ%$?!5bA1;Eoz?EiTr=n?cd`V|I)p<|3Oju?MT93~aB0<#&j8`F+Cg&D?-VWzQItUA^l>xvD
zRIYI4MQ`g1<+DyrL=EogS06Xii({|
zv`U^zjmmKqDIK93(F5q|^fLNk`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6b
zsWa4l)YH_rsduU0(?DsMX@qO!YV6TCtMPOWZH~(v?wpc2hv(eZgf-1HBQ#fN?$aF5
zoYvCT^3%%Fs?s{6^;Da#?V+8jy+iwi_M{F~$4y6|vqR^k&SQoO!;_KDsATjprgSxR
z{dFa}^}2()GkV5)QF?`X?Rxk03HmJkB>f%wz4}uIItC#I1qQ7Kw+-=zEW;GTU55RJ
zuZ@h2VvIHzbs0S}Rx=JT&Npr~zH34@aW`3J(qMAU6l2OVO*7qXdf5y%vo}jIt1%lg
zhs_<#1?IcWhb_<+P8LFo28$a^64R5J!)#@aTGB0pEekEXET35!SjAgyv+B3{Xl-wu
zZrx~o$A)4PXj5p@WAm%6nJw40#`fA=@?77!tLJvleQsxN$G6*KchjC~A7a13zSsVP
zgQJ7Uq0M2^(ZDg$vDWbhi^d9LZDyT!LOXdmt#&%*^w!zIS?qk+`4<X~g?%56
z2@eae34a)26HyS+zks@6$%2*zuOhu7%OdYYnM6sVdZQJi6QY}=U&naIl*dS8tzuWk
zUW(I*6U24LW8