Commit Graph

787 Commits

Author SHA1 Message Date
Firewatch
ea3e98e120 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
2024-04-01 17:41:14 +11:00
c4llv07e
64bb8dbdd5 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>
2024-04-01 17:06:13 +11:00
lzk
55c77af33c Combine flower crown and wreath (#26605)
* Combine flower crown and wreath

* huh

* huuh :trollface:
2024-03-31 19:52:52 +11:00
lzk
d5052697aa 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>
2024-03-31 16:33:23 +11:00
brainfood1183
5f063d2d6d 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
2024-03-31 14:21:18 +11:00
Flareguy
a98d0cfe2e 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>
2024-03-30 23:00:45 -04:00
Velcroboy
48e5c3cc8d 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>
2024-03-31 13:24:38 +11:00
Boaz1111
6ef592ddba Industrial Reagent Grinder (#25020)
* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot
2024-03-30 13:46:20 +11:00
wafehling
b041637263 Chemically-created Crystal Shards (#26269)
Added chemical reaction for making crystal shards
2024-03-29 17:13:52 +11:00
Nairod
9594afa400 Remove Rubber Rounds, Give Security Disablers (#26470)
Remove Rubbers, give sec Disablers
2024-03-27 11:11:13 -04:00
Futuristic-OK
55b146a16c 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>
2024-03-26 19:03:54 +03:00
IProduceWidgets
89235b9e1b Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
Callmore
0bc886c009 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.
2024-03-24 17:55:48 -07:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
BlitzTheSquishy
e93af9bee6 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?
2024-03-22 09:23:21 +01:00
deltanedas
5ac88d9b27 remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-21 20:20:26 -04:00
Plykiya
6694f92171 Adds craftable ducky slippers (#26138)
* Craftable ducky slippers

* fix node

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-18 15:34:34 -06:00
potato1234_x
e94fba5f70 makes closets/lockers better (#24942)
* hmngm

* fix
2024-03-18 21:53:13 +01:00
Ko4ergaPunk
909b2aaa2d New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix
2024-03-18 00:18:58 +03:00
deltanedas
d87be642ee fix eggsplosion (#26146)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-15 21:56:01 +03:00
Mr. 27
3cb1c585c5 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>
2024-03-14 15:27:08 +11:00
Cojoke
af57006427 Adds Senior role drip to the Uniform Printer. (#25668)
Adds Senior role drip to the Uniform Printer.
2024-03-13 19:45:33 +11:00
FungiFellow
6260e4b35b 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>
2024-03-13 10:52:32 +11:00
Ko4ergaPunk
0ab4acedeb Post light update (#25814)
* penis

* done
2024-03-06 04:39:47 +03:00
deepdarkdepths
7e9c3b8814 Adds paramedic cap to the uniform printer (#25861)
Update lathe+clothing.yml
2024-03-06 12:17:50 +11:00
MACMAN2003
f0e8695a91 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
2024-03-06 03:25:59 +03:00
Whisper
4d0ec65f35 the bladed flatcap (#25780) 2024-03-05 12:57:54 -08:00
Nairod
7944badd00 Lathe-able Welding Masks (#25842)
* Lathe-able Welding Masks

* Fix Composition Tests
2024-03-05 09:36:06 +11:00
MACMAN2003
db15efc3a3 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?
2024-03-01 09:57:18 +11:00
lzk
df271f5ead Add handheld map to autolathe (#25719) 2024-02-29 15:34:11 -07:00
Ed
66cf642e56 Colourful curtains (#25684)
* curwa

* fix

* huh

* revert huh

* add fancy white

* resprite hospital

* add suffix
2024-02-29 15:25:41 -07:00
Nairod
4446fd2d5d Weld To Remove Rust On Reinforced Walls (#25690) 2024-02-29 11:44:01 +11:00
Menshin
9884351101 Add space heaters (#25250) 2024-02-28 10:27:29 -08:00
Sphiral
88ae71715b 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 ;-;
2024-02-26 16:25:44 -07:00
Ed
7a5f81ddb4 Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
2024-02-26 16:19:51 -07:00
Ed
84cbcb93ca Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
Brandon Hu
5367d99545 fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds (#25614) 2024-02-26 16:01:21 -07:00
MACMAN2003
89c8226380 Lathe-able LED light tubes and LED bulbs (#25616)
let there be (led) light
2024-02-26 15:58:01 -07:00
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462)
Large Wood Floors
2024-02-22 14:59:41 +03:00
lzk
326b890318 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??
2024-02-21 21:44:22 -05:00
Debug
8c6a8c3c5c Remove drones, fix InnateToolSystem (#25372)
* Fix drones

* They dont need a full bloodstream

* Incorrect indentation

* Nuke drones

* Fix ClothingHeadHatCatEars

* Remove last mention of drones

* Implement requested changes
2024-02-20 23:23:04 -07:00
Ed
f64a32990a 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
2024-02-20 15:21:31 -07:00
hiucko
65d8228985 Increase printing price for neck clothes (#25375)
* Increase printing price

* Update clothing.yml
2024-02-19 13:12:27 +03:00
genderGeometries
d8e99cc57f 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
2024-02-18 22:05:43 -08:00
Ed
4d7fd1cace Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi
2024-02-13 17:19:22 -05:00
Alzore
666460d14f Decrease the chemical cost of regen mesh and sutures and move them to their own file (#24948)
* WHYWEREMEDSINMEALRECIPES

* 20chem

* didiforgettosavethis
2024-02-13 17:03:13 -05:00
icekot8
6c5260a268 The medical beret is real (#25176)
* 1

* 2

* button is real.
2024-02-13 16:37:23 -05:00
Ilya246
4ad06b356c autolatheable air tanks (#25130)
* gastankening

* fix price
2024-02-11 23:37:28 -07:00
SlamBamActionman
e2c1f45cdf Re-added shivs to crafting menus (#25094)
Added a recipe for crafting menu
2024-02-11 21:35:45 -05:00
Emisse
0aa35af08c ambuzol beef (#25119) 2024-02-11 15:47:58 -05:00