]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
3 months agoMerge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash
SlamBamActionman [Thu, 11 Sep 2025 15:08:39 +0000 (17:08 +0200)]
Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash

3 months agoRemove unused BulletTennis (#40285)
ScarKy0 [Thu, 11 Sep 2025 14:36:39 +0000 (16:36 +0200)]
Remove unused BulletTennis (#40285)

init

3 months agoFix Linter errors (#40283)
SlamBamActionman [Thu, 11 Sep 2025 13:17:37 +0000 (15:17 +0200)]
Fix Linter errors (#40283)

Fix yoml

3 months agoThey're milk jugs, not milk cartons!
SlamBamActionman [Thu, 11 Sep 2025 12:02:05 +0000 (14:02 +0200)]
They're milk jugs, not milk cartons!

3 months agoAutomatic changelog update
PJBot [Thu, 11 Sep 2025 11:38:33 +0000 (11:38 +0000)]
Automatic changelog update

3 months agoFood Item Size Adjustment (#39203)
SlamBamActionman [Thu, 11 Sep 2025 11:37:25 +0000 (13:37 +0200)]
Food Item Size Adjustment (#39203)

3 months agoClip the WindowTitle of FancyWindows, so close buttons don't get hidden (#40272)
Charlie Morley [Thu, 11 Sep 2025 11:23:47 +0000 (05:23 -0600)]
Clip the WindowTitle of FancyWindows, so close buttons don't get hidden (#40272)

ClipText of FancyWindow title, so close buttons don't get hidden

3 months agoAutomatic changelog update
PJBot [Thu, 11 Sep 2025 10:58:38 +0000 (10:58 +0000)]
Automatic changelog update

3 months agoNo take; Only throw. (#40143)
IProduceWidgets [Thu, 11 Sep 2025 10:57:30 +0000 (06:57 -0400)]
No take; Only throw. (#40143)

* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
3 months agofix chasmsystem resolve error (#40281)
slarticodefast [Thu, 11 Sep 2025 10:00:55 +0000 (12:00 +0200)]
fix chasmsystem resolve error (#40281)

3 months agoFix APC breaker toggle button prediction by setting ToggleMode True (#40273)
Absotively [Thu, 11 Sep 2025 04:27:17 +0000 (22:27 -0600)]
Fix APC breaker toggle button prediction by setting ToggleMode True (#40273)

* Use ToggleMode for toggle button

* Actually this bit doesn't require changing apparently

3 months agoFix darts inhand sprites (#40207)
GeneralGaws [Thu, 11 Sep 2025 03:50:57 +0000 (06:50 +0300)]
Fix darts inhand sprites (#40207)

fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
3 months agoAutomatic changelog update
PJBot [Thu, 11 Sep 2025 02:38:17 +0000 (02:38 +0000)]
Automatic changelog update

3 months agoLaser rifle is contraband again (#40253)
ToastEnjoyer [Thu, 11 Sep 2025 02:37:10 +0000 (21:37 -0500)]
Laser rifle is contraband again (#40253)

* Fixed contraband tag

* practice isnt contraband

* Added base

* Removal

3 months agoAutomatic changelog update
PJBot [Thu, 11 Sep 2025 01:48:04 +0000 (01:48 +0000)]
Automatic changelog update

3 months agoExo - Lighting update & more (#40199)
SlamBamActionman [Thu, 11 Sep 2025 01:46:55 +0000 (03:46 +0200)]
Exo - Lighting update & more (#40199)

3 months agoAutomatic changelog update
PJBot [Thu, 11 Sep 2025 01:02:35 +0000 (01:02 +0000)]
Automatic changelog update

3 months agoAdd admin shuttles (#32139)
IProduceWidgets [Thu, 11 Sep 2025 01:01:28 +0000 (21:01 -0400)]
Add admin shuttles (#32139)

* dis da shuttles tho

* power checking

* rerun tests

* purge invalids

* attributions

* Update shuttle save files for new serialization.

* get regexed nerd

* fix shuttle yml guh

* Kill actions

3 months agoAutomatic changelog update
PJBot [Wed, 10 Sep 2025 22:15:05 +0000 (22:15 +0000)]
Automatic changelog update

3 months agoCardboard Box Weightless Fix (#40260)
Princess Cheeseballs [Wed, 10 Sep 2025 22:13:58 +0000 (15:13 -0700)]
Cardboard Box Weightless Fix (#40260)

Box is no longer space faring

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoAutomatic changelog update
PJBot [Wed, 10 Sep 2025 21:50:00 +0000 (21:50 +0000)]
Automatic changelog update

3 months agoMake Butterflies zombie immune (#40265)
imatsoup [Wed, 10 Sep 2025 21:48:53 +0000 (21:48 +0000)]
Make Butterflies zombie immune (#40265)

butterfly zombie no longer

3 months agoImprove Do Not Map test to whitelist specific prototypes per map and whitelist entire...
Tayrtahn [Wed, 10 Sep 2025 20:26:45 +0000 (16:26 -0400)]
Improve Do Not Map test to whitelist specific prototypes per map and whitelist entire directories (#36117)

* Enable whitelisting specific DNM prototypes per map

* Enable whitelisting directories

* Rename fields

* Use a HashSet instead of an array

* Add check for unused whitelist entries

* Remove whitelisting for meta (warden's rubber stamp was removed)

* Add glob support courtesy of @IProduceWidgets

* Update xmldoc

3 months agoAutomatic changelog update
PJBot [Wed, 10 Sep 2025 20:11:06 +0000 (20:11 +0000)]
Automatic changelog update

3 months ago"idk" no longer shrugs, instead sanitizing to "I don't know" (#39024)
SweetAplle [Wed, 10 Sep 2025 20:09:58 +0000 (16:09 -0400)]
"idk" no longer shrugs, instead sanitizing to "I don't know" (#39024)

* idk no longer shrugs

* accidentally had this in here!

* this was accidentally in here too!

* fucked up the removal

* fucked it up again this should HOPEFULLY be the last one

turns out it's hard to revert the edit of a file that's just numbers and spaces who woulda thunk?

* Restore SpaceStation14.sln to master

* Restore development.toml

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
3 months agoAllow to run `mappingclientsidesetup` and `showsubfloor` with +MAPPING permissions...
c4llv07e [Wed, 10 Sep 2025 20:08:48 +0000 (23:08 +0300)]
Allow to run `mappingclientsidesetup` and `showsubfloor` with +MAPPING permissions (#34455)

Allow +MAPPING admins to call mappingclientsidesetup and showsubfloor

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoIgnore non-content commands in AllCommandsHavePermissions (#39336)
Pieter-Jan Briers [Wed, 10 Sep 2025 20:08:16 +0000 (22:08 +0200)]
Ignore non-content commands in AllCommandsHavePermissions (#39336)

Causing a test failure every time a Toolshed command gets added to engine is ridiculous.

3 months agoAutomatic changelog update
PJBot [Wed, 10 Sep 2025 19:23:32 +0000 (19:23 +0000)]
Automatic changelog update

3 months agoDo after checks for being inside container (#39880)
InsoPL [Wed, 10 Sep 2025 19:22:24 +0000 (21:22 +0200)]
Do after checks for being inside container (#39880)

fix

3 months agoMerge Stable into Master (#40263)
Errant [Wed, 10 Sep 2025 18:10:49 +0000 (20:10 +0200)]
Merge Stable into Master (#40263)

3 months agoMerge branch 'master' into fix-conflict-40263
Errant [Wed, 10 Sep 2025 17:52:34 +0000 (19:52 +0200)]
Merge branch 'master' into fix-conflict-40263

3 months ago[HOTFIX] Fix Loadout Validations (#40189)
Princess Cheeseballs [Wed, 10 Sep 2025 17:31:12 +0000 (10:31 -0700)]
[HOTFIX] Fix Loadout Validations (#40189)

p0 bugfix

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoPopupOnTrigger (#39913)
āda [Wed, 10 Sep 2025 17:01:03 +0000 (12:01 -0500)]
PopupOnTrigger (#39913)

* commit

* comment

* changes

* Update Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
3 months agoSpawnEntityTableOnTrigger (#39909)
āda [Wed, 10 Sep 2025 16:59:42 +0000 (11:59 -0500)]
SpawnEntityTableOnTrigger (#39909)

* commit

* comment

* empty

* better xform

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
3 months agoFix emergency evac shuttle console early launch mispredict (#39751)
Winkarst-cpu [Wed, 10 Sep 2025 13:56:18 +0000 (16:56 +0300)]
Fix emergency evac shuttle console early launch mispredict (#39751)

* Fix

* Yes

* Mess

* Update

* Like that?

3 months agoAdd support for contraband text to the reagent guidebook (#37113)
SlamBamActionman [Wed, 10 Sep 2025 13:30:53 +0000 (15:30 +0200)]
Add support for contraband text to the reagent guidebook (#37113)

* Add contraband text to reagent guidebook

* Add reagent for examining

* Update Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
3 months agoMake "Confirm" in VerbMenuUIController localizable (#40248)
Ser11y [Wed, 10 Sep 2025 12:08:08 +0000 (15:08 +0300)]
Make "Confirm" in VerbMenuUIController localizable (#40248)

3 months agoAutomatic changelog update
PJBot [Wed, 10 Sep 2025 11:43:45 +0000 (11:43 +0000)]
Automatic changelog update

3 months agoFix RGB staff not working (#40258)
Stefano Pigozzi [Wed, 10 Sep 2025 11:42:33 +0000 (13:42 +0200)]
Fix RGB staff not working (#40258)

Add missing `TargetAction` to `ActionRgbLight`

This fixes the RGB staff not working.

3 months agoDecal spawners spawn on a higher layer (#39956)
Deerstop [Wed, 10 Sep 2025 08:58:06 +0000 (18:58 +1000)]
Decal spawners spawn on a higher layer (#39956)

changed decal spawn layer

3 months agofeat: SimpleRadial menu support for sprite-view and more extensibility (#39223)
Fildrance [Wed, 10 Sep 2025 08:11:15 +0000 (11:11 +0300)]
feat: SimpleRadial menu support for sprite-view and more extensibility (#39223)

3 months agoMake Foldable Clothing Hidden Layers "reset" Hidden Layers when un/Folding (#40251)
Centronias [Wed, 10 Sep 2025 02:20:01 +0000 (19:20 -0700)]
Make Foldable Clothing Hidden Layers "reset" Hidden Layers when un/Folding (#40251)

foldable clothing hidden layers fix

3 months agoMake location in crew monitoring console localizable (#40247)
Ser11y [Tue, 9 Sep 2025 20:11:24 +0000 (23:11 +0300)]
Make location in crew monitoring console localizable (#40247)

3 months agoCleanup: Remove unnecessary ``IEntityManager`` reference from the ``EmotesUIControlle...
Winkarst-cpu [Tue, 9 Sep 2025 19:00:41 +0000 (22:00 +0300)]
Cleanup: Remove unnecessary ``IEntityManager`` reference from the ``EmotesUIController`` (#40243)

Cleanup

3 months agoFix usages of TryIndex() (#39124)
Pieter-Jan Briers [Tue, 9 Sep 2025 16:17:56 +0000 (18:17 +0200)]
Fix usages of TryIndex() (#39124)

* Fix usages of TryIndex()

Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)

This then resulted in TryIndex() getting modified to log errors (https://github.com/space-wizards/RobustToolbox/commit/94f98073b07bd3fa3133ae6799b34d90f46f467e), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)

This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.

Fixes #39115

Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.

* fix tests

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
3 months agoAutomatic changelog update
PJBot [Tue, 9 Sep 2025 02:48:53 +0000 (02:48 +0000)]
Automatic changelog update

3 months agoReworded the Galoshes description to be more clear about what they actually do. ...
Kittygyat [Tue, 9 Sep 2025 02:47:45 +0000 (03:47 +0100)]
Reworded the Galoshes description to be more clear about what they actually do. (#40200)

Reworded the Galoshes description to be more clear about what they do

3 months agoAutomatic changelog update
PJBot [Tue, 9 Sep 2025 02:45:40 +0000 (02:45 +0000)]
Automatic changelog update

3 months agoDerelict Mediborgs can Scan Solutions and see Mob Health (#40206)
Centronias [Tue, 9 Sep 2025 02:44:31 +0000 (19:44 -0700)]
Derelict Mediborgs can Scan Solutions and see Mob Health (#40206)

Add mediborg unique components to derelict mediborg

3 months agoAutomatic changelog update
PJBot [Mon, 8 Sep 2025 13:58:07 +0000 (13:58 +0000)]
Automatic changelog update

3 months agoLets diona sap trigger artifact blood nodes (#40211)
SlamBamActionman [Mon, 8 Sep 2025 13:56:59 +0000 (15:56 +0200)]
Lets diona sap trigger artifact blood nodes (#40211)

3 months agoDoAfter support for Actions (#38253)
keronshb [Mon, 8 Sep 2025 09:55:13 +0000 (05:55 -0400)]
DoAfter support for Actions (#38253)

* Adds Action DoAfter Events

* Adds DoAfterArgs fields to DoAfterComp

* Adds a base doafter action

* Adds Attempt action doafter logic

* Adds doafter logic to actions

* Changes Action Attempt Doafter and action doafter to take in Performer and the original use delay. Use delay now triggers when a repeated action  is cancelled.

* Readds the TryPerformAction method and readds request perform action into the action doafter events

* Adds a force skip to DoAfter Cancel so we can skip the complete check

* Adds a Delay Reduction field to the comp and to the comp state

* Fixes doafter mispredict, changes doafter comp check to a guard clause, sets delay reduction if it exists.

* Cancels ActionDoAfter if charges is 0

* Serializes Attempt Frequency

* Comment for rework

* Changes todo into a comment

* Moves doafterargs to doafterargscomp

* Adds DoAfterArgs comp to BaseDoAfterAction

* Removes unused trycomp with actionDoAfter

* Replaces DoAfterRepateUseDelay const with timespan.zero

* Removes unused usings

* Makes SharedActionsSystem partial, adds DoAfter partial class to ActionSystem, moves ActionDoAfter logic to the SharedActionsSystem.DoAfter class

* Cleanup and prediction

* Renames OnActionDoAfterAttempt to OnActionDoAfter, moves both to Shared Action DoAfter

* Removes ActionAttemptDoAfterEvent and moves its summaries to ActionDoAfterEvent. Converts OnActionDoAfterAttempt into TryStartActionDoAfter

* Removes Extra check for charges and actiondoafters

* Sloptimization

* Cleanup

* Cleanup

* Adds param descs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoLets diona sap trigger artifact blood nodes
OrbitSystem07 [Mon, 8 Sep 2025 04:23:45 +0000 (21:23 -0700)]
Lets diona sap trigger artifact blood nodes

3 months agoAutomatic changelog update
PJBot [Mon, 8 Sep 2025 00:35:09 +0000 (00:35 +0000)]
Automatic changelog update

3 months agoBeing grappled with a grapple gun allows you to cross chasms (#39983)
Hayden [Mon, 8 Sep 2025 00:34:00 +0000 (18:34 -0600)]
Being grappled with a grapple gun allows you to cross chasms (#39983)

* Being grappled with a grapple gun allows you to cross chasms

Closes #31698

* Update Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs

AAAAAAAAAAAAAAAAA

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoAutomatic changelog update
PJBot [Sun, 7 Sep 2025 15:11:46 +0000 (15:11 +0000)]
Automatic changelog update

3 months agoAtmos dP Guidebook Entry (#40194)
ArtisticRoomba [Sun, 7 Sep 2025 15:10:39 +0000 (08:10 -0700)]
Atmos dP Guidebook Entry (#40194)

* Add Atmos dP guidebook

* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
3 months agoBug fix for APCPowerReceiverBattery (#40188)
chromiumboy [Sun, 7 Sep 2025 14:52:27 +0000 (09:52 -0500)]
Bug fix for APCPowerReceiverBattery (#40188)

Initial commit

3 months agoAutomatic changelog update
PJBot [Sun, 7 Sep 2025 14:37:45 +0000 (14:37 +0000)]
Automatic changelog update

3 months agoAllow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171)
Hannah Giovanna Dawson [Sun, 7 Sep 2025 14:36:38 +0000 (15:36 +0100)]
Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171)

* Revert "Disable vulpkanin human hair (#40144)"

This reverts commit d02aa1a4e2e106b9bfd8e9516464c9dbd86df7ca.

* You can once again shave your pet Vulp

* I can see the ass, I'm safe

* Rectified docstring as I am a good person

* I am doing this instead of playing Silksong please help

* Fix forgetting to re-add shader overriding

3 months agoAutomatic changelog update
PJBot [Sun, 7 Sep 2025 14:02:33 +0000 (14:02 +0000)]
Automatic changelog update

3 months agoRestore transfer amounts on regular syringes to 5, 10, 15 (#40197)
Crude Oil [Sun, 7 Sep 2025 14:01:26 +0000 (16:01 +0200)]
Restore transfer amounts on regular syringes to 5, 10, 15 (#40197)

add transferamounts to regular syringes

3 months agofix: Atmos dP Window Inheritance (#40192)
ArtisticRoomba [Sun, 7 Sep 2025 09:13:29 +0000 (02:13 -0700)]
fix: Atmos dP Window Inheritance (#40192)

3 months agoAtmospherics Delta-Pressure YAML refactor (#40174)
ArtisticRoomba [Sun, 7 Sep 2025 07:56:37 +0000 (00:56 -0700)]
Atmospherics Delta-Pressure YAML refactor (#40174)

3 months agoUpdate Credits (#40187)
github-actions[bot] [Sun, 7 Sep 2025 01:18:23 +0000 (03:18 +0200)]
Update Credits (#40187)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
3 months agoAutomatic changelog update
PJBot [Sat, 6 Sep 2025 17:56:09 +0000 (17:56 +0000)]
Automatic changelog update

3 months agoAdd some alternate jumpsuit designs which can be toggled (#31213)
Mr. 27 [Sat, 6 Sep 2025 17:55:02 +0000 (13:55 -0400)]
Add some alternate jumpsuit designs which can be toggled (#31213)

* inital

* testfa

* New Sec sprite

* Update atmos

* Update meta.json

* Update meta.json

* 0

* Update meta.json

3 months agoAutomatic changelog update
PJBot [Sat, 6 Sep 2025 16:01:37 +0000 (16:01 +0000)]
Automatic changelog update

3 months agoFixed disconnected grid on box station (#40161)
ToastEnjoyer [Sat, 6 Sep 2025 16:00:24 +0000 (11:00 -0500)]
Fixed disconnected grid on box station (#40161)

Fixed tesla area on box

3 months agoAutomatic changelog update
PJBot [Sat, 6 Sep 2025 15:14:51 +0000 (15:14 +0000)]
Automatic changelog update

3 months agoRevert antique laser and appraisal tool sizes (#40158)
ScarKy0 [Sat, 6 Sep 2025 15:13:42 +0000 (17:13 +0200)]
Revert antique laser and appraisal tool sizes (#40158)

* init

* appraisal antique pistol sounds kinda cool tho ngl

* actually fuck items

3 months agoStable Into Master (#40155)
Princess Cheeseballs [Sat, 6 Sep 2025 09:32:00 +0000 (02:32 -0700)]
Stable Into Master (#40155)

3 months ago[Hotfix] Wizard Rod doesn't gib the wizard. (#40041)
Princess Cheeseballs [Sat, 6 Sep 2025 09:18:17 +0000 (02:18 -0700)]
[Hotfix] Wizard Rod doesn't gib the wizard. (#40041)

* Title

* Tired

* That shit did nothing goddamn

* Fix for real

* Use og code

* Hmmm borgaer

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months ago[HOTFIX] Fix Burgers (#39773)
Princess Cheeseballs [Sat, 6 Sep 2025 09:18:06 +0000 (02:18 -0700)]
[HOTFIX] Fix Burgers (#39773)

* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months ago[Hotfix] Wizard Rod doesn't gib the wizard. (#40041)
Princess Cheeseballs [Sat, 6 Sep 2025 09:18:17 +0000 (02:18 -0700)]
[Hotfix] Wizard Rod doesn't gib the wizard. (#40041)

* Title

* Tired

* That shit did nothing goddamn

* Fix for real

* Use og code

* Hmmm borgaer

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months ago[HOTFIX] Fix Burgers (#39773)
Princess Cheeseballs [Sat, 6 Sep 2025 09:18:06 +0000 (02:18 -0700)]
[HOTFIX] Fix Burgers (#39773)

* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
3 months agoAutomatic changelog update
PJBot [Sat, 6 Sep 2025 08:03:54 +0000 (08:03 +0000)]
Automatic changelog update

3 months agoFix resin windows inheriting wrong dP values (#40151)
ArtisticRoomba [Sat, 6 Sep 2025 08:02:47 +0000 (01:02 -0700)]
Fix resin windows inheriting wrong dP values (#40151)

Fix resin windows inheriting from regular windows

3 months agoAutomatic changelog update
PJBot [Sat, 6 Sep 2025 06:03:33 +0000 (06:03 +0000)]
Automatic changelog update

3 months agoFix exo burn chamber (#40152)
ArtisticRoomba [Sat, 6 Sep 2025 06:02:25 +0000 (23:02 -0700)]
Fix exo burn chamber (#40152)

3 months agoFix bad loop in LogStringHandler.AddFormat (#40147)
Skye [Sat, 6 Sep 2025 02:07:03 +0000 (11:07 +0900)]
Fix bad loop in LogStringHandler.AddFormat (#40147)

3 months agoDisable vulpkanin human hair (#40144)
ScarKy0 [Fri, 5 Sep 2025 23:22:46 +0000 (01:22 +0200)]
Disable vulpkanin human hair (#40144)

init

3 months agoupdate for glue/lube tube inhand
iaada [Fri, 5 Sep 2025 22:24:50 +0000 (17:24 -0500)]
update for glue/lube tube inhand

3 months agoMerge remote-tracking branch 'upstream/master' into up/drinks-yml
iaada [Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)]
Merge remote-tracking branch 'upstream/master' into up/drinks-yml

# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml

3 months agoAutomatic changelog update
PJBot [Fri, 5 Sep 2025 20:04:17 +0000 (20:04 +0000)]
Automatic changelog update

3 months agoDrink outta da toiler (#40133)
IProduceWidgets [Fri, 5 Sep 2025 20:03:10 +0000 (16:03 -0400)]
Drink outta da toiler (#40133)

* totally unrelated to any other recent additions

* dispare

* enum

3 months agoFix admin logs going to admin chat (#40141)
Pieter-Jan Briers [Fri, 5 Sep 2025 18:54:05 +0000 (20:54 +0200)]
Fix admin logs going to admin chat (#40141)

Oops

3 months agoAdd a space in osx-arm64 to fix arm64 osx builds (#40137)
Myra [Fri, 5 Sep 2025 18:41:08 +0000 (20:41 +0200)]
Add a space in osx-arm64 to fix arm64 osx builds (#40137)

3 months agoAdd water cooler interaction test (#39612)
Tayrtahn [Fri, 5 Sep 2025 17:05:49 +0000 (13:05 -0400)]
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

3 months agoAutomatic changelog update
PJBot [Fri, 5 Sep 2025 16:24:14 +0000 (16:24 +0000)]
Automatic changelog update

3 months agoAdjusted minimumPlayers for Wizard midround events. (#38424)
Matt Idzik [Fri, 5 Sep 2025 16:23:06 +0000 (11:23 -0500)]
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>
3 months agoAutomatic changelog update
PJBot [Fri, 5 Sep 2025 15:57:04 +0000 (15:57 +0000)]
Automatic changelog update

3 months agoExpedite gender reassignment (#36894)
IProduceWidgets [Fri, 5 Sep 2025 15:55:54 +0000 (11:55 -0400)]
Expedite gender reassignment (#36894)

3 months agoRejig LogStringHandler (#30706)
Leon Friedrich [Fri, 5 Sep 2025 12:22:49 +0000 (00:22 +1200)]
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>
3 months agoAutomatic changelog update
PJBot [Fri, 5 Sep 2025 10:44:25 +0000 (10:44 +0000)]
Automatic changelog update

3 months agoVulpkanin Species (#37539)
ScarKy0 [Fri, 5 Sep 2025 10:43:17 +0000 (12:43 +0200)]
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 fcbdcf8452cb1247733242aa44ea5b9f38dfa3d2.

* Revert "[April Fools] Elf species  (#35353)"

This reverts commit 704293a051033026bfca0c9e161d97796bc0cb81.

* nuh uh

* localized names

* fix survival box

* abilities (Mostly don't work yet, pending PRs)

* wagging loc

* slight heat tweaks

* stuff

* Update Vulpkanin.xml

* vulp screams + quieter howl

* MessyDrinker by Orks

* MessyDrinker guidebook

* animal bones

* fix wagging

* missed

* no loc

* Lower damage, remove butchering

* Revert "animal bones"

This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.

* leap

* collision

* leap desc update

* leap guidebook

* fix leap

* microbalance

* comment

* microbalancing pt 2

* microbalancing pt 3

* test fail fix (i hope)

* fix organs

* no leaping on the ground

* remove SolutionScanner + ling work

* fix clone

* add stuff back

* microbalancing pt yes

* male vulp names

mainly slavic names with some similiar sounding ones mixed in

* Revert "male vulp names"

This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.

* male vulps names pr 2 (slavic, dog names, few puns)

Slavic names, with mixed in typical dog names and some puns

* female names (mainly slavic, other stuff mixed in)

* oops

* Update vulpkanin.yml

* Vulps WIP Work (#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>
3 months agofix a typo in the comments for game.ipintel_exempt_playtime (#40129)
Skye [Fri, 5 Sep 2025 10:09:48 +0000 (19:09 +0900)]
fix a typo in the comments for game.ipintel_exempt_playtime (#40129)

3 months agoAlerts Cleanup and API (#39544)
Princess Cheeseballs [Fri, 5 Sep 2025 09:45:48 +0000 (02:45 -0700)]
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>
3 months agoAutomatic changelog update
PJBot [Fri, 5 Sep 2025 07:48:38 +0000 (07:48 +0000)]
Automatic changelog update

3 months agoGive shutters the DeltaPressure component (#40126)
ArtisticRoomba [Fri, 5 Sep 2025 07:47:31 +0000 (00:47 -0700)]
Give shutters the DeltaPressure component (#40126)