Skip to content

Commit 8a0b8c3

Browse files
authored
Merge branch 'space-wizards:master' into ed-14-10-2025-cooking-refactor
2 parents 9549dce + e933085 commit 8a0b8c3

File tree

22 files changed

+1234
-58
lines changed

22 files changed

+1234
-58
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
book
2+
3+
# Jetbrains (Rider, etc) project config folder
24
.idea/
35

4-
# editor files
6+
# Editor files
57
.*~
68
*.swp
79

8-
# VSCodium files
10+
# VSCode and VSCodium project config folder
911
.vscode/
12+
13+
# Obsidian vault config folder
14+
.obsidian/

src/SUMMARY.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ Space Station 14
242242
- [Signaller Rework](en/space-station-14/departments/engineering/proposals/signaller-rework.md)
243243

244244
- [Medical](en/space-station-14/departments/medical.md)
245+
- [Medical Workgroup](en/space-station-14/departments/medical/medical-workgroup.md)
246+
- [Chemistry](en/space-station-14/departments/medical/chemistry.md)
245247
- [PR Guidelines](en/space-station-14/departments/medical/guidelines.md)
246248

247249
- [Proposals]()
@@ -364,6 +366,11 @@ Maintainer Meetings
364366

365367
----------------------
366368

369+
- [2025-11-08](en/maintainer-meetings/maintainer-meeting-2025-11-08.md)
370+
- [2025-10-25](en/maintainer-meetings/maintainer-meeting-2025-10-25.md)
371+
- [2025-10-11](en/maintainer-meetings/maintainer-meeting-2025-10-11.md)
372+
- [2025-09-27](en/maintainer-meetings/maintainer-meeting-2025-09-27.md)
373+
- [2025-09-13](en/maintainer-meetings/maintainer-meeting-2025-09-13.md)
367374
- [2025-08-30](en/maintainer-meetings/maintainer-meeting-2025-08-30.md)
368375
- [2025-08-16](en/maintainer-meetings/maintainer-meeting-2025-08-16.md)
369376
- [2025-08-02](en/maintainer-meetings/maintainer-meeting-2025-08-02.md)
561 KB
Loading

src/en/community/admin/wizards-den-mrp-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This is the ban policy for Wizard's Den servers. It applies only to our first-pa
1010
- **Strike:** A strike is a type of warning that will result in Dewhitelisting should too many be accrued.
1111
- **Dewhitelist:** The removal of an account's ability to join Wizard's Den MRP servers.
1212
- **Permanent Dewhitelist:** A Dewhitelist which prevents a player from applying for a whitelist again in the future.
13-
- **Endorsement:** An endorsement is formal support from a whitelisted player to a non-whitelisted player. An endorsed whitelisted player may have their Whitelist Application accepted even if they do not meet our playtime requirements.
13+
- **Endorsement:** An endorsement is formal support from a whitelisted player to a non-whitelisted player. An endorsed whitelisted player may have their Whitelist Application accepted even if they do not meet our playtime or account age requirements.
1414
- **Player Report:** A report by a player that does not necessarily allege a violation of the rules, but reports another player for creating experiences that are not consistent with the roleplay standard of MRP.
1515

1616
## Special Punishment Requirements

src/en/general-development/codebase-info/conventions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,10 @@ There's an exception to this, however.
478478
You may use Method Events as long as they're wrapped by an Entity System Method.
479479
In the example above, this would mean that `DamageableSystem.ChangeDamage()` would internally raise the `ChangeDamageEvent`, which would then by handled by any subscriptors...
480480

481+
```admonish info
482+
Ensure events are unsubscribed from when systems are shutdown. Proxy methods like `Subs.CVar()`or `SubscribeLocalEvent` already take care of it, note that you do not need to unsubscribed inside managers, as their lifetime ensures that when they shutdown, the rest of the client / server is also shutting down, making unsubscribing not necessary.
483+
```
484+
481485
### Event naming
482486
- Always suffix your events with `Event`.
483487
Example: `DamagedEvent`, `AnchorAttemptEvent`...

src/en/general-development/setup/server-hosting-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ If you wish to modify your server to add your own content or rules. You will nee
1010
```
1111

1212
1. (Windows Only) Download and install the [Latest Microsoft Visual C++ Redistributable version](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version). (Resolves "Unable to load DLL libsodium" and similar errors)
13-
2. Download and install the [.NET 9 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) located at the bottom left colum. Make sure you get the ``x64`` version for your operating system. If you know how to use winget ``winget install Microsoft.DotNet.Runtime.9``
13+
2. Download and install the [.NET 9 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) located at the bottom left colum. Make sure you get the ``x64`` version if you are on Intel/AMD (Or downloading an Intel server to use on an Apple Silicon Mac) or the ``arm64`` on Snapdragon/Apple Silicon chips (M1,M2,M3 etc) for your operating system.
1414
3. Download the latest stable version of the server from [our builds page](https://wizards.cdn.spacestation14.com/fork/wizards) (or if you are looking for latest testing/vulture builds download from [here](https://wizards.cdn.spacestation14.com/fork/wizards-testing/) for your operating system. If you are looking for another fork, ask that fork if they have a server builds page. Otherwise refer to the [Custom Code](#level-2-server-with-custom-code) section below.
1515
4. Extract the downloaded zip to a directory somewhere, you may use any Archive program such as 7Zip, Winrar or even the one built into Windows.
16-
5. (Mac and Linux only) run `chmod +x Robust.Server`. This only needs to be run once and again each time you download a new build.
16+
5. (Mac and Linux only) Run `chmod +x Robust.Server` [within a terminal inside the folder you extracted the server in.](#running-the-server-on-macos-or-linux) This only needs to be run once and again each time you download a new server update.
1717
6. Run `run_server.bat` (Windows) or `./Robust.Server` [via terminal on macOS/Linux](#running-the-server-on-macos-or-linux)) and wait until the console windows says "Ready". Do NOT close the console window until you are done playing on your server.
1818
7. Open your Space Station 14 Launcher and click on ``Direct Connect To Server`` and type in ``localhost`` as an IP address and click connect. You can also add it as a favorite if you click the ``Add Favorite`` button using the same IP address.
19-
8. When there is a new update. Go back to the 2nd step, and copy over the ``data`` folder and ``server_config.toml`` (if you modified it) from your old server files to the new server files.
19+
8. (Optional) When there is a new update. Go back to the 2nd step, and copy over the ``data`` folder and ``server_config.toml`` (if you modified it) from your old server files to the new server files if you like to move over the saved data on the server.
2020

2121
If you are having trouble understanding what to click, here is a quick video. Subtitles contain some extra information if needed.
2222

src/en/general-development/tips/beginner-faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
Go to [Issues in Space Station 14](https://github.com/space-wizards/space-station-14/issues)
88
- Choose 1 or more of the following labels in [Labels](https://github.com/space-wizards/space-station-14/labels)
9-
1. [Beginner Friendly](https://github.com/space-wizards/space-station-14/labels/Beginner%20Friendly)
10-
2. [Difficulty: 1 - Easy](https://github.com/space-wizards/space-station-14/labels/Difficulty%3A%201-Easy)
11-
3. [No C#](https://github.com/space-wizards/space-station-14/labels/No%20C%23) to work on issues that require no code.
9+
1. [Beginner Friendly](https://github.com/space-wizards/space-station-14/labels/DB%3A%20Beginner%20Friendly)
10+
2. [Difficulty: 3 - Low](https://github.com/space-wizards/space-station-14/labels/D3%3A%20Low)
11+
3. [No C#](https://github.com/space-wizards/space-station-14/labels/Changes%3A%20No%20C%23) to work on issues that require no code.
1212

1313
After you have chosen an issue to fix, follow the steps here to start making and testing code changes on your own copy of the Space Station 14 code:
1414
- [Setting up a Development Environment](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html)
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# Maintainer Meeting (13 September 2025)
2+
3+
```admonish info
4+
5+
**Attendees:**
6+
- Myra
7+
- ArtisticRoomba
8+
- Errant
9+
- Scarky0
10+
- Slarti
11+
- Simyon
12+
- Tiniest shark
13+
- Slam
14+
- Julian
15+
16+
```
17+
18+
This meeting was recorded:
19+
20+
{% embed youtube id="N5-UYCLha2I" loading="lazy" %}
21+
22+
## De-enumifying skin colors (ScarKy0)
23+
We have two PRs that do the same thing, we should probably decide which one to use. While not a major blocker for anything, it would be good to get them in the same release as Vulpkanins due to them needing some sort of color clamping. (Read my notes under the PR below)
24+
- We will look at and merge Jannet's PR and notify scar when its merged.
25+
- Blocker for merge
26+
27+
## Stable review
28+
29+
:::info
30+
Write your name here if you read this list fully.
31+
**I checked this PR list:**
32+
- ScarKy0
33+
- Errant
34+
- Princess
35+
- Slarti
36+
- Tiniest Shark
37+
:::
38+
39+
- [#37661](https://github.com/space-wizards/space-station-14/pull/37661) Add senior courier PDA for cargo techs
40+
- [#38144](https://github.com/space-wizards/space-station-14/pull/38144) Fix small issues with Text Highlighting
41+
- [#39358](https://github.com/space-wizards/space-station-14/pull/39358) Updated Aseprite Tools
42+
- [#39948](https://github.com/space-wizards/space-station-14/pull/39948) Remove a default Cyborg name
43+
- [#39950](https://github.com/space-wizards/space-station-14/pull/39950) Stop Sentience Event targeting Zombified Creatures
44+
- [#35236](https://github.com/space-wizards/space-station-14/pull/35236) Sentry turrets - Part 7: Electronics and construction graphs
45+
- [#38774](https://github.com/space-wizards/space-station-14/pull/38774) Scurrets - can wear pet bags, mail bags and spears
46+
- [#39989](https://github.com/space-wizards/space-station-14/pull/39989) Messy drinker immunity and cleanup
47+
- [#39931](https://github.com/space-wizards/space-station-14/pull/39931) Clown bags squeak when inserting items
48+
- [#39880](https://github.com/space-wizards/space-station-14/pull/39880) Do after checks for being inside container
49+
- `Princess`: BLOCKER. This has broken meatspikes. You can no longer butcher entities on them, and can't pull entities off of meatspikes. I have a fix PR up I need to rebase to stable.
50+
- [#40299](https://github.com/space-wizards/space-station-14/pull/40299)
51+
- [40026](https://github.com/space-wizards/space-station-14/pull/40026) Lizard Tails Can Be Hidden By Clothing
52+
- [39718](https://github.com/space-wizards/space-station-14/pull/39718) Update 4 visitor shuttles & nanomed inventories
53+
- [39859](https://github.com/space-wizards/space-station-14/pull/39859) Adds a secHUD to the noir-tech glasses
54+
- [39810](https://github.com/space-wizards/space-station-14/pull/39810) Trimmed Sentience Targets from Corgis Smile and Cockroaches
55+
- [39351](https://github.com/space-wizards/space-station-14/pull/39351) Helm + Mask Displacements for Reptilians (and some unique helmets)
56+
- [39083](https://github.com/space-wizards/space-station-14/pull/39083) Some more vox customization
57+
- [39814](https://github.com/space-wizards/space-station-14/pull/39814) Add inhand sprites to Cartons and Cups, give new inhands to Cans.
58+
- [39894](https://github.com/space-wizards/space-station-14/pull/39894) Burger Inhands
59+
- [40085](https://github.com/space-wizards/space-station-14/pull/40085) Berry Delight recipe edit
60+
- [39238](https://github.com/space-wizards/space-station-14/pull/39238) Atmos Delta-Pressure Window Shattering
61+
- `ROOMBA`: This has a major bug that affects thindows, I know how to fix it but I don't have any time in my life right now to afford it. Non-blocking.
62+
- [40098](https://github.com/space-wizards/space-station-14/pull/40098) Give inflatable walls the DeltaPressure component
63+
- [39107](https://github.com/space-wizards/space-station-14/pull/39107) Add heat distortion shader for hot gases
64+
- `Scar`: BLOCKER. The shader is currently broken in negative tile coordinates. We need to hotfix the fix [#40228](https://github.com/space-wizards/space-station-14/pull/40228) and [#40186](https://github.com/space-wizards/space-station-14/pull/40186)
65+
- [40053](https://github.com/space-wizards/space-station-14/pull/40053) Fool players with decoy presets
66+
- [40097](https://github.com/space-wizards/space-station-14/pull/40097) Add 2.25 second delay to scurret petting
67+
- [40099](https://github.com/space-wizards/space-station-14/pull/40099) Can't crawl over counters
68+
- `Princess`: Needed feature but I worry it's poorly communicated to players, also this affects mice's ability to enter the kitchen on several maps. We may want to look at the fixture layers we have in the future, we have one layer literally only used by the singularity that we could use if needed that could be repurposed as a "floor collision" layer for very short entities.
69+
- `Slarti`: Distinguishing between tables and counters is not a good way to solve this since there is no good visual indication which is which. I would prefer reverting this and finding another solution, or prevent crawling under any table, but keep the ability for mice to move below them.
70+
- `Scar`: I agree to reverting until we get some proper way to handle fixtures.
71+
- [BLOCKING] REVERT VOTE: Revert, keep
72+
- [40063](https://github.com/space-wizards/space-station-14/pull/40063) Fixes Theobromine missing from Iced Coffee
73+
- [39932](https://github.com/space-wizards/space-station-14/pull/39932) Fixed a error in the "Adventures of Ian and Renault" books
74+
- [40126](https://github.com/space-wizards/space-station-14/pull/40126) Give shutters the DeltaPressure component
75+
- [37539](https://github.com/space-wizards/space-station-14/pull/37539) Vulpkanin Species
76+
- `Scar`: This is the best day this project had ever since the release of Station AI. Yip Yap Growl Whine.
77+
- `Scar`: For real though, vulpkanin colors arent currently clamped due to the PR allowing to do so being unmerged. While I wouldn't count this as a blocker, it would be good to get that PR in right now, as to not break any characters next stable. [#40067](https://github.com/space-wizards/space-station-14/pull/40067) or [#39175](https://github.com/space-wizards/space-station-14/pull/39175). Notify me once either gets merged and I'll make the PR for clamping the colors.
78+
- `Slarti`: I would consider this a blocker for the release. Currently you can pick extremely saturated colors, and if we fix it at a later point players will complain that we are breaking their characters, so this should be part of the initial release.
79+
- [BLOCKER] ee above and above meeting note
80+
- [38424](https://github.com/space-wizards/space-station-14/pull/38424) Adjusted minimumPlayers for Wizard midround events.
81+
- [40133](https://github.com/space-wizards/space-station-14/pull/40133) Drink outta da toiler
82+
- `Errant`: Do you think god stays in heaven because he too lives in fear of what he has created?
83+
- `Slarti`: God is dead and we killed him.
84+
- [40158](https://github.com/space-wizards/space-station-14/pull/40158) Revert antique laser and appraisal tool sizes
85+
- [31213](https://github.com/space-wizards/space-station-14/pull/31213) Add some alternate jumpsuit designs which can be toggled
86+
- [40194](https://github.com/space-wizards/space-station-14/pull/40194) Atmos dP Guidebook Entry
87+
- `ROOMBA:` Still needs guidebook links on inspect. Non-blocker, just a pain to do considering guidebook inheritance.
88+
- [39983](https://github.com/space-wizards/space-station-14/pull/39983) Being grappled with a grapple gun allows you to cross chasms
89+
- [40211](https://github.com/space-wizards/space-station-14/pull/40211) Lets diona sap trigger artifact blood nodes
90+
- [40206](https://github.com/space-wizards/space-station-14/pull/40206) Derelict Mediborgs can Scan Solutions and see Mob Health
91+
- [37113](https://github.com/space-wizards/space-station-14/pull/37113) Add support for contraband text to the reagent guidebook
92+
- [39024](https://github.com/space-wizards/space-station-14/pull/39024) "idk" no longer shrugs, instead sanitizing to "I don't know"
93+
- [40265](https://github.com/space-wizards/space-station-14/pull/40265) Make Butterflies zombie immune
94+
- [32139](https://github.com/space-wizards/space-station-14/pull/32139) Add admin shuttles
95+
- [40143](https://github.com/space-wizards/space-station-14/pull/40143) No take; Only throw.
96+
- [39203](https://github.com/space-wizards/space-station-14/pull/39203) Food Item Size Adjustment
97+
- [39879](https://github.com/space-wizards/space-station-14/pull/39879) Added SmartFridge circuitboards
98+
- [40294](https://github.com/space-wizards/space-station-14/pull/40294) Clake frag round fix
99+
- `Errant`: What impact does this have on the weapon's DPS, does balance/pricing need to be revisited? Was this considered when merging?
100+
- `Princess`: The grenade had its explosive damage reduced heavily in a different PR and was given projectiles instead to make up for it. Trigger refactor broke it so the projectiles wouldn't fire, this just makes them fire.
101+
102+
### The maint meeting buffet
103+
unlike admin meets, we have food here.
104+
ps: if you dont bring anything i will bully you
105+
- Myra: Chicken nuggets
106+
- Simyon: Hamburgers
107+
- Scar: Chocolate
108+
- Julian: Chicken soup
109+
- Tiniest Shark: Cheap Pizza
110+
- Roomba: those really cheap paper-tasting fortune cookies from panda express
111+
- CptJeanLuc: Crispy Fried Vox Wings
112+
113+
114+
:::info
115+
Weeks without non-squashed merges: 0
116+
Please install Myra's warning script.
117+
:::

0 commit comments

Comments
 (0)