Commit Graph

79 Commits

Author SHA1 Message Date
Samuka-C 362a91273c Xenoborgs part 5 (#37068)
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>
Co-authored-by: WarPigeon <DaedalusTheGamer@gmail.com>
2025-11-23 15:22:27 -06:00
Pieter-Jan Briers 23b9e50d84 Make dirt non-compressible (#39220)
This sets the new rsic: false flag in dirt.rsi. One of the interior PNGs is directly accessed by a tile definition, which would otherwise cause a game startup failure with the new packaging improvements: c4dff678a9
2025-11-23 15:22:14 -06:00
William Lemon 29e55b9464
Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)
* Fix the sensor monitoring console forcing a GC every 3 seconds (#38146)

* Optimize sensor monitoring window graph drawing

* Add shared static Vector2 pool for all GraphView instances

* Address requested changes

* remove lock

* Update submodule to 264.0.0 (#38629)

* Toy/Plushie Inhands and Wearables (#38514)

* Fixed dependency injection and some other issues in a few places.

* More issue fixes

* patchfor broken NetworkConfiguratorLinkMenu (#38632)

fix

* Fix solutions flickering when transferring contents (#34838)

* Use Solution clones when applying SolutionComponent states

* Revert "Use Solution clones when applying SolutionComponent states"

This reverts commit 013fd111cf92b22562e00f98a7aaa49bc4b4ed62.

* Make Solution implement ICloneable and rename Clone method.

* Copy CanReact value when cloning a Solution

* Convert to IRobustCloneable

* Fix typos in guidebook: Buisness → Business (#38636)

* Fix typo in `MinorAntagonists.xml`

Buisness → Business

* Fix typo in `YourFirstCharacter.xml`

Buisness → Business

* Various Headphones Fixes and Tweaks (#38479)

* sprites, wearables

* neck

* icon-on sprite

* Cleanup prototype instantiation in `DamageTest` (#38639)

Cleanup prototype instantiation in DamageTest

* Cleanup prototype instantiation in `ExplosionSystem` (#38642)

Cleanup prototype instantiation in ExplosionSystem

* AddBodyPartCommand localization. (#38612)

commit

* fix ItemSlotsSystem debug assert (#38655)

* Allow the Command & Super door remotes to use the access of their user. (Re-creation of PR due to changes to game balance) (#35536)

* Added directional beacons (#38284)

* Added directional beacons

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Power stat and nuke codes commands get some LEC love. (#38585)

* commit

* requested changes.

* Dsay Dirty and Follow commands converted to LEC and localized. (#38666)

* commit

* whoopwhoopwhoop

* Retro laser sprite fix (#38676)

* Fixed everything except the icon

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed icon

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix water coolers (#38681)

* Monochromacy typo fix (#38686)

* fixes the typo

* Fixed cloning looking for the trait, not the component, RE https://github.com/space-wizards/space-station-14/pull/38686#issuecomment-3025093504

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Validate `CloningSettingsPrototype`s (#38688)

* Validate CloningSettingsPrototypes

* Update Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Check EventComponents too

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Add test of objective-related console commands (#36400)

* Add test of objective add/list/remove commands

* Not sure why we're validating test prototypes, but sure

* We don't need a map

* Improvements and fixups for New Status Effect API (#38660)

* Predict healing and bloodstream (#38690)

* initial commit

* reapply 38126

* fix rootable

* someone missed an important minus sign here

* try this

* fix

* fix

* reenable crit hits

* cleanup

* fix status time dirtying

* fix

* camelCase

* Healing and bloodstream prediction fixes.

* Resolving Wizard casting recall on nuke disk making it impossible to disarm (#38661)

* Resolving Wizard Recall on Nuke disk making it impossible to disarm
- Adding a DisarmBomb case to nuke status update loop
- Changing a few methods and parameters to properly follow formatting standards
- Updating some names to follow camelCase

* Updating missed tag

* Reverting DataField change

Should prevent this preventative bugfix being a breaking change.

* Switch HSV to the default colorspace for character customization (#38434)

* Made HSV default for character editor

* Adds/fixes comments to HSV defaulting

* Added dropbox fix, potentially cursed

* Revert "Added dropbox fix, potentially cursed"

This reverts commit a709883366fbee813e839742125e70844672af29.

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* Fix: Don't deploy foldables when clicking on items inside containers (#38709)

* Fix

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Pressure Relief Valve (#36708)

* initial system (this math is probably WRONG)

* General code cleanup and OnExamined support
(holy moly this code sucks)

* UICode and related events foundation
TODO:
- Actually write the XAML UI and the underlying system
- Un-shitcode the entire thing
- Actually test everything...

* Working UI code
TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't.

* Remove one TODO for unshitcoding the examine code

* Add reminder
yea

* Make predicted (defenitely isn't)
(also defenitely isn't a copypaste from pressure pump code)

* It's predicted!
TODO:
- Give it snazzy predicted visuals!
- Have a different field for pressure entry, lest it gets bulldozed every UI update.

* Improve gas pressure relief valve UI
TODO: Reminder to reduce amount of dirties using deltafields

* Implement DirtyField prediction

* Entity<T> cleanup
A lot of Entity<T> conversions and lukewarm cleanup.

Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell.

* More cleanup and comments

* Remove TODO comment on bulldozing window title

* """refactoring"""
- Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance.
- More Entity<T> conversions because I like them.
- Move UI creation handling over entirely to the ActivatableUI system.
- Fix a hardcoded locale string (why????).

* Add visuals

* Revert debugging variable replacememt
yea

* Revert skissue

* Remove unused using directives and remove TODO

* Localize, cleanup, document

* Fix adminlogging discrepancy

* Add ability to construct, add guidebook entry

* Clear up comment

* Add guidebook tooltip to valve

* Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor

* Adds more input handling and adds autofill on open

* Un-deepfry input validator shitcode
Genuinely what was I smoking

* improve visuals logic

* Refactor again
- Update math to the correct implementation
- Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs

* I'm sorry but I hate warnings

* Remove unused using directive in AtmosphereSystem.Gases.cs

* Review and cleanup

* Lukewarm UI glossup

* Maintainer for the upstream project btw

* Remove redundant state sets and messy logic

* Unduplicate valve updater code

* Redo UI (im sorry Slarti)

* run tests

* Test refactored UI messaging

* Second round of UI improvements
- God please find a way to improve this system. Feels bad.

* Update loop implementation

* Further predict UI

* Clear up SetToCurrentThreshold

* cleanup

* Update to master + pipe layers and bug fixes
want to run tests

* fixes

* Deploy rename pipebomb

* Documentation and requested changes

* Rename the method that wiggled away

* Undo rounding changes

* Fix comment

* Rename and cleanup

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix TextLinkTag (#32203)

* Adjust uplink buy button to be under item icon (#38596)

* Adjusted uplink buy button to be under item icon

* Put the discount subtext under the icon

* Indent fixes, added margin

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* Scurrets - Audio Improvements (#38482)

* Scurret audio tuning

* Add new sfx

* Update sneezing sfx

* YAML support

* Rename a folder

* make telesci wreck easier (#37569)

rel

* Validate `ShaderPrototype` IDs (#38728)

* Convert all shader prototype string literals to protoids in overlays

* Convert more shader prototype literal strings to protoids

* Convert ValidatePrototypeId to ProtoId

* Later

* [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664)

* fixed

* clean up

* orks fix smart

* review fix 1

* more requested changes

* less cursed

* more descriptive description

* better wording

* Tiny Tiny Cleanup of the EyeClosingSystem. (#38734)

Update EyeClosingSystem.cs

* Fix human skin tone distribution (#38701)

* fix: Use PredictedQueueDel for gib spell (#38729)

* fix: don't default to uncharged sprite state for cells (#38730)

* Fix Hristov description - remove inaccurate technical specs (#38746)

- Removes inaccurate 'armor piercing 14.5mm shells' reference
- Replaces it with a more funny description, matching the style of the other snipers and guns
- Keeps ammunition type '.60 anti-materiel ammo' specification
- Fixes issue #38590

Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br>

* feat: allow mopping evaporating puddles (#38743)

* Validate remaining `ProtoId` strings (#38747)

Validate remaining ProtoId strings

* Validate `ProtoId`s in tests (#38745)

* Convert string literals to protoids in Content.Tests

* Convert string literals to protoids or consts in Content.IntegrationTests

* Fix linter failures
Tricksy static using misled me

* Cleanup warning in StomachSystem (#38748)

you did not see this

* Vox scars (#38592)

* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl

* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"

This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.

* locale key fix

* Changed top surgery scar names to be more generalized

* Adjusted face scars

* Formatting fixes

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>

* UnlockNode command to LEC. (#38751)

* commit

* Update UnlockNodeCommand.cs

* commit

* move command locale to its own file.

* Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Typofixes for figurine dialogue (#38737)

* Typofixes for figurine dialogue

* Forgot two

* Janitor Tool: Wire Brush (#38667)

* Wow! It's -brush-

* spacing.

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* fixed changes

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Minor escape menu UX improvements (#38650)

* fix: spellbooks can have infinite charges (#38376)

* fix: spellbooks can have infinite charges

* refactor: indicate infinite spellbook charges with null

Not sure if I like this much better...
2025-11-06 18:22:39 +00:00
kosticia 1dd00db183 Add borders to the asteroid sand (#35397)
* tiles

* Fix

* borderless

* Astrosand

* Add tile

* Fix
2025-05-19 07:55:26 +01:00
Flareguy 656e618263 Steel tile variantization fix (#32596)
steel tile variantization fix
2024-10-07 22:26:19 +01:00
TakoDragon d9122f981c Red circuit floor (#32557)
* red circuit added

* index colour begone
2024-10-02 12:23:15 +01:00
Nemanja 96e1be9a0a metal foam grenades (#29428)
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
2024-08-09 17:34:17 +01:00
Flareguy 353f451d25
Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)
* replace the grass sprites. again

* Fix dirt

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-05 20:26:30 +02:00
Nim 6b77998c2a
Floor trap (#26314)
* trap

* without effect

(cherry picked from commit 3f2e15896b10f43996696195b58649270e9fcb30)
2024-04-21 23:22:09 +02:00
Iztok Bajcar a0be07118b
Made glass more opaque (#26948)
* Made glass more opaque

* Made glass a bit less opaque

(cherry picked from commit f56373321a948ac7e321a4e596b1c87621557c97)
2024-04-21 23:18:13 +02:00
Ko4ergaPunk 0790ceddea
Fix chromite chasm sprite (#25819)
* fix

* Remove stripes

* empty

(cherry picked from commit 2a5be69898b8a0f3750c860e69cce1c819518af2)
2024-03-17 14:43:57 +01:00
MACMAN2003 bbc0f1e15f
Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml

(cherry picked from commit f0e8695a91b787c8107ebf198309d92159463dc0)
2024-03-07 01:26:19 +01:00
Ed 8abda21a63
Fix attribution (#25495)
Update attributions.yml

(cherry picked from commit af7e8025ad59c2f44e37e7b15625421264355e5b)
2024-03-05 09:49:44 +01:00
Ps3Moira e9a74b764f
Add Large Wood Floors (#25462)
Large Wood Floors

(cherry picked from commit 83cd1089fe970adc5fee5344cfee4aa046d6f501)
2024-03-05 09:48:29 +01:00
Ed c2995bb848
Train station (#24927)
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e

(cherry picked from commit f64a32990a27cec5bd958180eb833b9efffeb565)
2024-02-21 04:06:36 +01:00
Flareguy 21db631ee4
Shuttle floor resprite (#25127)
* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update

(cherry picked from commit a93466ac24c7256d4b584ba830c4fa1cda253d5a)
2024-02-18 22:54:03 +01:00
Flareguy b5b23756c1 adds lime tiles (#22235) 2023-12-16 19:33:20 +01:00
NULL882 670e4c8c11 Mining things (#21909)
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
2023-12-02 20:18:13 +01:00
Flareguy 764581d497 Adds damaged plating (#21711)
* adds damaged & burnt plating tiles, corrects a miscrediting in attributions.yml

* placeholder BEGONE

* fix those attributions
2023-11-19 22:22:01 +01:00
Flareguy 16d9562761 Adds damaged steel tiles (#21700)
* adds destroyed steel tiles; corrects a mistake in attributions.yml

* dode
2023-11-19 22:16:38 +01:00
Ed 40271a02b8 Cave Decoration pack (#21265)
* add chromite chasm

* add desert chasm

* snow chasm

* finish
2023-10-31 18:48:53 +01:00
Ed a2abb24273 Shadow Dimension visual pack (#21237)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-10-31 18:45:37 +01:00
Emisse ca289d4f0b
Revert "Semi revert glass tile resprite (#19266)" (#19931)
This reverts commit 38f921f831.
2023-09-09 00:33:22 -06:00
potato1234_x 38f921f831
Semi revert glass tile resprite (#19266) 2023-09-06 14:41:53 -07:00
PixelTK 74bd86af2f
Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
Kara cd9ceb2378
Ice & snow tile modernization (#19689)
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
2023-08-31 15:31:23 -06:00
Flareguy 1b26a7f602
Slight monotile modification & raw sprites folder (#19613)
* slight steel tile fixes & raw sprites folder

* fuc
2023-08-30 19:02:35 -06:00
Nemanja f4503864d5
Concrete and asphalt tiles (#19642)
* concrete and asphalt

* los decals
2023-08-29 17:50:11 -05:00
Flareguy 370cbfbbdd
Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237)
* makes asteroid tiles and snow use weighted variantize, adds snow plating

* GO FUCK YOURSELF!!!!

* hello? boner department, id like to order a DINNER. make it MAMA LUIGI

* test fix. hopefully. boner. boobies.

* did he know? (no)
2023-08-24 23:40:04 -04:00
Kara cfccb5959a
Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
PixelTK f189b73fe5
Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
Flareguy ea06a33a81
Updates asteroid tile sprites & adds asteroid plating (and tile items too, I guess) (#18937) 2023-08-10 10:46:43 -07:00
Kara 42b38b7a5d
Liquid plasma floor entity (#18957) 2023-08-11 00:16:51 +10:00
Flareguy 8c256d3960
Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676)
* adds checkered floor tiles, hull tiles, and steel monotile decal

* adds checker floors, hull floors, and dirty steel monotile decal

* adds hardened reinf tiles
2023-08-06 02:27:48 -06:00
Flareguy 472c321f9b
removes hueshifting on plating sprites (#18726) 2023-08-05 20:04:12 -04:00
Flareguy 55f95f3741
resprites plastic & dirty steel tiles to match new floortile style (#18643) 2023-08-04 02:55:07 -06:00
Flareguy 3c5d913b1e
Tile Resprite: Return of Supernorn-style tiles (#18513)
* re-resprites tiles to closely match supernorn tiles

* swag messiah

* meta.json fixe

* we decided to make an entire episode about it
2023-08-01 00:09:46 -06:00
I.K 1bce3f70ef
New glass floor textures (#17948)
* change

* Update attributions.yml
2023-07-11 13:34:07 -06:00
Kit0vras b3ac3c076e
Broken wood tiles (#16776)
* broken wood tiles decals

* deleting decals

* broken wood tile
2023-05-25 16:06:06 -06:00
metalgearsloth e30c3ec5ad
Revert "Plating & Tech Maint resprites (#15817)" (#16002) 2023-05-02 16:04:12 +10:00
Flareguy 06482a9b2a
Plating & Tech Maint resprites (#15817) 2023-04-30 16:36:12 +10:00
brainfood1183 2fba2b18ab
Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
metalgearsloth 6157dfa3c0
Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
metalgearsloth 0aba0d2ec2
Content tile edge support (#13168) 2023-03-05 12:19:50 +11:00
metalgearsloth 37f432ca58
Procgen biomes (#13487)
* Planetmap tiles

Biomes etc etc

* a

* oop

* Chunk-based rendering

* funny

* Less allocations

* Fix overdraw

* Content tile edge support

Also updated grass to use it as a POC.

* Kindly revert

* Update for variant edges

* fixes

* Use fastnoise

* Remove redundant group

* a

* refactor a fair bit

* Prototype data instead

* tweaks

* a

* fix maths

* working

* a

* Slightly better empty support

* a

* flowers

* sounds

* lewd

* Networking

* more fixes

* better

* colours

* Some chunk loading

* Proper loading and unloading

* Better loading

* Fix parallax and movement sounds

* Anchoring support + decal setup

* Most of the way to load and unload

* Decal loading kinda werkin

* large trees

* started diffing

* a

* Variant support and deserts

* a

* snow

* agony, even

* working again

* todo

* a

* laba tiles

* aeiou

* a

# Conflicts:
#	Resources/Prototypes/Entities/Tiles/planet.yml
#	Resources/Prototypes/Tiles/planet.yml
#	Resources/Textures/Tiles/Planet/Lava/lava.rsi/meta.json

* laba

* Add lava

* Initial ignition

* triggers

* a

* a

* y

* Add basalt tiles

Did some unconventional things for the animation + rocks.

* fixies

* mergies

* promotion

* lava biome

* Lava planet start

* cleanup and more lava

* laba

* maccas

* biome stuf

* weh

* bongflicts

* aeaeae

* More fixes

* a

* these too
2023-02-12 02:15:09 +00:00
Nemanja f450398df7
More anomalies (#13766) 2023-02-06 01:03:53 -04:00
metalgearsloth e090cd393b
Add basalt tiles (#13462) 2023-01-17 11:28:37 -07:00
metalgearsloth 6c9ce79387
Add lava (#13438) 2023-01-17 11:25:32 -07:00
metalgearsloth 375490bb8c
Add command for creating simple planet maps (#12698) 2022-11-23 17:35:25 +11:00
brainfood1183 062d3c656e
New Tiles (2 maintenance specific and 1 new wood). (#12193)
* new maint specific tiles

* merge

* merge

* merge

* merge

* Update Resources/Textures/Tiles/attributions.yml

Co-authored-by: Moony <moony@hellomouse.net>
2022-10-25 13:27:06 -05:00