Commit Graph

3720 Commits

Author SHA1 Message Date
Deserty0
44b757a033 Merge remote-tracking branch 'upstream/master' into des-fishing 2025-10-26 22:45:15 +10:00
omsoyk
9796318759 Resprite hide and leather (#1837) 2025-10-24 14:17:18 -04:00
nukkuminen
1824d60fb8 big ears (#1836) 2025-10-24 14:49:47 +03:00
Deserty0
f31e82f7b3 123 2025-10-17 14:28:03 +10:00
nukkuminen
bdcd379363 Kitties! Cats! Small carcats! (#1814)
* todo finish after cbt

* alright. it's working, somehow

* colored cars

* i'll fucking smash my head against the wall

* colored cars with spots

* i can't belive my eyes

* spawners, localization and some stuff

* rat hunters

* resolving stuff

* and this one too

* car

* car 2

* car 3

* 13

* car 4

* car 5

* car 6

* i hate rats

* car 7

* finally

* alldun!

* CARCATS 2 IS REAL
2025-10-01 17:44:08 +03:00
Nim
60946749a8 Snail (#1753)
* snail

* sack snail

* gib on step

* comment

* chance step trigger

* timed spawner

* Respirator

* GhostRole

* Speech

* Hunger

* Thirst
2025-09-30 12:27:58 -04:00
nukkuminen
bce80d4026 Merge pull request #1813 from oldschoolotaku/OH-GOD-IT-BURNS
Custom burning sprites
2025-09-30 08:02:49 -04:00
Red
51a3fb53aa God rays (#1803)
* god rays

* fix

* fix?
2025-09-27 22:14:11 +03:00
nukkuminen
66379b65d1 added funny facial hair (#1797)
* added funny facial hair

* fixed atributions

* new mustages
2025-09-25 14:25:10 +03:00
SenorJaba
a370bc19b0 Guild berets and signs (#1786)
* Guild berets and signs

* Naming fix

* Small fix

* Russ
2025-09-17 17:51:51 +03:00
Nim
3630ac156a Bone hound (#1718)
* bone hound

* fix

* fix2

* fix3

* fix4
2025-09-15 19:01:13 +03:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
IProduceWidgets
276e4df749 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>
2025-09-11 12:57:30 +02:00
GeneralGaws
a7eb5dd22b Fix darts inhand sprites (#40207)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2025-09-10 23:50:57 -04:00
4g10w
e6695858cb Armorattus Valoricus (#1675)
* Rat and armor

Added rat mob and rat armor.
Slightly changed interaction popup system to allow for both picking up
and hugging interaction. This adds an "Interact" item to context menu of
interactable (huggable) objects.
Trying to make it in a way that allows for more pets to be added later.

* Rat ghost role

Rat:
- added ghost role with descriptions and rules
- added hand
Rat armor:
- added crafting recipe

* Ghost role, armor and adjustments

Added:
- Ghost role spawner for rat

Changed:
- AI-controlled rat will now retaliate if attacked
- Rat is now a bit slower
- Playable humanoid races can no longer wear rat armor

Removed:
- Rat's hand because it leads to unwanted interactions
- Rat will no longer stabilize the demiplane, so it will collapse if rat
is the only player-controlled entity left. This is done because without
a hand rat cannot leave the demiplane on it's own

* Armor cost, Rat hunger, Rat ghostrole
Tweaks and Fix
Added:
- Rat's hunger level is now visible when examining it
Changed:
- Rat gets hungry slower than before. When starving it takes less damage and slows
  down by less amount
- Rat ghostrole prototype moved to it's own directory
Fixed:
- Rat armor physical composition now makes sense and costs exactly like
  it's ingredients

* fixing the rat armor composition... again

* Armor and HP tweaks

Changed:
- Lowered protection values given by rat armor to lower the price
- Increased crafting price for rat armor from 2 iron ingots to 6. A lot
of wasted material for such delicate work I suppose.
- Increased rat's HP by 10 to counter armor changes

* Removed interaction
Reverted InteractionPopupSystem and deleted interaction texts for rat

* Updated licenses and authorships of sprites

* fixed license and removed interaction from rat prototype

* Fixed armor looking wrong in rat's dead state

* Removed unnecessary images from rat.rsi

* Removed IronSmelting skill requirment since currently smith is removed

* Rat's size changed from Tiny to Normal to reflect how bigass this rat really is

---------

Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
2025-09-10 11:31:44 +03:00
Deserty0
45f4668b11 Merge branch 'master' into des-fishing 2025-09-10 09:39:07 +10:00
Gaby_Destroyer
3b32847db6 Updated Taskbar Icon (#1755)
Co-authored-by: Gaby_Destroyer <@gabrieljimenezlauret@gmail.com>
2025-09-09 00:59:35 +03:00
Ed
5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml
2025-09-08 13:12:50 +03:00
Ed
f84e1ba04d Merge branch 'master' into ed-25-08-2025-upstream-sync
# Conflicts:
#	Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
2025-09-08 11:33:44 +03:00
Ed
e659a2a007 Merge branch 'master' into ed-25-08-2025-upstream-sync 2025-09-08 11:31:28 +03:00
omsoyk
ec2128fa03 resprite satchels (#1748) 2025-09-08 01:38:18 +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
Deserty0
c8b0560c7a UI 2025-09-07 04:31:11 +10: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
Deserty0
5d2fb2c4bc 13234546tyu 2025-09-07 01:37:52 +10:00
Red
30b306b9ce Revert "wizard robes (#1725)" (#1737)
This reverts commit a71948ffb4.
2025-09-06 14:17:42 +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
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
Deserty0
af2e62ff59 я очень устал босс 2025-09-06 03:03:37 +10:00
Deserty0
307c0dc01b fix meta 2025-09-05 23:55:54 +10: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 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>
2025-09-05 12:43:17 +02:00
Quantum-cross
52c903cab8 Dynamic anomaly scanner texture (#37585) 2025-09-04 22:11:03 +03:00
Quantum-cross
70ffc1eb5d Add heat distortion shader for hot gases (#39107) 2025-09-03 20:17:39 -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
SlamBamActionman
1a452494e6 Add senior courier PDA for cargo techs (#37661) 2025-09-03 22:22:28 +02:00
Tiniest Shark
7916819203 Burger Inhands (#39894)
burger is in your hands
2025-09-03 15:42:50 -04:00
Tiniest Shark
3aeecd0139 Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814)
* Added inhand sprites to cans, cartons and cups.

* small tweak
2025-09-03 15:21:00 -04:00
Mora
d1deb5b059 Some more vox customization (#39083)
* Added docked and spiked tails, added talisman for vox

* Tail Talisman ftl

* adjusts talisman to be its own tail to avoid having to deal with other tails at all

* vox tail stuff

* Added amputated tail (courtesy of flareguy) and split tail

* adds TODO regarding marking conditionals

* rsi run check pls stop screaming at me

* Shelving the talisman for later, keeping the sprites around

* Add RSI credits

* Remove unnecessary files

* renamed amputated to vestigial
2025-09-03 20:05:48 +02:00
Tiniest Shark
e0ead5a83a Reptilian tail sprites for hard/softsuits (#35842)
* Reptilian helmets and tail sprites for hard/softsuits (and a few others)!

* Removed the new fins from helmets.

* don't know how the caustic resistances got doubled? oops

* Update pirate helm sprites for lizards

* fixin errors

* ugh

* softsuit updates

* okay maybe this works now

* Corgi fixes. Boy it sure would be nice to not have to do this again.

* please work

* Helmets removed, will be done in another PR.

* missed a few.

* evil punctuation killed

* scream

* Re-parented clothingvisuals.

* Suits modified with tails

* oops chaplain tail was misnamed

* a

* one more time

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* oops chaplain lost their suit

* Small fix

* roll back unrelated fix

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-09-03 18:45:49 +02:00
Tiniest Shark
3775da3345 Helm + Mask Displacements for Reptilians (and some unique helmets) (#39351)
* Liz displacements + unique helms

* small fix

* Couple of small fixes
2025-09-03 18:45:18 +02:00
Deserty0
310126c660 init 2025-09-04 02:32:59 +10:00
Nim
b01938ddcf Magic traps (#1662)
* magic trap

* demiplan

* energy

* Permanent

* meta

* ice trap

* fix

* ForkFiltered

* sound trap

* icon and loot

* blacklistTags

* staffs

* fix window

* manacost
2025-09-02 11:52:37 +03:00
IProduceWidgets
8a041fa5cb Update 4 visitor shuttles & nanomed inventories (#39718) 2025-09-01 16:39:18 -07:00
Hannah Giovanna Dawson
8f55a4fcfc Scurrets - can wear pet bags, mail bags and spears (#38774)
* Scurrets - can wear pet bags, mail bags and spears

* a

* Resolve PR comments
2025-08-30 16:42:43 +02:00
Kit
f21cca0a1a Spineguard (#1659)
* sprites

* toxin

* spineguard

* spawning

* passive regen

* merge conflict fixes

* again

* again 2

* readd stuff

* agh

* requested changes
2025-08-30 10:27:03 +03:00