Commit Graph

430 Commits

Author SHA1 Message Date
potato1234_x c8a02d666f
makes closets/lockers better (#24942)
* hmngm

* fix

(cherry picked from commit e94fba5f702820588ad358a1824d67920fd399f8)
2024-03-23 23:58:16 +01:00
Ko4ergaPunk 519573369b
New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix

(cherry picked from commit 909b2aaa2d5976122f17f9e4fe6ce1a1389dc619)
2024-03-23 23:51:40 +01:00
wafehling 17ca360528
Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
2024-03-17 15:06:02 +01:00
Ko4ergaPunk e158b929a3
Post light update (#25814)
* penis

* done

(cherry picked from commit 0ab4acedebd765109e78cdf532a18e05ed1ba206)
2024-03-07 01:28:34 +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
rosieposie 80252981a3
Additional Signage (#25766)
initial commit

(cherry picked from commit 55b0cb19348d391392cdfdf912f7ef9e04dbf9be)
2024-03-07 01:16:34 +01:00
Flareguy 71c14d9701
New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723)
* adds a new syndie space shuttle ruin + plastitanium windows

* the green goomba gaming

* fixe

* visor > gloves

(cherry picked from commit 7b9346d2a8f3ab7e62c19b207ba5091cbddd6ecd)
2024-03-07 01:10:09 +01:00
Ed bbb4fe256c
Colourful curtains (#25684)
* curwa

* fix

* huh

* revert huh

* add fancy white

* resprite hospital

* add suffix

(cherry picked from commit 66cf642e5632dd960a0af56b526020ec1b025c24)
2024-03-07 01:08:11 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
2024-03-07 01:05:02 +01:00
rosieposie 13bb2e7dd7
Lockable Buttons & Button Frames (#25631)
initial commit

(cherry picked from commit 8dd1748cec4f69496c0f16aa1dae1ab20bb15c2b)
2024-03-07 01:02:29 +01:00
Zadeon a48c9cc1e2
Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.

(cherry picked from commit 133bd0353a16a3b2260555318a1389b1c2c0f0e9)
2024-03-07 00:59:54 +01:00
Sphiral f699a98bd0
More windoors (starring directional window) (#25501)
* Added Plasma and Uranium Windoors, plus uranium directional windows

* I forgor the locked proto's too ;-;

* Skill issue, forgot to remove something that was a test

* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)

* No more static prices for windows/windoors

* I wish I knew how to run the tests locally ;-;

(cherry picked from commit 88ae71715b89b4ada2dfa42331c12962f73485fe)
2024-03-07 00:59:33 +01:00
Ed 40fabb5bed
Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish

(cherry picked from commit 84cbcb93cacf339510d9190ad18e377c892df3b3)
2024-03-07 00:59:07 +01:00
Velcroboy 5453c1c6ba
fixes arcade tile position (#25620)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 918eb1fe87d1543be84b8dba5c654434afa7f9a3)
2024-03-07 00:57:38 +01:00
hiucko e30a380677
add "missing spacepen" poster (#25502)
* add missing spacepen poster

adds missing spacepen poster

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

(cherry picked from commit 97d41cf9453025a07fe067f2d2c2cacc60e56593)
2024-03-07 00:55:37 +01:00
potato1234_x cf4d51b56a
fix solar computer sprite (#25548)
fix

(cherry picked from commit 7ba6765a6af09e060f539d8b6fa847de9512c4c9)
2024-03-07 00:52:47 +01:00
Ko4ergaPunk 73249e78bf
Add new stairs (#25212)
* Add new stairs

* Resprite

* Resprite again

* empty

(cherry picked from commit 688c9ab8179b3a46542d6301c2a52f8c8345a482)
2024-03-05 09:36:37 +01:00
MilenVolf cb0fdb47d1
LockVisualizer (#25224)
* LockVisualizer

* Fix state

* Clean some code

* Make it component, fix tests fail

* Fix for StateUnlocked

Now it is possible to manually set the unlocked state and it will work!

* Optimize LockVisualizer, add check for unlocked state

* No todo I guess

(cherry picked from commit c7870882f6f956eea07cbb4738ae45c8805c8ce6)
2024-02-18 23:27:28 +01:00
Ed 9dcdbea279
Shadow anomaly returns (#24629)
* content

* add cat

* ambient

* I FORGOT HEARTS!

* fix ambient

* some fixes

* canCollide: false

* connect to damageable

* pi

* remove fx

* some fixes

* *sad bruh*

* hazed

* Update base_shadow.yml

(cherry picked from commit ae321151cab2e3f4327dfcbc73ffc01bbb2e3de6)
2024-02-18 23:03:02 +01:00
KREKS 5db2c41251
Glassbox shatter resprite (#25136)
(cherry picked from commit 6850d47ca537d967088cb7bb6472dfa53802b01a)
2024-02-18 23:02:06 +01:00
Nim e3ed747015
Glass box for antique laser pistol (#25104)
* glassbox

* fix

(cherry picked from commit 2a9fa67a7fef8c6f8f54d507c88fc4e399d1fd4f)
2024-02-18 22:45:48 +01:00
sneb 0a94997478
Fixed glass cargo opened sprite (#25003)
(cherry picked from commit f8df3ae398712acfe8132ac640ecf9d9941d48a1)
2024-02-08 12:40:22 +01:00
Flareguy b9804a6126
Airlock assembly prototypes (#23821)
* adds prototypes for airlock assemblies for other doors

* fix tests

(cherry picked from commit d76121d470c1e159787a6b991c0599068bd06a5f)
2024-02-08 12:13:23 +01:00
Sergey Dikiy f6f08bdc55
Added Warning state for AME (#24699)
added warning state for AME

(cherry picked from commit f3ff35dcfa5afb417c24ba9f21cfc2bc414d0c4f)
2024-02-08 12:11:05 +01:00
Ed 758484e97f
Fire anom rework (#24666)
* content

* d

* fix artifact

(cherry picked from commit 3deea2f7d68c05ec415e075328533c6eb1d4f8e6)
2024-02-08 11:52:34 +01:00
Ed 9f8b6d7df7
Rock and Meat anom rework (try 2) (#24449)
* rework

* bruh

* all fixed

* balance

* bb

* Update TileAnomalySystem.cs

* Update EntityAnomalySystem.cs

* spawn on shutdown variant

* fix entites, fix DataRecord

* fix some review

* god forgive me

* oh fuck wrong brench

* Revert "oh fuck wrong brench"

This reverts commit c81f57f7830c8e55fd47982500c57281af40b0dc.

(cherry picked from commit de9d7aed17f3fa5fe5bf43bea07e4ca07908d528)
2024-01-28 00:32:17 +01:00
Flareguy 855ddbb3c7
Better rusty wall sprites (#24471)
* makes rusty walls use their /tg/ sprites

* my furniture. is. broken

* robocop

(cherry picked from commit 1abbf378321259d4c9c245ec204cab27d5757813)
2024-01-27 23:54:36 +01:00
Nim b57f8429d1
Solo bench (#24203)
* solo bench

* price

* fix

* comfy

* 111

* clear

(cherry picked from commit 016d35645f840bf76511734d4081e7b2b61c5624)
2024-01-27 23:51:28 +01:00
Ed 746db6552b
Revert "Start rebalancing anomalies - Rock and Flesh anomaly reworked" (#24448)
(cherry picked from commit 05a7eb07c27a0304285a4c8ef5f1e5b6bdd566a9)
2024-01-27 23:50:29 +01:00
Ed 7c72be35f8
Start rebalancing anomalies - Rock and Flesh anomaly reworked (#24381)
* rework

* bruh

* all fixed

* balance

* bb

* Update TileAnomalySystem.cs

* Update EntityAnomalySystem.cs

(cherry picked from commit b02c211e2f22a10901fa57a5c76a625be8be4a3d)
2024-01-27 23:50:26 +01:00
SonicHDC 9a291d50b1
Reinforced diagonal (#24393)
* Textures

* Protowall

(cherry picked from commit b5013fecdd978a4a021edfdde089796bcacdb43e)
2024-01-27 23:42:54 +01:00
Magnus Larsen 7bc6d37b5c
Fix security camera sprite when viewed at an angle (#24357)
The 8-directions is a vestige of /tg/station, where the extra
directions were used to place cameras on the left or right half of the
wall.

Setting it to 1 directions (sic) allows the game engine to rotate the
sprite for us, which is fine as the art currently has no perspective.

(cherry picked from commit 15f91b07207b803e7bb581bf30dd2a21d813edf0)
2024-01-27 23:40:27 +01:00
Menshin 7ff780dae6
PA control box part detection fix (#24356)
* * Fixed rounding errors when the PA control box was checking for parts, sometimes leading to the obscure "port/starboard emitters are not detected".
* Auto-rotated the PA control box toward the fuel box when checking for parts
* Swapped the wired/completed state sprites for the PA control box as it appears they were inverted

* Update Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit eb0a54fef295d4b05f864a0f4af404e8870d505f)
2024-01-27 23:40:24 +01:00
Ed 145c2158ca
Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit a2d5d74b46060d330e5aa14e166692f32dcce7a9)
2024-01-27 23:40:06 +01:00
Ed 378b1199ac
The glowing forest anomaly (#24351)
* sans

* Papyrus

* add to game

* tweak stick

* fixes

* Update Resources/Prototypes/Entities/Objects/Misc/kudzu.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit b3b64e6cf29f313a9782fb95ae8727f907b1836a)
2024-01-27 23:36:10 +01:00
Ubaser bfb7aa6a89
Improve light tube sprites (#24270)
* fix

* blocky

* glowier

* darker

(cherry picked from commit e3d5dc4d76908cb1da4d71187f7cc77ac146eb68)
2024-01-26 23:10:02 +01:00
Nim 061432debd
Construction Blast door (#24050)
* construction blast door

* fix

* price

* fix2

* hem

* xif

* Static

(cherry picked from commit efb424834add46f88b8c404a93683f5a83abf21f)
2024-01-26 22:53:00 +01:00
Nemanja e624317d37
Cryogenic Sleep Units (#24096)
* Cryogenic sleep units

* pause map support

* no more body deletion

* Cryogenic Storage Units

* boowomp

* no more emag, no more dropping present people

(cherry picked from commit 736b9dd7df6e35f07fed88686c7c863ac61af846)
2024-01-26 22:51:41 +01:00
Alekshhh 12e6ea75cb
Suit Storage Visual Change (#23799)
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d8dad78661cb2511113184ced30d073.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* dsd

* sdst

* sd

(cherry picked from commit 374260c49e3ac697b476cfb2a398520a9561bdf8)
2024-01-26 22:50:10 +01:00
Tayrtahn 87d60504e3
Hackable intercoms (#23984)
* Enable wire interface for intercom

* Implement BlockListening component and system

* Implement ListenWireAction

* Added cooldown/overload to mic wire pulse

* Properly persist voicemask settings when user already has one.

* Addressed requested changes

* Added wire panel open/closed visuals

(cherry picked from commit 2d6d2aba0b1b2b41bbcafb9f60ead926e6b67d16)
2024-01-26 22:37:41 +01:00
Ubaser 5afb235320
Substation resprite (#23977)
* add

* add

(cherry picked from commit 0662c8140128d36ee094e128becbe08b5e9bcacd)
2024-01-26 22:34:35 +01:00
Flareguy 73fb1b3f91
Fix light tube broken state (#23939)
fix light tube broken state

(cherry picked from commit 79ab290444889b2914b51e36be30d5bb51308c90)
2024-01-26 22:27:14 +01:00
Nemanja 9890ea542c
machine parts + power cell resprite (#23913)
* machine parts + power cell resprite

* logic fix

(cherry picked from commit b3014e6cb33cecb6796c3002385d862d581e2762)
2024-01-26 22:26:40 +01:00
Flareguy 601bcefb3b
Makes lights use the "old" light fixture sprites (#23898)
returns the ss13 light fixture sprites

(cherry picked from commit 31cc9babaa4ab699600782a981a10a039430f3b7)
2024-01-26 22:26:16 +01:00
Flareguy 6e688894aa
Adds the old AI sat ruin from SS13 (#23836)
adds the old AI sat ruin from ss13

(cherry picked from commit 798057e04d3def0850c5e0f044cb3f9303d35789)
2024-01-26 22:22:03 +01:00
Nemanja 53c4793673
Turbo Recharger (#23723)
turbo charger

(cherry picked from commit c861b66a476a1ea1037ec173b088cafd5519f757)
2024-01-26 22:12:03 +01:00
Nemanja 77bd303603
Hellfire Thermomachines (#23543)
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit a78e9a854ebb744ca82fcdbca4968f0197d05a84)
2024-01-26 22:07:36 +01:00
Ed acdef432dc
Teslaloose and Singuloose counterplay (#23444)
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Locale/en-US/research/technologies.ftl

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 0f8c004a2f6cce3443f0e2e9bbbc3c8ac12d0eba)
2024-01-26 21:41:52 +01:00
deathride58 f100a9d414
Glowy lights - light fixtures now actually glow (#23428)
* glowy lights - makes light fixtures actually physically glow when active

* serviced the lights

* ya sure

(cherry picked from commit 1a531342c5c8b2860054f79479b02c8083f3b5d0)
2024-01-26 21:27:53 +01:00
Nemanja 96d1e4090f
Flatpacks and the Flatpacker 1001 (#23338)
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename

(cherry picked from commit 1c11332fa4b77d556e7f3db17f391dbd2664cda5)
2024-01-26 21:27:25 +01:00