Commit Graph

718 Commits

Author SHA1 Message Date
Nemanja 40f7e0b53e
Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed

(cherry picked from commit 73e94dfa92e0afe3ad0decd1d7248d13fa4f208c)
2024-01-26 23:12:38 +01:00
Ubaser c3e95f02a0
Make super bite burger easier to craft (#24231)
* add

* needs space for salt

(cherry picked from commit 8cc24c9a5d6de080067fe35a46d7d69d54b20a28)
2024-01-26 23:07:24 +01:00
TurboTrackerss14 37c32f5776
Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering

(cherry picked from commit c32d19cf5ca49bf583054a72eb229f93dfc5b303)
2024-01-26 23:01:01 +01:00
Boaz1111 328d7a604d
Reinforced glass reacting fix (#24135)
* takeitouttakeitout

* Delete error.glsl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 24aeec237354a9e6c0977a579ad960bd81054978)
2024-01-26 22:55:30 +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
Skye be33bad257
Cryo Burn Chem - Aloxadone (#23980)
Aloxadone (accidentally exploded first pr oops)

(cherry picked from commit 9c277bd0e23fb805522f0943cf880c5028eb4f61)
2024-01-26 22:51:19 +01:00
takemysoult 54a9bea5eb
Tranquilizer balance (#23979)
(cherry picked from commit 9e1342f3e4340ca6e32533cff9765b968089f543)
2024-01-26 22:33:45 +01:00
GreyMario 9e4fb570bc
Pie tins returned from all pies in all situations, add lathe recipes for pie tin and some other basic kitchenwares (#23217)
* move pietin trash to FoodPieBase so all pies return their pie tin when eaten

* spawn trash from a SliceableFood if the Food has a trash

* add a limited selection of additional tablewares to the autolathe

* kitchenware material adjustments

* fix crash when slice pie in hand/inventory

* use system helpers + slices now go in parent container

(cherry picked from commit 1c3c596bae1bc463ce05f3ae6f5cbe09ac59ed4c)
2024-01-26 22:33:39 +01:00
icekot8 0d269d0954
new chemical-Necrosol (#23850)
* rollback

* dumb fix

(cherry picked from commit 6820cff4f54cacc5aa10c61ebc4e2396b62aea70)
2024-01-26 22:33:11 +01:00
icekot8 e2e9eb62f6
medsec hud is no longer a filler (#23934)
* medsec hud

* medsec hud

* fix

(cherry picked from commit 3d9a6f57ac91a6b2f8c2c8759b0757278d576559)
2024-01-26 22:30:25 +01:00
deltanedas cf50b5a8b3
dedicated burn and shock meds (#23941)
* pyrazine and insuzine

* add recipes

---------

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

(cherry picked from commit 581c95ed728c181fa4fe4f8e497804f7340b446d)
2024-01-26 22:28:40 +01:00
degradka 78424dcde0
Adjust prototype names to lowercase (#23810)
(cherry picked from commit ae59b072ccfdb7ce806ac6bf392871020fc942f0)
2024-01-26 22:21:04 +01:00
Boaz1111 477f5fdb97
More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
(cherry picked from commit 5fd3d4552c8cf783fe8fe03dc0cfa472958e6282)
2024-01-26 22:19:19 +01:00
Nemanja 703b4cb7cc
Quantum Spin Inverter (#23756)
(cherry picked from commit fdd18c9ae49cf98a766b5df484c67d9cf4f4418e)
2024-01-26 22:17:00 +01:00
Emisse 9d047a7e52
kill machine parts + migrate machine part spawners to salvage loot spawner (#23752)
* kill machine parts

* guidebook and artifact effect

* worst test ive ever seen in my life

* nuke test

(cherry picked from commit df1d8c36e5e8b0773123c744a4acca473fb135ea)
2024-01-26 22:14:43 +01:00
Nemanja 53c4793673
Turbo Recharger (#23723)
turbo charger

(cherry picked from commit c861b66a476a1ea1037ec173b088cafd5519f757)
2024-01-26 22:12:03 +01:00
Naive817 01ade0303e
Adds syndicate cyborgs. Adds Assault cyborgs to nukie uplink (#19733)
* added syndicate cyborgs

* add assault cyborg to uplink

* updated tags.yml

* changed syndicate cyborgs' hitpoints to 200
fixed NPCfaction

* added noslip and MovementAlwaysTouching component to syndicate cyborgs akin to carps, as a stop gap for no magboots or jetpack. Access component fix.

* fixes nodes

* fixes construction

* fixed typo and intergrationtests

* adds back ammocounter for l6c

* fix lawset

* fix item size

* nono, fix again

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
(cherry picked from commit 1b93243beac91391f3add3e799e98f1a30eb36e2)
2024-01-26 22:09:51 +01:00
GreyMario 1d3712f921
Pies and tarts categorized in meal_recipes.yml, added their recipes where possible (#23266)
pies and tarts categorized, added recipes where possible

(cherry picked from commit 19e41011b848df72d158049afb5ecb8a0b0296af)
2024-01-26 22:09:00 +01:00
Adrian16199 287fe376a5
Adds ties to the uniform printer. (#23686)
To not bloat the vendors but to still allow one to be fancy if they bother head of personel enough.

(cherry picked from commit 7c87ba3b41898d990a8418520ac97ae131b2e91a)
2024-01-26 22:08:48 +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
Ubaser f79d2acf5e
Flower wreaths (#23662)
* add

* fix

(cherry picked from commit 93a77e89fee28f30c5f9d329130b90f8f8c17c76)
2024-01-26 22:06:27 +01:00
Ubaser 5a76c4f135
Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 172fcaf2d42db4cda25ce7a40df493692a8e4e98)
2024-01-26 22:03:21 +01:00
MACMAN2003 3ff6808627
Add hats and berets to the uniform printer (take 2) (#23556)
* hates and beretes

welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait

* EEYIKES!! How will I ever "fix" these "typos"???

* SPELL WARS 2: ATTACK OF THE TYPOS

hlep me i catn' stop speeling bad

* put hats above associated uniforms

(cherry picked from commit 04cf1c3c49446571d9c52eac2431c7562c25984e)
2024-01-26 22:03:04 +01:00
Velcroboy 45bae76bec
Add Diphenhydramine Recipe (#23006)
Add Diphenhydramine

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 52aac0ea3b4db565ee4260ea5c5b803049da24d7)
2024-01-26 21:50:19 +01:00
iacore f2adcd8783
more balanced constructing and unscrewing for metal objects (#21051)
* more balanced constructing and unscrewing for metal objects

- computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing
- Computer frames now need time to be constructed.
- it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2.

* Fixes test

(cherry picked from commit d73c7e9a0a3f57788432fde3e5c3ec4b3c23bb35)
2024-01-26 21:50:18 +01:00
Nemanja 3d4fa26e22
Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming

(cherry picked from commit 86c1e36cd54c474f87a9873e34f78a517b6410bd)
2024-01-26 21:47:38 +01:00
Nairod 3e61dfd5a1
More Buildable Furniture + Tweaks (#23188)
your PR will be my beginning of a maintainer journey

(cherry picked from commit 1f2a89d453f49abbd624a18778e0dfea73f689a3)
2024-01-26 21:46:56 +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
ada-please 442844f1a7
Added reaction OilBreakdown (#23537)
Added recipe OilBreakdown

(cherry picked from commit 79c790c391e2c1534feedf6fe0737d33b996d223)
2024-01-26 21:40:21 +01:00
Alzore 3a033a3b7d
Gauze recipe in medfab (#23417)
* Gauzelathe

* latherecipe

(cherry picked from commit 292026c58468069a16a07bbc8fcd9935243bf544)
2024-01-26 21:29:41 +01:00
lapatison be7ca47895
Circuit floor tile print (#23467)
stuff

(cherry picked from commit b0a5e0f10ce51eba4800ce627a412b0903121c40)
2024-01-26 21:29:24 +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
Ilya246 59f69e4d6c
biofabricator (#23319)
* initial implementation

* implement

* more mobs

* add tech

* buff abomination

* uncopypaste desc

* add sprite

* fix sprite

* remove biomass tag

* inden't

* less plasma for fish

(cherry picked from commit fc4ad82934b0b094c9125922258248b561b1b338)
2024-01-26 21:26:06 +01:00
lzk d2e35a2003
Fix windoor secure graph (#23274)
* 1

* try fix

* real fix

(cherry picked from commit 07a5eaf258555cce840581c9a69899e1c97416a8)
2024-01-23 22:52:34 +01:00
Nemanja b38189c1e2
Add reagent sources to the guidebook (#22627)
* source in my guidebook

* finish it!

* sir yes sir oorah

* network that bitch, baby

(cherry picked from commit f538a2e34a4b62ac406a5871a3c52e51f8f0fad4)
2024-01-22 21:09:13 +01:00
Alzore e1670f2ac6
Easy Ramen Noodles (#23189)
* easynoodles

* morenoodlepernoodle

* bigcup

(cherry picked from commit b5f984b57ebcded4eef66970e0f7bf67f6f3a5ab)
2024-01-22 21:01:53 +01:00
lzk 6b7569e608
Make shivs based on construction (#23134)
* comit

* remove construnt

* 222

(cherry picked from commit defb7f93b9d5278f5837998166dded34118fb1a3)
2024-01-22 21:00:45 +01:00
Nemanja 04f0a8811a
Hyper convection lathes and industrial ore processor (#23202)
* Hyper-convection lathes and industrial ore processor

* balance

* gold... why not?

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit c3f81bfe033a14922dc6e91de402c56d321f3370)
2024-01-22 21:00:37 +01:00
Ubaser 56877652f0
Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix

(cherry picked from commit 56884fd72df6ae88aca892e68dcd9829766864b7)
2024-01-22 20:59:01 +01:00
lzk ae25c2aff4
Make directional barricade constructable (#22988)
main comit

(cherry picked from commit 03ec7bac6700209b90075a247a23c01dab34ee7b)
2024-01-22 19:00:46 +01:00
Nemanja 4fd2ee722a
Station beacons (#23136)
* Station beacons

* crate

* remove navmap from warp points

* ack

* oh damn

* okay emisser

(cherry picked from commit 99d78c4b97aff1a5a0dad6804bac00d4bc425e1f)
2024-01-22 18:59:49 +01:00
Nemanja 850e75a073
GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too

(cherry picked from commit 9bd03824ac863cb4d87bfc984dcc163b84926649)
2024-01-22 18:47:45 +01:00
Stanislav4ix 27bebbcda9
Added disabler SMG! (#23051)
* Added disabler SMG!

* Changed a few errors

* errors.. again

* Update battery_guns.yml

* Update security.yml

* Update lathe.yml

* Update security.yml

(cherry picked from commit 28b825d898361b06fc3a942209c0b93d8c2eced0)
2024-01-22 18:46:27 +01:00
lzk 38f8bc5b5f
Move stamps out of big mess (#22877)
* gigacommit

* Update honkbot.yml

* foxing

* merg

* bring back mime sound

* ;

* :trollface:

(cherry picked from commit 78965d1e368fa19549bfb043620c85d48188d78e)
2024-01-22 18:43:33 +01:00
Boaz1111 249dcf38fe
fixed the sulfacid issue, made some more chems use the industrial chems (#22981)
(cherry picked from commit cde532bfa4cc04b454967ade5cddd45e0cb7326a)
2024-01-22 18:37:36 +01:00
Boaz1111 593fed7c68
Adding intermediate industrial chems (#22614)
* added hydroxide, benzene, and changed the phenol recipe

* I forgot to commit a bunch of changes, whoopsie doopsie

* Update chemicals.yml

made an error while resolving conflicts

* Update chemicals.yml

same here

* Update flavor-profiles.ftl

* Update chemicals.yml

* Update chemicals.ftl

* Update chemicals.ftl

* Update chemicals.yml

* Update medicine.yml

* Update chemicals.yml

* Update medicine.yml

* guh

* Revert "guh"

This reverts commit a0e5dfd4182d1a407bffd21d0eaa36355023993c.

* final touches and fixes

* fixed all the issues, for realsies

* thefuck

* Revert " thefuck"

This reverts commit 22068cb73d9902ccf81d065d92d078f423c67aea.

* maybe this fix?

* Revert " maybe this fix?"

This reverts commit 4bfd534f73a956e595c809ce77e52819ed142f2b.

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

Trying to figure out my issue

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

* Disabled the ethanol breakdown, fixing the issue

* Revert "Update chemicals.yml"

This reverts commit 1239512c0b7df5eab106bf64ec2af38185f2f016.

* Revert "Disabled the ethanol breakdown, fixing the issue"

This reverts commit 96190c967d22b1422d144e4211579f5af7bf9a09.

* Emo suggested I'd do this

* Update chemicals.yml

* made temps needed for the uhh hydroxide and benzene

* Update chemicals.yml

* removed SugarBreakdown

(cherry picked from commit 446b47a4b75bfa0ee95879349031407c8e2874e8)
2024-01-22 18:33:05 +01:00
Ed 6621f70af5
Anomaly synchronizer buff (#22771)
* Update production.yml

* Update electronics.yml

* Wat

* Update anomaly_sync.yml

* Update anomaly_sync.yml

(cherry picked from commit 3f8ad3a13d62ac1a6a401026e02a92f2f8471c19)
2024-01-22 18:23:57 +01:00
Debug 18f0af1f68
Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
deltanedas f8b1f706ac
bluespace ore bag use bluespace (#597)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-24 20:58:23 +01:00