Commit Graph

3425 Commits

Author SHA1 Message Date
Viator-MV
e06e1bb7fc Druid stuff (#1396)
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
2025-06-09 14:35:56 +03:00
Nim
024d22dc05 Slippers and hat (#1398)
* Slippers and hat

* sound

* fix
2025-06-08 10:53:19 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
Red
17be798db4 Grass bags (#1381)
* grass bugs

* move to victoria

* Update tiles_grass_bag.yml
2025-06-04 12:22:54 +03:00
Nim
dedd3a8b33 New carpets (#1375)
* new carpets

* Flammable
2025-06-04 09:57:09 +03:00
Nim
dd6f5a7e6f lockpick artifact (#1374) 2025-06-03 15:37:25 +03:00
TheKittehJesus
4c7b035c9c New belt controls (#1298)
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-03 14:39:39 +03:00
DeLTaAlarm0
261441dd67 Open/closed table sign (#1275)
* Added open/closed sign

* Added open/closed sign

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update workbench recipes

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update misc.yml
2025-06-03 14:22:24 +03:00
paige404
881a504334 Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes (#1300) 2025-06-03 00:59:07 +03:00
Red
43913d9d11 cozy (#1367) 2025-06-03 00:38:19 +03:00
Nim
5a2ccc3e08 Resprite (#1328)
* well resprite

* broken well

* Campfire

* meta

* Quantity
2025-06-02 14:16:42 +03:00
Red
5c5a473ec0 More merchant content (#1349)
* energy crystals

* thaumaturgy trading
2025-06-01 19:21:41 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347)
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
2025-06-01 15:10:36 +03:00
Red
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web
Spider content update
2025-05-31 14:31:44 +03:00
Red
7d658de8a1 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 14:54:06 +03:00
SenorJaba
3972d047c7 Guard bell resprite change (#1335) 2025-05-30 09:49:21 +03:00
Red
7642f49b00 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-29 00:50:36 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308)
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
2025-05-29 00:22:47 +03:00
Lucson1337
0551caf98f Eye patch/глазная повязка (#1329) 2025-05-29 00:22:20 +03:00
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
Nim
91cebc07c4 Merge pull request #1278 from Nimfar11/books
Books sprite
2025-05-26 12:52:58 +03:00
Red
40246e9b13 Merge branch 'master' into ed-12-05-2025-upstream 2025-05-23 12:58:11 +03:00
Cuir
14074a2ff3 Window improvements (#1292)
* Added stone brick and marble brick windows to the crafting menu proper.
Sanitized capitalization of construction graph ids and nodes (but not entities).
Sanitized stone and marble structure descriptions.

* Windows that are built with frames now leave those frames behind when you smash them instead of disintegrating entirely.

* Syntax error because entity id

* wooden windows

* Added a base window frame as well as a wooden window frame and its broken variant.
Frames can be vaulted through, and the broken glass variant will deal slash damage and a short stun upon entering.
Wooden windows now deconstruct and shatter into both types of frames, which can also be deconstructed.
Fixed an issue with window collisions when connected across tiles.
Gave wooden windows their own prototype file and construction graph.

* stonevrick windows

* Added functionality to stone window frame types.
Fixed an issue where shattered windows weren't triggering unless they were flammable.

* some parenting work

* fix fixtures

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-05-23 12:03:36 +03:00
YoungThug
b95bcbffed Rat King Chat Indicator (#37184)
* Rat King Chat Indicator

* BUFFRATWHEN

* Added it to the crown wawa

* Ignore this

* Whats the limit for stuff I can put here?

* Fix da merge conflicts for real this time

* WE DID ITgit add -A

* Errant Requested Changes
2025-05-22 01:47:04 -04:00
Wolfkey-SomeoneElseTookMyUsername
e72e25aba1 Add disposal signalers (#37535)
* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller
2025-05-21 22:18:57 -04:00
Pieter-Jan Briers
1d5a06612a Optimize parallax VRAM usage (#37180)
* Disable parallax texture preloading

Many parallax layers are specific to a single map and will likely never be loaded for the duration of the game. Save VRAM by not loading them always.

Requires engine master

* Put generated parallax identifier in texture name

Makes it show up properly in debugging tools

* Don't load generated parallaxes multiple times

Many parallax prototypes re-use the same generated parallax configs. These generated parallaxes were being loaded multiple times at once, which was a massive waste of VRAM.

We now move these into a separate cache for deduplication. I had to write a lot of logic to handle loading cancellation and ref counting. Yay.

Also fixes some spaghetti with the previous parallax loading system: cancellation didn't work properly, give proper names to generated texture names, etc.

This saves like 100+ MB of VRAM.
2025-05-22 11:22:08 +10:00
Kyle Tyo
674724b3f2 Fix glass external airlocks using the standard airlock emergency access lights. (#37666)
Update emergency_unlit.png
2025-05-21 19:14:24 +02:00
mubururu_
588bc52f26 inhands for Syndicate Things (and thief beacon) (#37682)
* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests
2025-05-21 11:39:29 -04:00
Alexsey Bezyuk
a73f8e3113 Seed sack and craft (#1287)
* seed_sack

* full seed sack

* seed sack sprite

* name and description
2025-05-21 12:41:22 +03:00
Minty642
ebcbdf3077 Adding fungal soil (#36245)
Co-authored-by: aliser <20380250+murolem@users.noreply.github.com>
2025-05-20 21:59:51 -07:00
B_Kirill
f07b2aa6c3 New fun meteors (#37327)
* New fun meteors

* Forgot about newline

* Fix

* Wow, a new test

* Okay

* Fix

* Fix 2

* I hope this is correct enough

* Attribution

* Attribution 2
2025-05-20 23:04:27 +10:00
slarticodefast
9b1a6dd57b add reduced motion drug overlay (#37584)
* reduced motion flash effect

* reduced motion drug overlay

* Revert "reduced motion flash effect"

This reverts commit e350b2899d0acc78c9833b5bc23a9680e03b2736.
2025-05-20 08:36:08 -04:00
SeamLesss
926248e235 Magazine Sprite Fix (#37615)
* first

* long mag + mk58 color
2025-05-19 16:29:47 -04:00
SeamLesss
f62f0fbae9 Black Scarf Icon Fix (#37589)
* forgot like a dumbass

* attributions
2025-05-18 21:16:23 -04:00
Ed
fd6965efe0 skimimimi 2025-05-18 15:36:28 +03:00
ScarKy0
30537e13a4 Bomb Deliveries (#37069)
* init

* BOMB!!!

* review

* partial review

* review
2025-05-18 10:57:22 +02:00
ArtisticRoomba
95cc36c41d Atmos Air Grenades (#37531) 2025-05-17 21:32:51 -07:00
Nemanja
0d878751fa Salvage Job Board (#37549)
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
2025-05-18 14:02:52 +10:00
Spangs04
9af1d69e30 Telecoms Resprite (#35811)
* Medical and Science Servers

Resprited  medical and science servers

* Delete server-off-Recovered.png

* Telecoms and Camera Servers

* Add Copyright

* Fix Rsi

* Minor Stripe Displacement Fix

* Telecoms Sprites

* Telecoms Display Update

Partial Update of the Sprites, Copyright and some YML and JSON changes

* Fix Linter and YML and Finalize

* Remember Lost Router Child

Fix Linter Again (hopefully) and add sprite to entertainment and wireless camera routers

* Requested Review Changes and ect

Changed how the servers dictate how to display whether they have no keys or if they have a mix of keys.

* Re-Run Checks

* Handful of requested changes

* Fix?

* Revert Last

* old yeller

* pushforpr

* Remove Old Files

* Fix Json

* fix rsi for real...?

* Fix Camera Servers

Servers were still calling to telecoms instead of the server sprites

* New Telecom Darken Attempt #1

* Slight stripe change

* Random Whitespace fix

* Fix2boogaloo
2025-05-17 22:10:56 -04:00
Ed
1cd20edecf Workshop resprite pack (#1279)
* Jaraten resprite pack

* stamina TTomattT

* shrooms jaraten

* cloak fix

* passport resprite
2025-05-18 01:24:07 +03:00
eoineoineoin
e42f63583b Improve fax machine UI (#33825)
* fax upgraded

* improve resizable

* move Paper type settings & change margins

* change margins & Aling of text

* Rearrange Fax UI

Group paper-type with print-file.
Group refresh button with destination list.

Add some panels to differenciate functionality for faxing an inserted
sheet of paper and printing a local file to a new paper.

* Whitespace

* Remove unnecessary style definition

* Remove whitespace

---------

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
2025-05-17 13:20:11 -04:00
Nemanja
5424433604 Remove Basic Hardsuit & Associated Files (#37315)
* Remove Basic Hardsuit

* retaliatory action

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2025-05-17 16:15:29 +10:00
Samuka-C
722620c1cf Xenoborgs part 3 (#36867)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-05-16 20:59:48 -07:00
Ed
132d1db37b search of life spell (#1273) 2025-05-16 00:58:48 +03:00
RedBookcase
04341e40b9 Fixed Two-Way Lever Sprites (#37390)
* New conveyor sprites - arrows!

* Revert "New conveyor sprites - arrows!"

This reverts commit 3b540be0d89d93af5028a9ae6533bbdf2954cb75.

* Reworked to only be the lever sprite update.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-05-15 11:42:17 -04:00
Ed
e0a4f5592f Blood moon (#1270)
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
2025-05-15 17:32:26 +03:00
Flareguy
338665a3ca Add hivebots (#37275)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-14 18:09:23 -07:00
Archee
dcd5bb16d5 Bikehorn Retextures (#37413)
* Bananium Horn .rsi

* Bike Horn .rsi

* Cluwne Horn .rsi

* Gold Bike Horn .rsi

* Push Horn .rsi

* Bike horn (Instrument) .rsi

* better inhand sprite for pushhorn

* Revert "Push Horn .rsi"

This reverts commit 243b3662c6bd23abad331658eb2c75b5c9183d1d.

* rsi meta attributions

* slight tweak to the golden honkers colour and energy

* adds back castShadows false

* position corrections for inhand and belt for bananium

* inhand corrections for bikehorn inhands and belt

* inhand corrections for cluwnehorn

* inhand corrections for goldbikehorn

* inhand corrections for bike_horn (instrument)

* adds 'far-side held' sprites, bikehorn

* adds 'far-side held' sprites, bikehorn(instrument)

* bikehorn belt, i made the horn cone a shade too dark whoops

* adds 'far-side held' sprites, goldbikehorn

* adds 'far-side held' sprites, cluwnehorn

* adds 'far-side held' sprites, bananiumhorn

* cluwnehorn belt, same change as bikehorn belt earlier
2025-05-14 18:05:45 -04:00
MisterImp
9868932cfe New food recipe: Draco (dragon taco) (#37212)
* Added draco (dragon taco)

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml

* fix whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-14 21:33:37 +02:00
Viator-MV
80d668361c Mana trance (#1216)
* That's it, Ed.

* skill

* CleanDisposed.

* now heal

* remake

* bruh rechek

* slowing

* Update metamagic.yml

* some ingame test and balance

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-05-14 14:56:27 +03:00