Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Апстрим #79

Closed
wants to merge 29 commits into from
Closed

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Apr 27, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

MagnusCrowe and others added 19 commits April 26, 2024 00:14
* SR update 2

* dresser

* revert frontier

* updated frontier map
* restores hyperlink books

* all i care about is LAW

* you're not supposed to be here
…1212)

* ATV/Bike Inventory

* Update buckleable.yml

* random ATV hull colors, bag slot

* more fixes

* are you proud of me now, yml linter?

* reverted changes to original files and made NF specific version of ATV

* small change to NF ATV meta file

* reverted added motorbike

* more colors

* hoverbike

* void-capable hoverbike

* nfsd and mail carrier hoverbikes

* changed parenting

* tweaked sprites a bit

* updated atv sprite

* updated hoverbike sprites a bt

* adjusted bag sprite position on atv

* added unshaded lights layer, some fixes

* bumped price to 15k

---------

Co-authored-by: Dvir <[email protected]>
* Remove entities locale

* my fault

* Update syndicate.yml
* fix empress issues

* remove mass media

* fix cloner and better room

* fax

* lights

* empress 3.3

* last minute fixes

* fix empress bedsheet and add brig airlocks to the cells

* unfuck PR

---------

Co-authored-by: Dvir <[email protected]>
* Initial Changes

* Adding prisoner latejoin and normal (probably)

* Prisoner YAML line change
* tweaks

* more thrusters

* some tweaks

* QM locker is back

* tweaking

* Update suit_storage.yml

* Update suit_storage.yml

* Update lathe.yml

* Update lathe.yml

---------

Co-authored-by: Dvir <[email protected]>
* Mild Interceptor rework and added new NFSD stuff

* Wrench Canister

---------

Co-authored-by: Dvir <[email protected]>
ErhardSteinhauer and others added 6 commits April 27, 2024 17:58
* base

* more customization options

* ability to pilot, animal stomach, ai faction

* small adjustment to dmg mods

* fix to attributions.yml

* restored deleted lines from speech_emote_sounds.yml

* Update goblin.yml

lowered slashing damage to 3, upped fixture radius to 0.3

* lowered asphyxiation damage taken by gobbos, attempting to make them immune to rotten meat damage

* now goblins aren't poisoned from eating rotten meat

* cooked food is poisonous for goblins now

* fixed small mistake

* goblinkind banner

* fixed food ToxinGoblinSafe, remove thievery and removed some sounds

* removed duped names from goblin whamen

* raw animal protein and mold is good for goblins now

* mold is actually ok for goblins now

* Goblin FoodSystem Part1

* Cleanup

* Update FoodSystem.cs

* added Food Quality to select fiew items

* fixed issues, started implemented Food Quality

* Food System

* More edits to food: most cooked food has high quality

* Reverted changes to Flavorol

* Reverted chages to Flavorol even harder

* snack wrappers are edible now, don't recommend tho

* Goblin Mod

* Food System

* Food System

* trash juices

* trash juice fix

* removed nutrients from the trash juice

* Eat Trash Get Strong

* raw organs are edible

* Tag Support

* fix

* regent fix

* blood

* Blood fix, again

* Goblin trash be good

* Update Resources/Locale/en-US/_NF/reagents/physical-desc.ftl

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

* Cleanup

* revert changes to food stuff

* ai faction fix

* reversed changes to mail

* Update ai_factions.yml

* doubled the word counts in goblin accent

* small accent tweak

* crafting recipe for goblinkind banner o7

* Update goblin_organs.yml

* fixing things

* Update animal.yml

* nfsd at it again, fixed though

* fixes-fixes-fixes

* Update speech_verbs.yml

* Update chat_manager.ftl

* Gabbl Gabble

* Sounds issues

* Match DeltaV

* Makes Vulpkanin able to howl + adds some growling noises (#884)

* Adds howling / growling noises

* revenge of the spelling error!! grahh!!

* trying to fix that error with the schema validator

* Fixing copyright + adds vulp growls to harpy emote

* The case of the missing attributions dashes.

* Fixes up attributions.yml with license.txt info

* Update Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: Adeinitas <[email protected]>

---------

Signed-off-by: Adeinitas <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>

* We did not have license for any of this files

* More fixing

* Update ChatSystem.cs

* Update toys.yml

* Fixed a single missing disposal pipe

* Fixed folder name

---------

Signed-off-by: Adeinitas <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Wolfking6116 <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Adeinitas <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
* ERT goblins, borg laws regarding goblins

* ERT harpies
* Cove

* Fix fixgridatmos command (#27113)

* How

* Fix Hydro

* Update computers.yml

* Update computers.yml

* Commas

* Commas

* Update cove.yml

* Update cove.yml

* Update cove.yml

* Update NfAdventureRuleSystem.cs

---------

Co-authored-by: Leon Friedrich <[email protected]>
FrontierATC and others added 2 commits April 27, 2024 18:33
* Reimplement shuttle designation

* Add PR comment
@github-actions github-actions bot added the UI label Apr 27, 2024
@Vonsant Vonsant closed this Apr 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.