Commit Graph

450 Commits

Author SHA1 Message Date
MilenVolf 2fc9743793
Glass box fixes + Construction & Stealthy deconstruction (#25365)
* Showcase update

* Fix craft prototype. Add glass box deconstruction for stealth gameplay

* Remove duplicated tag

* Forgor

* Some cleanup

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-05-06 01:32:04 +02:00
brainfood1183 eb9e3974d0
Rodents can be Faxecuted (executed via Fax machine) (#21461)
* Rodents can be Faxecuted (executed via Fax machine)

* use brute instead of new group.

* fax visuals now use tags for mouse and hamster instead of comps

* fix for ubuntu, damn ubuntu bane of my life

* cant copy hamlet, can now faxecute mothroaches.

* fix

* fix

* fixes

* removed ifs now using switch, removed hastag now using string.

* fixes and no more switch

* cleanup

* more cleanup

* fix

* cleanup

* moved damage out of faxmachine and into own system and component.

* changes

* fixes and done i think.

* tidy

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-05-06 01:31:20 +02:00
Flareguy 79f14d4206
Revert "Maints Exit Sign" (#27271)
Revert "Maints Exit Sign (#26831)"

This reverts commit 905102064cd1311943093c9feeecca8bbd8bc358.

(cherry picked from commit 10ad53df7296506485033a3dae572e4016553630)
2024-05-02 23:59:57 +02:00
brainfood1183 25c8019a69
Maints Exit Sign (#26831)
* Maints Exit Sign

* change description

* id, sprites changed from maints to exit
prototype now has an unshaded layer so it can be seen in the dark.

(cherry picked from commit 905102064cd1311943093c9feeecca8bbd8bc358)
2024-05-02 23:59:29 +02:00
Hannah Giovanna Dawson 4edf577b1b
SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75601c73c0b7b917d0faac35c99f96fe)
2024-04-21 23:46:34 +02:00
lzk f96de489f2
Make cargo pallets smoothing with eachother (#27049)
(cherry picked from commit 24390ef51bdf00f65d199d74300504391a83c521)
2024-04-21 22:05:40 +02:00
metalgearsloth cc5d741a09
Added Jukebox (#26736)
* Added Jukebox, along with music for jukebox

* Fixed Jukebox meta.json copyright

* Removed songs I couldn't find a license for.

* Renamed files to solve check failures from spaces

* Added missing attributions.yml

* Fixed lack of description in Jukebox

* Jukebox is now constructable.

* Change Jukebox menu to FancyWindow

* Moved Jukebox messages out of jukebox component

* Removed Jukebox OnValueChanged.

* JukeboxComp now uses AutoGenerateComponentState

* Removed state code, since it's auto generated

* Fixed various Jukebox code to match conventions.

* Updated Standard.yml to match changed song list.

* fixes

* Jukebox workin

* Fix

* Polishing

* Finalising

* Revert

* bad

* jukey

* Reviews

* name

* Update submodule to 218.2.0

---------

Co-authored-by: iNVERTED <alextjorgensen@gmail.com>

(cherry picked from commit 2db374988c91c6ce5f932b9cee1ba251cbfb22e5)
2024-04-21 22:04:54 +02:00
Verm b8e216318c
You can now see paper on crates (with color!) (#26834)
* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 96ad9002f1d6390bf666c74ddfd871a45a8fe1df)
2024-04-21 21:56:49 +02:00
Ko4ergaPunk 2be19eafdd
Strobes added (#26083)
* Done

* Adds new

* empty

* attributions

* empty

* strobe admin deleted

(cherry picked from commit 279e01c3d26ce8332114103b2045abb61886c614)
2024-04-21 21:54:14 +02:00
Flareguy cf8c6edecd
Add emergency nitrogen lockers (#26752)
(cherry picked from commit 4017f9bd28251a3cbf3c0fb34499c6b821051498)
2024-04-21 21:51:55 +02:00
Velcroboy f5c7808446
Fix shuttle structure construction (#1069)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-09 22:12:36 -05:00
lzk 3f8c142e25
Little disk printer sprite tweaks (#26711)
* Little disk printer sprite tweaks

* ill change this aswell

(cherry picked from commit cc99bbe49ed33effcd9f541443c9c52ab9276e6e)
2024-04-07 14:31:37 +02:00
brainfood1183 a7fb1b4bbc
Toilet Upgrade (needs review) (#22133)
* Toilet Draft

* fixes

* toilets now have secret stash to place items in cistern.

* fixes

* plungers now unblock toilets.

* fix sprite

* new sprites and fix

* fixes

* improve seat sprites.

* fix

* removed visualisersystem changed to genericvisualizers

* flush sound for toilets and copyright for toilet sprites.

* fix atrributions

* fixes

* fix datafield flushtime

* sprite improvements

* fixes

* multiple changes

* fix

* fix

* fixes remove vv

* moved stash related functions to secret stash system from toilet.

* fix

* fix

* changes for recent review.

* fix

* fix

(cherry picked from commit 5f063d2d6d2a41702b60d11f779e23c34fa74410)
2024-04-07 14:18:32 +02:00
Tayrtahn c725fe4cf3
Arcade machine improvements (#24200)
* Give 'em something to talk about

* Wire panel visuals

* Wire graphics tweak

* More ads and thanks

* More ads for a noisy arcade

* New screen for space villain machines

* Implement EmitSoundIntervalComponent and a bunch of arcade noises

* Require power for sounds

* Allow earlier startup intervals

* Orange glow

* Audio attributions

* Include the PR link

* Replace EmitSoundInterval with expanded SpamEmitSound

* Remove pacman-themed arcade sounds

* Documentation good.

* Updated methods to use Entity<T>

* Refactored SpamEmitSound to get rid of accumulator and chance.

* Fixed prewarm logic

* Moved stuff to Shared

* Fix outdated YAML

* Better prediction, auto pause handling

* Make enable/disable reset the timer instead of trying to save it.

(cherry picked from commit b1ba6b5bb615615cc58f255dc9fe84c5ffe8822b)
2024-04-07 14:08:06 +02:00
Sphiral 6dfb123db1
Church Bells (#26030)
* Adds Church Bells

* I'm dumb.

* The bell is no longer haunted.

* forgot attributions

* change sounds so scary law no hunt

* One day I'll stop needing to make an immediate micro-commit. One day.

* God damn it.

(cherry picked from commit a0cc87c2673bc0930adafe9ab8650700d8ecf2e3)
2024-03-27 18:37:01 +01:00
Luminight e8840dc15d
Unswap small and tall wodden fence gates (#26409)
(cherry picked from commit 92ab9a8a01ab1cc57bbb449501bed3b77d19b327)
2024-03-27 18:35:14 +01:00
Null c966843448
Purge CRLF 2024-03-27 17:24:14 +00:00
Null 668488e74b
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v into 2024/03/23-merge-master 2024-03-27 17:22:41 +00:00
Null 0cdd16bc4d
Convert to Unix 2024-03-27 11:05:48 +00:00
OnyxTheBrave 4357118040
Changed black carpet texture to correctly align itself. (#26358)
(cherry picked from commit 05f282f5ce2153bca840f287a8abcd3863a08e42)
2024-03-24 00:14:22 +01:00
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