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

Up180824 #22

Merged
merged 61 commits into from
Aug 18, 2024
Merged

Up180824 #22

merged 61 commits into from
Aug 18, 2024

Conversation

Vonsant
Copy link

@Vonsant Vonsant commented Aug 18, 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

arimah and others added 30 commits August 13, 2024 00:59
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* NeedAllJobRequirement Draft

* Alternate requirement sets

* Cleanup, revert NFSD alternate sets

* Add alternative text, separators

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
* Mob/Turret Laser Reflect Chance

* forgot to add this to commander

* Update cache.yml

* some spawners

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
* Update crescent.yml

* Update crescent.yml
* Departmental EVA Suits

* wall locker draft

* lathe eva recipes

* captain wall locker using generic visualizer

* chaplain and boxer eva

* wall eva lockers

* wall locker sprites, meta info fixes

* lathe, vendomats, mailpod and parcel fix

* more vendomats

* more decals for lockers, more empty lockers

* more lockers

* cap and sr helmet decals

* meta

* more files

* chapel/spdldr ordering, departmental EVA grammar

* Revert random crystal

* Multi Locker Drifting

* Update locker_wallmount.yml

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* anchorreworkpull

* vaccum markers

* anchorreworkrevised

* turns out ship only needs one core AME because no more vendors

* Lowered price 

It sells for slightly less than 90000, adding +15% brings it to 103k. Made it 110k.

* swapped arcade spot for TV

* fixes and more minor decals

* Increased price 

Grid sells for slightly less than 90k ingame, 90k plus 30% is 117k.

* removed metadata of named entities

* Updated anchor with feedback

---------

Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Broom-broom

* comments

* comment

* defib, extinguisher, price tag

* frontier staff shipyard

* update mail shuttles

* fix 2

* mail mover

* broom lockers

* fixes

* SR console reskin

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
* Moves spread data to new component

* Refactors shotgun spread code

* Makes shotgun cartridges and projectiles use new component

* Attempts to fix nullable build error

* Fixes hitscan weapons

Co-Authored-By: EmoGarbage404 <retron404@gmail.com>
…1858)

* DungeonJob.PostGenWallMount: spawngroup error chks

* PostGenAutoCabling: bounds check

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* ammo crates

* ammo boxes

* restocks, crates

* engi crates

* merc crates

* medical crates

* science crates

* service crates, overall lower spawn chances

* t1 weapons

* fix

* armory: remove refs to locked crates, rtg loot

* exped loot: cleanade crate

* Restore novalite "armory access to open" message

* Grammar fixes

* Replace fuel tanks with full versions

* Shift ammo crate welded sprite

* diamonds are rare, no stacks

* more ammo, more

* CrateFirearmsSecure

* secure ammo crate

* no more SecurityTechFabs

* fix

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: KyuPolaris <tabi@kyuudev.me>
* initial commit

* more weapons

* stuff

* sprites, weapons, recipes, research

* cases

* recharger, antique laser

* sorting

* limited ammo selection

* hacked merc lathe draft (no recipes)

* category shuffle, punk clothes to lathe

* lights, clothes changes

* exped loot

* eh

* moving recipes to categories

* ammo fab flatpack to exped loot

* explosion resistance to explosives case

* fix maybe

* hyper power cell

* fix

* ugh

* Update Resources/Locale/en-US/_NF/research/technologies.ftl

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* parenting, turned off hypercap powercell recipe

* Recyclable randomized clothing

* nyanotrasen techfabs

* ftl

* unanchorable punk vendomats

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
FrontierATC and others added 11 commits August 17, 2024 21:14
* IntercomStarting PR

* Cleanup

* Update ShuttleIntercomSystem.cs

* Fixup

* Verb

* Comments

* Fix visual issue

* Update intercom.yml

* Louder intercoms, overriding name/sender in event

* Intercom->Open Intercom

* Remove Log.Error

* Update intercom.yml

* Fixup

* Fixups

* Update computers.yml

* Fix empty key_slots

* Update computers.yml

* fixing

* Update computer.yml

* Update computers.yml

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
…tor-

Shotgun spread refactor Cherry Picked
* Make Frontier Outpost spawn at 0, 0 with no rotation

* Slightly increase the distance between NFSD and Frontier
* Courier performancer tracker (new-frontiers-14#1472)

* add MailMetricsCartridge prototype

using the CrimeAssist UI until i make the courier performance ui

* add sprite for mail courier cartridge

* Add MailMetricUI

YAYYYYY IT WORKS
UI Contents pending

* Mail earnings live update mailmetrics

* LO can have mailmetrics too

* Add rest of mail metrics

Also removes some loggers

* Add additional metrics to MailMetric

Also fixes some bugs related to stat counting

* MailMetric updates on mail added

* change sprite credit name

decided id rather be credited as Portfiend

* display all mail numbers now

* remove comment

* style mailmetrics, add heading

* mailmetric UI polish

* fixed unopened mail counting bug oopsie

* wtf is this import

get out of here

* move StationLogisticStats to BaseStationMail

* FOUR SPACES

sirry

* fix: newlines

* address reviews

* address reviews

SORRYYYY this is unexpectedly big

* wtf

* semicolon

---------

Co-authored-by: byte <50130120+huckleton@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* Fixup

* How?

* Fixups

* Update MailSystem.cs

* Update pda.yml

* PDA

* Fixup

* Update identification_cards.yml

* Remove mail recyclable tag, mail metric order fix

* Update mailTeleporter.yml

* mail carrier job icons

* mailTeleporter: comment

---------

Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: byte <50130120+huckleton@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Vonsant and others added 10 commits August 18, 2024 20:41
* Handheld radio with frequency

* Handheld radio

* some fix

* some fix 2

* Updating radio frequency for current build

* Consistent handheld radio localization w/ intercom

* Radio: show frequency, bound to 1000-3000 kHz

* No handheld radio admin spam, smaller radio menu

* Radio Sprites

* Update radio.yml

* fixup sprite

* Separate out radio to NF, migration

* Fix Appearance component

* Replace RadioHandheld instances with NF versions

* Set intercom frequency on map init

---------

Co-authored-by: Sh1ntra <diewrist@korolevsky.me>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
@Vonsant Vonsant merged commit 937049c into master Aug 18, 2024
13 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.