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

МиниАпстрим #71

Merged
merged 44 commits into from
Nov 3, 2024
Merged

МиниАпстрим #71

merged 44 commits into from
Nov 3, 2024

Conversation

Zekins3366
Copy link
Collaborator

Ну и все, что ещё сказать

Leander-0 and others added 30 commits October 25, 2024 18:07
* rules v5

* more changes to the rules

* Apply suggestions from code review

Applying suggested changes since they do look really good.

Co-authored-by: Kei Shin <[email protected]>

* missing m and extra a

* extra pirate rule

* another pirate rule

* more edits

* as --> for the

* Rules suggestions

* Rules rewrites

* antag, PvP, pirates

* Numbering

* Rewrite pirate rule link

* Use bold text for emphasis

* Remove French spacing

* paint voice chat red just to send the message

* fix typos

* removing uncool rule

---------

Co-authored-by: Kei Shin <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Fix older files

* Restore code to support vg roids

* Update RoomFillComponent.cs

* Update base.yml

* Fix unused BaseStationShuttles from outpost

* SpawnableFrontierOutpost<RecordsFrontierOutpost

---------

Co-authored-by: Whatstone <[email protected]>
* GodHelpMe

* Update migration.yml

* MapMigrationSystem: use fixed list

---------

Co-authored-by: Whatstone <[email protected]>
* Rosy Mothcloak

* Removes Rosy Cloak from Contractor Loadouts.

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: ErhardSteinhauer <[email protected]>
* WIP medical bounties - init component w/ damage

* medical corpses, visitor corpse loadout, redeem fn

* medical bounty redemption UI

* MedicalPriceGun system/component

* WIP, reduce visitor loadouts

* Sanitize NF corpse startingGear sets

* Add HideSpawnMenu

* Add HideSpawnMenu categories to medical corpses

* Map body retrieval unit in Frontier medbay

* Remove commented out line from base corpse

* Body redemption sprite, UI rework

* Add living checks (WIP)

* Medical bounty damage rejig, remove HOS/HOP gear

* Reduce redund. visitor loadout defns

* Fix dupe Asphyxiation key

* "Genetic"->"Cellular", TryChangeDamage

* boxer outfits with tank tops

* Emergency medical pods, spawner finagling

* suit sensors, appraisal recipe, pod freq

* comment emergency pod construction graph

* Map a second medical bounty redemption machine

* medical bounty guidebook page

* Use Erhard's emergency pod sprites, better analyzr

---------

Co-authored-by: ErhardSteinhauer <[email protected]>
…ew-frontiers-14#2339)

* Remove world loader from outpost STC terminals

* Disables world loader on the bus
* remove mass hallucinations

* Make the event not repeat after 45 mins

* Make the cave event actually spawn too

* Update events.yml

---------

Co-authored-by: Dvir <[email protected]>
* Honey changes intial

* Fixes for metamorphic drinks and flavour honey

* Removed extra images and fixed meatslice and honey definition

* Dead honey bee tree and bee jar with animation

* change the nutriment in honeycomb to honey

* Cleanup, honey apple streusel pie, honeycomb png

* printable seed data, jar of bees that releases bz

* honey bun tastes like honey and bun

* Add the Apple Strudel Bites

---------

Co-authored-by: Whatstone <[email protected]>
* lathe recipes clean up

* small fix

* clothing

* Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Recipes/Lathes/storage.yml

Co-authored-by: Whatstone <[email protected]>

---------

Co-authored-by: Whatstone <[email protected]>
* Update CCVars.cs

* CVAR Cleanups

* Update CCVars.cs

* NFCCVars Fixup

* Update CCVars.cs

* Tips

* touch up the tips

* Revert expedition_cooldown change, frontier cmnts

* Bluespace crate generation param

---------

Co-authored-by: Whatstone <[email protected]>
* Goblin Posters

* small fixes

* more fixes

* meta

* meta

* grammar pass

---------

Co-authored-by: Whatstone <[email protected]>
whatston3 and others added 12 commits November 1, 2024 17:59
…iers-14#2354)

* Review sale precondition check order

* Frontier pets shouldn't be sold

* Push dead mob check above recursive chunk
* bedrolls

* mchobo

* suffixes

* spawner

* revert mchobo changes

* small tweaks

* darker stains

* Update bedroll.yml

* sprite mover, stain diluter

* alpha, slight bedsheet offset

---------

Co-authored-by: Whatstone <[email protected]>
* First

* Cleanup 1

* cleanup

* Here we go

* Works

* Getting closer

* Update dungeons.yml

* Update ShuttleSystem.GridFill.cs

* Update dungeons.yml

* Update basic.yml

* Update GridSpawnComponent.cs

* Update basic.yml

* Update OwnedDebrisComponent.cs

* Update ShuttleSystem.GridFill.cs

* Update ShuttleSystem.GridFill.cs

* Replace events spawner code

* Update GridSpawnComponent.cs

* Update GridSpawnComponent.cs

* fixups

* fixup

* Edits

* FTL, Working warnings

* comp

* Fix this please

* Update BluespaceErrorRule.cs

* Support multi grids

* Add radio support

* Rename files

* Update nf_bluespace_grids_events.yml

* Event Mc

* Cleanup

* Update nf_bluespace_dungeons_events.yml

* Temp Restore space dungeon

* Update StationEventComponent.cs

* Update StationEventSystem.cs

* WIP: bluespace event random order

* position fix

* assign to WithPosition

* Warning fluent entries, bluespace dungeon comments

* BluespaceErrorRuleComponent cleanup

---------

Co-authored-by: Whatstone <[email protected]>
* Fix for goblinbane pilots

Removed ability for goblinbanes to pilot shuttles and take over the galaxy

* Added comment for modified line

* Remove complex interaction line entirely (nf file)

---------

Co-authored-by: Whatstone <[email protected]>
@Zekins3366 Zekins3366 merged commit ad248e5 into master Nov 3, 2024
17 checks passed
@Succuberry Succuberry mentioned this pull request Nov 4, 2024
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.