Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Up251024 #67

Merged
merged 2,576 commits into from
Oct 27, 2024
Merged

Up251024 #67

merged 2,576 commits into from
Oct 27, 2024

Conversation

Zekins3366
Copy link
Collaborator

Апштрим

whatston3 and others added 30 commits October 9, 2024 10:07
* My sins

* Remove parent detective

* Remove PAL from the pacified zone

* Update pda.yml

* Fix detective FTL refs

---------

Co-authored-by: Whatstone <[email protected]>
* Adds FSB Spirit poster and two EMS signs.

* Adds additional dead drop poster

Adds new EMS Coords poster by request. From another user, credited.
Small correction to dock and bus signs by request.

* Update nf_poster8_contraband.png

* Update posters.yml

* Updates visuals and corrects classic dusty goofs

* Move the mothroach up

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
* add magic crayon

* Infinite crayons, smaller magic crayon, attribs

* Copyright, description

* Plastic<Nothing (plastic banana, my mistake)

* magic_crayon_small.rsi->magic_crayon.rsi

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
…#2181)

* Fixups

* Update benches.yml

* Update PostMapInitTest.cs

* Update PostMapInitTest.cs
* Update barge.yml

* Updates waste pump and pacman to ship "on" versions

* Barge price to 47k, ~10% margin

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
…2097)

* Update barnacle.yml

* Increase margin on Barnacle to ~10%

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Update empress.yml

* Rotate freezer door fan to face inside

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
…tiers-14#2153)

* Replace Arena (The Pit) POI tiny fans with directional fans

* Remove dock sign rotation

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
…ers-14#2144)

* Replace Tinnia POI tiny fans with directional fans

* Flip around freezer directional fans to face into the freezer room

---------

Co-authored-by: Dvir <[email protected]>
* Makes butter reagent accessible for recipes.

Edit to make butter an extractable, as the reagent can otherwise only be accessed by grinding THC butter.

* Update ingredients.yml

* Remove olive oil comments

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
@Zekins3366
Copy link
Collaborator Author

Остальное завтра...

@Zekins3366 Zekins3366 merged commit ccca2ac into master Oct 27, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.