Commit Graph

775 Commits

Author SHA1 Message Date
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
deepdarkdepths 6e525f3f9d
Adds paramedic cap to the uniform printer (#25861)
Update lathe+clothing.yml

(cherry picked from commit 7e9c3b88146d5ca3336eec9213d4b0908c87976d)
2024-03-07 01:26:43 +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
Whisper 4f3bed0823
the bladed flatcap (#25780)
(cherry picked from commit 4d0ec65f35f80efe319aa2ca38a888a555573403)
2024-03-07 01:25:44 +01:00
Nairod 2dabf10db6
Lathe-able Welding Masks (#25842)
* Lathe-able Welding Masks

* Fix Composition Tests

(cherry picked from commit 7944badd004dd4819466e169721b660f3818bb50)
2024-03-07 01:24:45 +01:00
MACMAN2003 0aa0fe680f
Add alternative crafting recipes for reinforced plasma/uranium glass (#22804)
* un-eviled the reinforced glass recipes

the tyranny of accidentally crafting plasma glass instead of reinforced plasma glass is finally over

* fix?

(cherry picked from commit db15efc3a3754d4f180a8787702696df69b1da29)
2024-03-07 01:11:48 +01:00
lzk e322e582fe
Add handheld map to autolathe (#25719)
(cherry picked from commit df271f5ead4cfa453093d18675785361300fd10c)
2024-03-07 01:10:39 +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
Nairod 3875a145ba
Weld To Remove Rust On Reinforced Walls (#25690)
(cherry picked from commit 4446fd2d5d9ee72df9e1b11c403e02c9e4a31400)
2024-03-07 01:05:59 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
2024-03-07 01:05:02 +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 64ccfc1afb
Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb46e47078b983bfc9ba015ee67752ee3)
2024-03-07 00:59:22 +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
Brandon Hu 68c7e17089
fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds (#25614)
(cherry picked from commit 5367d9954535df433c2286268c8532e8f7a3cfc2)
2024-03-07 00:58:39 +01:00
MACMAN2003 5a74cffe09
Lathe-able LED light tubes and LED bulbs (#25616)
let there be (led) light

(cherry picked from commit 89c822638057e2c7071ae6cb4380b114da5a4961)
2024-03-07 00:57:39 +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
lzk b4dc5351fb
Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??

(cherry picked from commit 326b89031809a88c7c6a0a5ecb2b1b2a23b082f1)
2024-03-05 09:46:21 +01:00
Debug 9a246f9527
Remove drones, fix InnateToolSystem (#25372) 2024-03-05 09:34:57 +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
hiucko 06e8a643c4
Increase printing price for neck clothes (#25375)
* Increase printing price

* Update clothing.yml

(cherry picked from commit 65d82289857e8beac11e07b448b9b1b7743f8cba)
2024-02-21 03:56:20 +01:00
genderGeometries 66897dcd70
Add bio reactions (#25366)
* added more foodstuff breakdowns

* Calcium doesn't exist; moved phosphorus to protein

* tested reactions- some should be centrifuged

* more testing tweaks

(cherry picked from commit d8e99cc57fbb78720675b0745a5473879ae1738f)
2024-02-21 03:55:00 +01:00
Ed b74146831d
Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi

(cherry picked from commit 4d7fd1cace164a4fb31addc8e803962f55a01ca3)
2024-02-18 23:03:09 +01:00
Alzore 4b6362ab8b
Decrease the chemical cost of regen mesh and sutures and move them to their own file (#24948)
* WHYWEREMEDSINMEALRECIPES

* 20chem

* didiforgettosavethis

(cherry picked from commit 666460d14f0442cfc39bde033e7673d9372def72)
2024-02-18 23:02:44 +01:00
icekot8 46c281bbf5
The medical beret is real (#25176)
* 1

* 2

* button is real.

(cherry picked from commit 6c5260a268faf77b21e39a4bdd0b34956b0fd6b0)
2024-02-18 23:01:37 +01:00
Ilya246 1e1ff614bf
autolatheable air tanks (#25130)
* gastankening

* fix price

(cherry picked from commit 4ad06b356c9df9236eb30dc052fdebad17fa87a3)
2024-02-18 22:55:54 +01:00
SlamBamActionman 0a719aece9
Re-added shivs to crafting menus (#25094)
Added a recipe for crafting menu

(cherry picked from commit e2c1f45cdfd48a80c7a4fdf217935ee8f8a15abc)
2024-02-18 22:54:10 +01:00
Emisse f41262a5cc
ambuzol beef (#25119)
(cherry picked from commit 0aa35af08c0c8b9c06b034b18b1ca24fd02be03b)
2024-02-18 22:54:00 +01:00
Hanz 6ef8f014f4
QM drip DLC (#24477)
* New Drip for the QM

QM beret and QM formal uniform

* Asd

Asd

* Adds the new clothing to the uniform printer

what it says on the tin

* I always forget to update the copyright RAAAAAH

yup

(cherry picked from commit 400036b9624620900012e891b230ab6029d9bc22)
2024-02-18 22:39:57 +01:00
potato1234_x 321df5db54
Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

(cherry picked from commit 667cebef52ae656760f806edbd4c550996d3dd6d)
2024-02-18 22:39:46 +01:00
Adrian16199 471f2ac24b
Straw hat. (#24997)
* Straw hat.

A craftable, flammable straw hat.

Thats it.

* seems to made it go in flames!

(cherry picked from commit 007adfc8a6660daf923891b873399d6061642ce7)
2024-02-18 22:35:47 +01:00
Ilya246 df7894cde6
allow building atmos devices on lattice or thindow tiles (#25057)
do

(cherry picked from commit 5380f64cca7ffcf1f54e75e876e38a7cfb70b18d)
2024-02-18 22:35:06 +01:00
FungiFellow d49acecdc5
Borg Module QoL and Gas Analyzer Module Removal (#24702)
* Borg Module QoL Focused on Engi Modules

* Update borg_modules.yml

* Update borg_modules.yml

* Removed Gas Analyzer Module Recipe

* Update borg_modules.yml

* Removes Gas Analyzer Module from research

* Update borg_modules.yml

* Update lathe.yml

* Update handheld_crew_monitor.yml

* Update borg_modules.yml

* Exchanged Service Module Dropper with BorgDropper

* Made a Lingering Plasteel Stack

* Made Lingering Reinforced Glass Stack

* Added Reinforced Glass and Plasteel into Construction Module

* Change Borg Crew Monitor Charge use

* Update handheld_crew_monitor.yml

* Removed Borg Crew Monitor

* Removed Crew Monitor From Diagnosis Module

* ID change

* Update handheld_crew_monitor.yml

* Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

* Update borg_modules.yml

* Update metal.yml

* Update glass.yml

(cherry picked from commit ce775891552f9fca2a54120b5a19f2a01c6e5c8b)
2024-02-08 12:39:31 +01:00
deltanedas 508568a6bb
Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 604748534ebd72efafa11344ee33d563c2ff93c3)
2024-02-08 12:32:24 +01:00
shamp 1b913a2b7d
Fixed incorrect path to the uranium spear image in the construction menu (#24895)
Update weapons.yml

Fixed incorrect path to the uranium spear image in the construction menu

(cherry picked from commit 8af1bea9371e77589fbe9c30ad531ffae1c382b3)
2024-02-08 12:32:22 +01:00
lzk aded2ef145
Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real

(cherry picked from commit c4e7f1ebe80b3a347d98784b8b0ec77e047b63d5)
2024-02-08 12:31:59 +01:00
Adrian16199 51707741b8
Make scarfs craftable (#24735)
* Make scarfs craftable

Also sorted the lathe a bit because I like it when it looks nice.

* reverts sorting

(cherry picked from commit bff50de74617ac7ee4d4253377d92b26c293e761)
2024-02-08 12:31:25 +01:00
Tayrtahn 3de3e13bb3
Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 765ea789cca4476af05871afd7d6e97a3e281e17)
2024-02-08 12:30:17 +01:00
SlamBamActionman 4ca11a55e5
Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly

(cherry picked from commit e36844de47ce0d9f5f28b11b733cd998201e1b49)
2024-02-08 12:25:20 +01:00
metalgearsloth 4c7c904549
Remove vehicles (#24681)
* Remove wheelchairs

Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.

* Also this one

* Remove vehicles

* goodbye vehicles

* Remove this check

* sasd

* Cronch

* Add sprites back

* jani

(cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)
2024-02-08 12:06:49 +01:00
Alzore 3dd7e7a6bb
Make shotgun slug ammo not useless (#24196)
* 20blunt8pierce

* ShotgunSlugLathe

* Commentbecauseapparentlyitdoesntknowichangedthis

* nevermindthereweretwo

* 28pierce

(cherry picked from commit 261153683e946b2d347ece8512d982f30177af5b)
2024-01-28 00:32:23 +01:00
Debug bc370fb77d
Mime hardsuit 1984 2024-01-28 00:31:36 +01:00
ERROR404 a0265a76bb
Mime hardsuit (#24198)
* Mime hardsuit

* small fix

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* New sprite

* newest sprite

* No more CTRL+C CTRL+V

* update sprite in hand

* final sprite in hand

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
(cherry picked from commit dedb77f43a02dfe2eaef6dd3eb45937ad7467e30)
2024-01-28 00:28:51 +01:00
MilenVolf 693924bdf0
Fix winter coats prices (#24557)
* Fix wintercoats prices & remove armor from them

Fixes craftable winter coats prices & removes armor from common craftable wintercoats

* Get that armor back

* Setting priceMultiplier to 0 to balance price

* Make craft cost more reasonable & add price

(cherry picked from commit 3ca413d295f0ae966786e0fbb4a647fb01fff04c)
2024-01-28 00:28:04 +01:00