Commit Graph

817 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
Nemanja 043880a89b
welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baaa50044189ffa5176431a99942e93bd)
2024-05-03 00:27:50 +02:00
Ghagliiarghii f9d50c224c
Increase availibility of combat knives to security (#27224)
* Increase availibility of combat knives to security

* whitelisted combatknife in secbelt for Diona

* Revert SecDrobe change for MGS

(cherry picked from commit 88b56efba102c0f537c268f3b23e21715d5c34d6)
2024-05-02 23:59:23 +02:00
potato1234_x 9ad13b8200
Psicodine, Mannitol, Lipolicide and Happiness (#27134)
* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit e2b260d894812194f444e209dfc1d1d2ea0ab645)
2024-05-02 23:53:00 +02:00
Weax 180b3f21c3
Make CLF3 reaction require heating first. (#27187)
* heat your bombs

* Removing comment

(cherry picked from commit b5bcf86b74e76ba15aa0cb2a2fe39f81cb8991cd)
2024-05-02 23:52:58 +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
Gyrandola 38a4bee25e
chili/chilly peppers sprite alignment fix & minor refactorization (#25971)
* png alignment and minor refactorization

* Update migration.yml

---------

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

(cherry picked from commit fa5b93871f7e6605c583336e4fa89a35ed32a314)
2024-04-21 23:21:17 +02:00
osjarw 9371518b75
Wallmount substations can once again be created (#27138)
* Wallmount substation once again obtainable

* Fill mapped wallmount substations with components

(cherry picked from commit acb112b05439fc7e5d2c60b3c66ba19d38e0e066)
2024-04-21 23:20:51 +02:00
shamp 829d2f03ba
Stunprod rework (#25922)
stunprod

(cherry picked from commit 1bfcc062f2d7ad7925d4207a90c4ca9609b609b3)
2024-04-21 23:19:40 +02:00
ArZarLordOfMango a0eaba4bc3
Add recipe of beverage jug (#25681)
* Add craft of beverage jug

* Change steel to plastic

* Fix price

(cherry picked from commit 94aa61b32342eb616d2bf21839f84dc5ffaecbea)
2024-04-21 22:11:23 +02:00
Token 542d4dc35b
Rebalance: From Insuzine recipe removed Benzene (#26829)
* From Insuzine recipe removed Benzene

* Remove ash from Insuzine recipe

(cherry picked from commit 8d21ef0aa23e5ee72cf04845cf8b9006c6e9f130)
2024-04-21 22:08:37 +02:00
Krunklehorn ff88c958ad
Standardize HoS/Warden winter coats, add unarmored variants for printing (#24865)
* Both winter coats with same armor as their counterparts

* Matching description for HoS's, unarmored variants for balancing the uniform printer

* Forgot some text

* New sprite provided by PursuitinAshes, old sprite moved to unarmored version

* Removed the 'unarmored' specifier, in line with the rest of the winter coats

* Remove unarmored warden, no sprite

* Re-implemented the warden's unarmored coat, with sprites from Dutch-VanDerLinde

* CRLF to LF

* Move armor values to abstract

(cherry picked from commit d67d782f99f5d26558dbafaf43ec4b95202d16d6)
2024-04-21 22:06:55 +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
Token 2c25d46c99
Make lockers can be deconstructed only when unlocked now (#26961)
* Fix lockers are not deconstrucable now

Lockers are was deconstructable event when they closed and you didn't have access to them. In short - get stuff by 5 seconds, 5 sec it's time to screw down any locker, except LockerBaseSecure one

* Revert un-destructable lockers fix

Make lockers destructable again

* Fix lockers that deconstructable only when unlocked now

(cherry picked from commit 7a6067989fde5b5e1b791d40d566adf7a74d203f)
2024-04-21 22:00:38 +02:00
metalgearsloth 55e1c39abb
Fix standart -> standard and dressfilled test fail (#26942)
Fix standart -> standard

(cherry picked from commit dc19964d84149354bb10fd186283f1a9d7da9cf5)
2024-04-21 21:56:25 +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
Token 4a2e7621c3
NoticeBoard is craftable now (#26847)
* NoticeBoard is craftable now

* Fix notice board to proper name capitalization

* Fix notice board proper name in description

* Update Resources/Prototypes/Recipes/Construction/furniture.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit e88b2467ca36c25c15095b7e7e0357c55ed581e2)
2024-04-21 21:53:57 +02:00
Tayrtahn 8dad1ab006
Server-only component YAML cleanup (#26836)
* First pass cleaning up server-only YAML errors.

* Second pass

(cherry picked from commit a0de0ab1f807be5ad69fcc04136755239d75ce8a)
2024-04-21 21:45:03 +02:00
Hanz f0169cfe28
Spears equippable to suit storage (#26724)
* meat and potatoes

hahaha

* DAMAGE

yes

* come on

* Check again

* Guhhhhh

guh

(cherry picked from commit 263469dffa200eab09ba270a2eb58f1b98c78f2f)
2024-04-21 21:44:13 +02:00
lzk 5166458f8a
fix bodybag id case (#26823)
* Fix body bag id

* migration

(cherry picked from commit 7188b509df60d196384494519a31cbf6e1bbe108)
2024-04-21 21:30:48 +02:00
Adrian16199 fb352a2733
Brings back the clown hardsuit. (#1083)
* Brings back the clown hardsuit.

* Will this fix?
2024-04-12 14:10:59 +00:00
Velcroboy f5c7808446
Fix shuttle structure construction (#1069)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-09 22:12:36 -05:00
osjarw 2f43089e71
made thin firelocks constructable/deconstructable (#26745)
(cherry picked from commit 107dc0e0369d43a1f07dcca89dca6c8501f08af1)
2024-04-07 14:36:01 +02:00
Alzore 9f8885dc48
Dionae now bleed sap, and this can be used to make syrup. (#25748)
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun

(cherry picked from commit 5523e016f4af4f4574c3e26757e7dbbb09de457f)
2024-04-07 14:35:55 +02:00
deltanedas af58fc5b54
make fulton recipe faster and require cloth (#26747)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit f433e2d9f858f38e8aa6fb8c3ac35b1d9a4938d6)
2024-04-07 14:35:15 +02:00
Verm c452e05d86
Make baseball bat crafting require a slicing tool (#26742)
Make baseball bat crafting harder

(cherry picked from commit d802928610ae27627dc974663fd215490b81c06e)
2024-04-07 14:35:14 +02:00
Firewatch 08adf15afb
Bartender "Essentials" (#25367)
* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst

(cherry picked from commit ea3e98e1208f21aa2a52b0a9938ee22e07b74ccd)
2024-04-07 14:27:22 +02:00
c4llv07e ecbef2b8eb
Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu

* Use file-scoped namespaces

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Open door electronics configuration menu only with network configurator

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Make the access list in the id card computer a separate control

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Fix merge conflict

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove DoorElectronics tag

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Integrate doors with #17927

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Move door electornics ui stuff to the right place

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Some review fixes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* More fixes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* review fix

Signed-off-by: c4llv07e <kseandi@gmail.com>

* move all accesses from airlock prototypes to door electronics

Signed-off-by: c4llv07e <kseandi@gmail.com>

* rework door electronics config access list

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove Linq from the door electronics user interface

* [WIP] Add EntityWhitelist to the activatable ui component

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Better interaction system

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Refactor

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Fix some door electronics not working without AccessReaderComponent

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Move AccessReaderComponent update code to the AccessReaderSystem

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove unnecesary newlines in the door access prototypes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove unused variables in access level control

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove unnecessary method from the door electronics configuration menu

Signed-off-by: c4llv07e <kseandi@gmail.com>

* [WIP] change access type from string to ProtoId<AccessLevelPrototype>

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove unused methods

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Newline fix

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Restored to a functional state

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Fix access configurator not working with door electronics AccessReaderComponent

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Replace all string access fields with ProtoId

Signed-off-by: c4llv07e <kseandi@gmail.com>

* move access level control initialization into Populate method

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Review

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 64bb8dbdd50e0b1e5744e1eb0cc6f24bda959ade)
2024-04-07 14:26:56 +02:00
lzk 29df38666a
Combine flower crown and wreath (#26605)
* Combine flower crown and wreath

* huh

* huuh :trollface:

(cherry picked from commit 55c77af33cad8e173c6281286fc66f3a67579eb5)
2024-04-07 14:21:56 +02:00
lzk a5720dfe23
Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit d5052697aa21ffddb9cec49f9b445ce194e41eab)
2024-04-07 14:21:14 +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
Flareguy b05cb2bb2d
Makes secglasses roundstart (#26487)
* makes secglasses roundstart

* fix epic fail

* fix tests questionmark?

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

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

---------

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

(cherry picked from commit a98d0cfe2e120f90c269e810f1365dad404d645a)
2024-04-07 14:17:35 +02:00
Velcroboy 4dcfb0b0d0
Adds construction/decon graphs for plastic flaps (#26341)
* Adds construction/decon graphs for plastic flaps

* Dang arbitrage

* undo conflict

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
(cherry picked from commit 48e5c3cc8de5f830a74de5cd7671fa42c2995edd)
2024-04-07 14:16:50 +02:00
Boaz1111 43cc2e7db0
Industrial Reagent Grinder (#25020)
* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot

(cherry picked from commit 6ef592ddba336a41330eaf3760a600c805907e1d)
2024-04-07 14:14:05 +02:00
wafehling a8e4d461b1
Chemically-created Crystal Shards (#26269)
Added chemical reaction for making crystal shards

(cherry picked from commit b0416372632d963338475c04d743b6916d4a1d61)
2024-04-07 14:11:34 +02:00
Futuristic-OK 05242f785e
Curtains fix (#26447)
* Update furniture.yml

* Update curtains.yml

* Update Resources/Prototypes/Entities/Structures/Decoration/curtains.yml

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

---------

Co-authored-by: Futuristic-OK <141568243+FuturisticRUS@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
(cherry picked from commit 55b146a16c74d9b1ef4991f3ad3e22b15267f56f)
2024-03-27 18:38:26 +01:00
IProduceWidgets b8f3ef8bfc
Add astro-jungle/mowed grass and astro-snow (#26381)
(cherry picked from commit 89235b9e1b91b32b3e55b364d46c79daabe199e9)
2024-03-27 18:35:28 +01:00
Callmore e0b8ef0740
Holoprojectors crafted at lathes no longer come with a cell (#26405)
Adds versions of the holoprojectors (janitoral, fan, and field) that start without a battery and changes the lathe recipe to use these instead. This is consistant with flashlights, which when made do not start with a cell.

Also it's a bit silly to have cargo printing a bunch of these to sell.

(cherry picked from commit 0bc886c00996e28fc31ea764a65ef51e4b1294f3)
2024-03-27 18:35:15 +01: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
BlitzTheSquishy ce92953254
Irish Coffee Recipe Tweak (#26327)
Update drinks.yml

Why would this need to be 2+2=4 when 1+1=2 is the more logical reaction?

(cherry picked from commit e93af9bee6143f95bd01a595a34590b61e1b92cb)
2024-03-24 00:13:41 +01:00
deltanedas e45cbd7282
remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 5ac88d9b2788182f607aeaf08eea8d26b1bb4d18)
2024-03-24 00:12:25 +01:00
Plykiya 60b23640c5
Adds craftable ducky slippers (#26138)
* Craftable ducky slippers

* fix node

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>

(cherry picked from commit 6694f92171ad8d6465b8c8403bf863ba66a75b74)
2024-03-23 23:59:51 +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
deltanedas 98ea628ed2
fix eggsplosion (#26146)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit d87be642ee9ec81064eff22389705755ab557b54)
2024-03-17 15:10:37 +01:00
Mr. 27 d7c48b4028
Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

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

(cherry picked from commit 3cb1c585c53f694f5ceb9720057bb765673970ec)
2024-03-17 15:06:54 +01:00
Cojoke 839fa2e5fb
Adds Senior role drip to the Uniform Printer. (#25668)
Adds Senior role drip to the Uniform Printer.

(cherry picked from commit af57006427d11b4bbc99983a983e5c31a4ee0d8b)
2024-03-17 14:56:01 +01:00
FungiFellow 3059e29326
Improvised shell crafting recipe (#25545)
* Changed Projectile Sprite to Shard

* Removed Notes on Recipe

* Made Recipe

* Added a space

* Update improvised.yml

* Update shotgun.yml

* Removed Note

* Reduced needed matches from 8->6

* Update improvised_shotgun_shell.yml

* Matchbox fix didn't work

* Reduced glass needed from 5-4

* Added backspace

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 6260e4b35b829485149206636861bb7402488724)
2024-03-17 14:55:02 +01:00
Ko4ergaPunk e158b929a3
Post light update (#25814)
* penis

* done

(cherry picked from commit 0ab4acedebd765109e78cdf532a18e05ed1ba206)
2024-03-07 01:28:34 +01:00