iaada
29dda7949f
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
2025-09-05 17:07:09 -05:00
PJBot
d8400c6520
Automatic changelog update
2025-09-05 20:04:17 +00:00
IProduceWidgets
dcd0f10070
Drink outta da toiler ( #40133 )
...
* totally unrelated to any other recent additions
* dispare
* enum
2025-09-05 22:03:10 +02:00
Pieter-Jan Briers
816f6ed2fc
Fix admin logs going to admin chat ( #40141 )
...
Oops
2025-09-05 20:54:05 +02:00
Myra
5d3de5d1aa
Add a space in osx-arm64 to fix arm64 osx builds ( #40137 )
2025-09-05 20:41:08 +02:00
Tayrtahn
8f44b5e30b
Add water cooler interaction test ( #39612 )
...
* Add altInteract option to interaction test helper methods
* Add water cooler interaction test
* Oops, that's not a NetEntity
* Is.Not.Empty
* SPlayer
* Assert.Multiple
* Document parameters
2025-09-05 19:05:49 +02:00
PJBot
d1c41d0373
Automatic changelog update
2025-09-05 16:24:14 +00:00
Matt Idzik
d4b9b45bdd
Adjusted minimumPlayers for Wizard midround events. ( #38424 )
...
* Adjusted minimumPlayers for Ninja and Wizard midround events
Wizard from 10->20
Ninja from 30->20
20 players matches Dragon and Loneop.
* Wizard midround minimum players from 20 to 30
* Update Resources/Prototypes/GameRules/events.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-09-05 18:23:06 +02:00
PJBot
a9ffbdcdae
Automatic changelog update
2025-09-05 15:57:04 +00:00
IProduceWidgets
e931771459
Expedite gender reassignment ( #36894 )
2025-09-05 11:55:54 -04:00
Leon Friedrich
828b1f2044
Rejig LogStringHandler ( #30706 )
...
* Rejig LogStringHandler
* Fix session logs
* Fix properly
* comments
* IAsType support
* Fix mind logs
* Fix mind logging AGAIN
---------
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com >
2025-09-05 14:22:49 +02:00
PJBot
f45bf4590f
Automatic changelog update
2025-09-05 10:44:25 +00:00
ScarKy0
b2c9106839
Vulpkanin Species ( #37539 )
...
* [April Fools] Elf species (#35353 )
elf
* [April Fools] Juice that makes me go insane (#35370 )
* kill me
* MAKE IT STOP
* is it finally over?
* web edit
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
* WEBEDIT PLEASE
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* vulpkanin species
the ultimate april fools joke
Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com >
* cant be bothered
* make build and test debug run on the april fools branch (#35396 )
welp
* Revert "[April Fools] Juice that makes me go insane (#35370 )"
This reverts commit fcbdcf8452#35353 )"
This reverts commit 704293a051#1 )
* Modified aesprite tools
* WIP
* wipperoni
* We are done here, wawa
* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"
This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.
* Resolve merge issue
* Fix Urist McVulp forgetting his fursuit
---------
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com >
* re-add ears and husk overlay
* revert adding ears to vox
* Crest Markings
* Fade Markings
* Sharp Markings
* microbalance + comments
* censor character nudity option compliance
* Ear Markings
* 1984 wagging animations
* Tail Markings
* tail wag icon
* annoyance
* guidebook
* slight temperature tweak
* seperate out snouts, port over 2 markings for testing
* fix
* seperate snout file
* Snout/Head Markings
* cleanup + locale for ears
* Head and Snout loc
* gray eyes
* crest and husk cleanup
* Tail and Chest loc
* Legs and Arms loc
* most important commit
* mime vulps like rations too
* missing loc
* microbalance
* not needed
* goatee
* white eyes
* harmony feedback tail fixes
* personal changes and fixes after playing
* fix fluffy tail clipping
* Sprite fixes, displacement fixes (#2 )
* Tune head displacement
* Vulps Sprite Tuning
* helmets
* detail
* Urist
* wag
* comban't
* fix attributions
* remove vulp biosuits
* fix vulp beards
* fixed up ears
* comment note
* further ear tweaks
* engi helmets
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com >
2025-09-05 12:43:17 +02:00
Skye
d89f0682e6
fix a typo in the comments for game.ipintel_exempt_playtime ( #40129 )
2025-09-05 12:09:48 +02:00
Princess Cheeseballs
d488ca96b2
Alerts Cleanup and API ( #39544 )
...
* alert cleanup and API
* I expect update loops to be at the top.
* Address review
* Address review x 2
* Merg my PR
* Fix
* Update Content.Shared/Alert/AlertsSystem.cs
webedit
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
* FIX THAT TEST FAIL!!!!
* Me when I forget to actually give you alerts
* Hammedborgar
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
2025-09-05 12:45:48 +03:00
PJBot
5e0e5e045a
Automatic changelog update
2025-09-05 07:48:38 +00:00
ArtisticRoomba
99cdbfc431
Give shutters the DeltaPressure component ( #40126 )
2025-09-05 00:47:31 -07:00
PJBot
63a17312cc
Automatic changelog update
2025-09-05 07:11:01 +00:00
ArtisticRoomba
1db8496dd7
Fix DeltaPressure damage not capping beyond a certain pressure ( #40125 )
2025-09-05 00:09:54 -07:00
SpaceLizard
4125d28b75
Fixed a error in the "Adventures of Ian and Renault" books ( #39932 )
...
Fixed a publication error in the "Adventures of Ian and Renault" book series.
The editor of these books have been taken out back and shot.
2025-09-05 02:42:57 +02:00
āda
60d1d2c9b1
Fix xenoborg action icons ( #40118 )
...
commit
Co-authored-by: iaada <iaada@users.noreply.github.com >
2025-09-05 00:48:27 +02:00
PJBot
36dfc79797
Automatic changelog update
2025-09-04 22:47:51 +00:00
CawsForConcern
a8ba84ecf7
Fixes Theobromine missing from Iced Coffee ( #40063 )
...
adding ice to coffee no longer removes its theobromine
2025-09-05 00:46:44 +02:00
PJBot
b15132585b
Automatic changelog update
2025-09-04 21:04:18 +00:00
Princess Cheeseballs
01a7fc66f0
Can't crawl over counters ( #40099 )
...
Counters and Tables separation
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2025-09-04 14:03:10 -07:00
Pieter-Jan Briers
ad3874b8cd
Skip MapImages folder in packaging ( #38928 )
2025-09-04 22:50:46 +02:00
PJBot
9f65cf7a75
Automatic changelog update
2025-09-04 19:38:22 +00:00
ScarKy0
467f19b58e
Reuse lathe queue instead of redrawing ( #39886 )
...
* init
* init
* PUSH!!!
* //
* Me when the when the me when the
* review
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2025-09-04 21:37:15 +02:00
PJBot
587d9ad191
Automatic changelog update
2025-09-04 19:12:11 +00:00
Quantum-cross
52c903cab8
Dynamic anomaly scanner texture ( #37585 )
2025-09-04 22:11:03 +03:00
āda
12e8697648
Organize JobIconPrototype yml ( #39774 )
...
grouped
Co-authored-by: iaada <iaada@users.noreply.github.com >
2025-09-04 20:58:17 +02:00
Nemanja
7dbe1b219c
Improve Gas Yaml Serialization ( #40070 )
...
* Make yaml gas serialization cleaner
* fix exception
* fix validation code
* rudimentary test & permissive loading
* change it a bit
* Test fixes and adjustments
2025-09-04 20:48:46 +02:00
Pieter-Jan Briers
d33478e41f
Package win-arm64 and osx-arm64 servers ( #40113 )
2025-09-04 19:33:44 +02:00
Myra
0daccbf457
Stop packaging Resources/ServerInfo and Resources/Changelog on the server ( #39897 )
...
* Stop packaging `Resources/ServerInfo`
This is only used by the client, it is unneccery to pack into the server. Plus it keeps getting people to think that just editing the server resources will modify the guidebook even though that needs a custom dev enviroment.
* Add credits too
2025-09-04 18:38:41 +02:00
PJBot
90dcf83471
Automatic changelog update
2025-09-04 15:43:42 +00:00
VoidMeticulous
df4d923a9b
Add 2.25 second delay to scurret petting ( #40097 )
...
Add 2.25 second delay to scurret petting rate
2025-09-04 17:41:45 +02:00
Winkarst-cpu
f521ec31de
Fix: Ability to open AHelp in the lobby by pressing the hotkey ( #39525 )
...
* Fix
* Update
2025-09-04 16:24:53 +02:00
PJBot
c51104952e
Automatic changelog update
2025-09-04 13:04:57 +00:00
Samuka-C
2f3d976c33
Fool players with decoy presets ( #40053 )
...
* added secret gamepresets
* cut down on alias
* remove all secret presets
* change the command to allow for a secret argument
* update test
* moved the secret argument after the number of rounds argument
* added completions
* localization and use of CompletionHelper.Booleans
* command now has a option for a decoy preset
* fixed decoy message in the end
* ops
* clean up
* hint 2
* improve localization
---------
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
2025-09-04 15:03:47 +02:00
PJBot
427e4a88ea
Automatic changelog update
2025-09-04 11:18:59 +00:00
DDDragoni
ed12c1d3f5
Telepad Label Fix ( #39975 )
...
Fixed telapad order labels showing wrong account
2025-09-04 13:17:52 +02:00
PJBot
d7fd4cfb80
Automatic changelog update
2025-09-04 11:09:32 +00:00
jkwookee
348f462b12
Fix QM Golden Knuckledusters not being a objective ( #40096 )
...
test
2025-09-04 13:08:25 +02:00
PJBot
a6be4ff338
Automatic changelog update
2025-09-04 03:18:46 +00:00
Quantum-cross
70ffc1eb5d
Add heat distortion shader for hot gases ( #39107 )
2025-09-03 20:17:39 -07:00
PJBot
3d89584860
Automatic changelog update
2025-09-04 01:10:00 +00:00
ArtisticRoomba
723a0030ba
Give inflatable walls the DeltaPressure component ( #40098 )
...
give inflatable walls the deltapressure component
2025-09-03 18:08:53 -07:00
PJBot
53c9f336cf
Automatic changelog update
2025-09-03 23:59:56 +00:00
ArtisticRoomba
20f2cb920b
Atmos Delta-Pressure Window Shattering ( #39238 )
...
This PR adds delta-pressure damage. In short, airtight structures can now take damage proportional to the difference in pressures between the sides of the structure.
2025-09-03 16:58:48 -07:00
VoidMeticulous
f63eb2e97a
Remove unused combat-equipped-helmet ( #40095 )
...
Remove unused combat-equipped-helmet and combat-equipped-helmet-dog
2025-09-03 15:52:40 -07:00
