36028 Commits

Author SHA1 Message Date
Kit
d9814b1eb2 Alch guidebook refactor (#1717)
* ALCHEMY GUIDEBOOOK!!!!!

* forgoten translation

* FIXES!!!!!

* Requested translation changes
2025-09-08 02:45:11 +03:00
CrystallEdge Server
ca889a0073 Automatic changelog update 2025-09-08 01:39:23 +03:00
omsoyk
ec2128fa03 resprite satchels (#1748) 2025-09-08 01:38:18 +03:00
Kit
063a9a87d6 some changes (#1749)
* some changes

* lower health regen

* spine guard more common

* MORE!!!!
2025-09-08 01:37:53 +03:00
CrystallEdge Server
ea123d36ff Automatic changelog update 2025-09-07 19:16:34 +03:00
Red
ab7e3204f1 Adventure guild returns (#1745)
* adventure guild

* fix order board

* fixes

* loadout + fix

* commit
2025-09-07 19:15:29 +03:00
PJBot
946e9cc2cd Automatic changelog update 2025-09-07 15:11:46 +00:00
ArtisticRoomba
a93f6b8cdf 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>
2025-09-07 17:10:39 +02:00
chromiumboy
499dde1ec1 Bug fix for APCPowerReceiverBattery (#40188)
Initial commit
2025-09-07 16:52:27 +02:00
PJBot
c1ca510e78 Automatic changelog update 2025-09-07 14:37:45 +00:00
Hannah Giovanna Dawson
a699639834 Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171)
* Revert "Disable vulpkanin human hair (#40144)"

This reverts commit d02aa1a4e2.

* 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
2025-09-07 16:36:38 +02:00
PJBot
d14b6a31aa Automatic changelog update 2025-09-07 14:02:33 +00:00
Crude Oil
fb454351d2 Restore transfer amounts on regular syringes to 5, 10, 15 (#40197)
add transferamounts to regular syringes
2025-09-07 16:01:26 +02:00
CrystallEdge Server
6121eb44e7 Automatic changelog update 2025-09-07 14:23:35 +03:00
Red
ad46932d11 Balance tweaks (#1741)
* disable lurker pulling

* fix pack

* fix pack

* fak pix

* vampire objective tweak

* buff vampire search

* Update air_saturation.yml

* fix

* fix

* Update EntityTest.cs

* Update EntityTest.cs

* tick

* Update EntityTest.cs

* remove forkfiltered filter

* Update EntityTest.cs
2025-09-07 14:22:30 +03:00
ArtisticRoomba
ae9f56b234 fix: Atmos dP Window Inheritance (#40192) 2025-09-07 02:13:29 -07:00
ArtisticRoomba
8f8db391d8 Atmospherics Delta-Pressure YAML refactor (#40174) 2025-09-07 00:56:37 -07:00
github-actions[bot]
7aaa063944 Update Credits (#40187)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-09-07 03:18:23 +02:00
PJBot
40fcc0a45a Automatic changelog update 2025-09-06 17:56:09 +00:00
Mr. 27
4eab05b55e 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
2025-09-06 13:55:02 -04:00
PJBot
8bd1970337 Automatic changelog update 2025-09-06 16:01:37 +00:00
ToastEnjoyer
912aaf846a Fixed disconnected grid on box station (#40161)
Fixed tesla area on box
2025-09-06 10:00:24 -06:00
PJBot
e761cf5afe Automatic changelog update 2025-09-06 15:14:51 +00:00
ScarKy0
2201d29048 Revert antique laser and appraisal tool sizes (#40158)
* init

* appraisal antique pistol sounds kinda cool tho ngl

* actually fuck items
2025-09-06 17:13:42 +02:00
Viator-MV
dd930f513c fixing unnoticed bugs for new weapons (#1740)
* NO TIME TO EXPLAIN

* fix
2025-09-06 15:49:39 +03:00
CrystallEdge Server
d0759efbfe Automatic changelog update 2025-09-06 14:18:47 +03:00
Red
30b306b9ce Revert "wizard robes (#1725)" (#1737)
This reverts commit a71948ffb4.
2025-09-06 14:17:42 +03:00
Ed
dcaca3f4a6 fix 2025-09-06 14:03:56 +03:00
Ed
9d0a9ae186 Update CP14MagicEnergySystem.Draw.cs 2025-09-06 13:19:55 +03:00
Ed
89e4b6e4ed earrape fix 2025-09-06 13:19:18 +03:00
Princess Cheeseballs
ca32d83417 Stable Into Master (#40155) 2025-09-06 02:32:00 -07:00
Princess Cheeseballs
3ea9321d25 [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>
2025-09-06 02:19:20 -07:00
Princess Cheeseballs
8a1a1b98c4 [HOTFIX] Fix Burgers (#39773)
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-06 02:19:19 -07:00
Princess Cheeseballs
98507eded1 [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>
2025-09-06 02:18:17 -07:00
Princess Cheeseballs
adc7a829ae [HOTFIX] Fix Burgers (#39773)
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-06 02:18:06 -07:00
PJBot
07fdd52756 Automatic changelog update 2025-09-06 08:03:54 +00:00
ArtisticRoomba
3aff3dff93 Fix resin windows inheriting wrong dP values (#40151)
Fix resin windows inheriting from regular windows
2025-09-06 01:02:47 -07:00
PJBot
47629fe277 Automatic changelog update 2025-09-06 06:03:33 +00:00
ArtisticRoomba
3f11e20f90 Fix exo burn chamber (#40152) 2025-09-05 23:02:25 -07:00
Skye
f98fd98380 Fix bad loop in LogStringHandler.AddFormat (#40147) 2025-09-06 04:07:03 +02:00
ScarKy0
d02aa1a4e2 Disable vulpkanin human hair (#40144)
init
2025-09-06 01:22:46 +02:00
iaada
3a7f8fc1a7 update for glue/lube tube inhand 2025-09-05 17:24:50 -05:00
Ed
9d3162585c Update CP14_Changelog.yml 2025-09-06 01:11:22 +03:00
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
CrystallEdge Server
13742f659d Automatic changelog update 2025-09-06 01:06:16 +03:00
Viator-MV
a71948ffb4 wizard robes (#1725)
* ALL

* no green

* material

* NO GREEN

* I SAID NO GREEN

* cost
2025-09-06 01:05:11 +03:00
Red
963bdc022f Rethinking equipment (#1711)
* delete all modular content

* clean up

* Update guard.yml

* spear first pass

* Add imperial two-handed sword and update spear

Introduces the imperial two-handed sword with new sprites, prototype, and animations. Refines spear configuration: adjusts damage, animation, and offsets, and updates its sprites and prototype to use a new resource path. Improves melee weapon animation logic for both thrust and slash attacks.

* neck displacement

* Update neck.png

* Update migration.yml

* dagger

* Add sword prototype and refactor melee weapon swing logic

Introduces a new sword entity and associated textures. Refactors melee weapon swing logic by renaming SwingLeft to CPSwingLeft and updating related code. Adjusts animation offsets and rotation values for daggers, spears, and two-handed swords. Moves and updates dagger texture assets to a new directory structure.

* hatchet

* sickle

* Add skimitar sword entity and sprites

Introduced a new 'skimitar' sword entity with description and associated sprite assets, including icon, in-hand, and equipped states. Also updated the imperial sword's name and description for clarity.

* Add rapier weapon and adjust melee weapon balance

Introduced the imperial rapier weapon with associated prototype and textures. Increased the default single-target melee damage modifier to 1.3 and removed per-weapon clickDamageModifier overrides from dagger, spear, sword, and two-handed sword. Also increased sword base damage to 10 for better balance.

* Add iron tool/weapon variants and update wall thresholds

Introduces iron variants for pickaxe, shovel, dagger, rapier, spear, sword, and two-handed sword, including new sprites and YAML prototypes. Adjusts wall and ore vein damage thresholds for destruction and sound triggers. Updates migration.yml to map modular iron weapons to new iron variants and spawns stone blocks on stonebrick wall breakage. Also refactors dagger textures to use an 'iron' directory.

* Refactor ice dagger and adjust blacksmith skills

Replaced CP14IceDagger with CP14WeaponDaggerIce, updating its parent, stats, and components for consistency. Adjusted base dagger damage types. Blacksmith job and related melting skills are now commented out or disabled, reflecting a change in skill progression and job setup.

* Update ice_dagger.yml

* Deprecate sword mastery skills and update melee swing logic

Commented out SwordMastery, RapierMastery, and SkimitarMastery skills and removed their assignment from guard and artisan job prototypes. Renamed CPSwingLeft to SwingLeft in melee weapon code for clarity and updated related logic.

* Remove requiredSkills from anvil and furnace recipes

Eliminated the 'requiredSkills' field from all recipes in Anvil/misc.yml and furnace.yml. This simplifies recipe definitions and removes skill prerequisites for crafting these items.

* Update guard_commander.yml

* Comment out freeLearnedSkills for T1 and T2 skeletons

Disabled the freeLearnedSkills entries, including SwordMastery and SkimitarMastery, in both T1 and T2 DemiplaneAntag skeleton YAML prototypes. This change may be for balancing or testing purposes.

* Update migration.yml

* Update migration.yml

* guidebook

* r

* spear passive + hammer passive

* tool hammer + skimitar refactor

* balance tweak

* kick nerf

* TOWER DEFENCE UPDATE

* default shield refactor

* buckler (only sprites)

* Update migration.yml

* buckler parry

* some fixes

* Update T2.yml

* Update T2.yml

* Update instruments.yml

* Update migration.yml

* M O P

* war axe

* Update migration.yml

* Keen Eye skill

* arrows + bow + loadouts

* Update tools.yml

* trading

* fix

* Update misc.yml

* Update migration.yml
2025-09-06 00:59:58 +03: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