This repository has been archived by the owner on Nov 1, 2024. It is now read-only.
forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 38
up #382
Open
Vonsant
wants to merge
4,367
commits into
Corvax-Frontier:master
Choose a base branch
from
new-frontiers-14:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
up #382
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
FTL
C#
Map-Shuttle
Docs
Sprites
Map-POI
Map-Dungeon
Map-Bluespace
UI
Map-Outpost
labels
Jul 17, 2024
… Inspector revolver (#2588) Co-authored-by: Dvir <[email protected]>
* Functional faction tracking * Remove unused NpcFactionMember field * Update Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs * what dementia? --------- Co-authored-by: Dvir <[email protected]>
* Blood Cult Cat * abilities * dev_map and bloodmoon * cat stuff * vgroid spawn chance * 5 min * Update chromite_vgroid.yml * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <[email protected]> * more names * more names * Minor grammar, cat crit/dead sprites * Fix * Mob changes * pun pun pet, chromite spawn, no breathe * remove pet from pun pun (not needed) * remove pet from Yip Yip, tag parity w/ pun pun * Fix chromite vgroid indentation * Restore mistake's sprite * Remove cult cat from chromite roid due to baro dmg --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
#2580) * Port gavel, block, trial timer, add pwig & robe * Courthouse rework * trialtimer whitespace * destroy tabs * single gavel bonk * Floors for doors * no invalid transform parent * trial timer: white-ish text, consistent w/ others * gavel4.ogg attribution --------- Co-authored-by: Dvir <[email protected]>
…s. (#2577) * DeadDropSystem: fix alternative check, no dupes * DeadDropSystem: less jank(?) * Remove unnecessary comment * unused variable, okay there bud * Remove actual unused variable --------- Co-authored-by: Dvir <[email protected]>
* Add "in-only" flag to refillable solution * Selective solution transfer for RefillableSolution * SyndicateSponge, abomination cube fix * Did the funny by fixing the chems * Update rehydrateable.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* a fistful of plushies * Update toys.yml * Make the mail ones rare * Update lathe.yml * Update cuddlycritter.yml --------- Co-authored-by: Dvir <[email protected]>
* Sector-wide alerts, Frontier-specific alert text * Fix alert level localization string names * Fix refs@"station alert", fix tests, setalertlevel --------- Co-authored-by: Dvir <[email protected]>
* Emergency lights: MapInit func, SetLevel checks * fix color on mapinit func
* Reduces chem stock availability to elements that cannot be otherwise sourced. Removes chem crate restocks from the trade station as per directive from people who hide in the shadows. Maintains a restock crate of chemicals that either lack a proper source or can only be sourced in trace amounts by current methods. Re-examine when those sources are more commonly available. * abstract reasoning * I Zinc I messed up. * Price change and description butchering. * Adds nitrogen. Seems reasonable given the lack of condensers. Might need to be examined later. * Update cargo_medical.yml * Update chemistry.yml * Update cargo_medical.yml --------- Co-authored-by: Dvir <[email protected]>
* initial commit * fix congraph * one pixel annoying me * new keg * further refinement of sprites * fix perspective * fix yml a bit * basic sprites, un-mussied * explodey time * Update barrel.yml * im stupiod * Update barrel.yml * Update barrel.yml * chemicals * better sprites * no suffixes * no suffixes * Update salvage.yml * Update barrel.yml * Update barrel.yml * Update barrel.yml * Kegs * Cleanup * Update cargo_medical.yml * Update barrel.yml * Update cargo_food.yml * Cleanup * Cleanup * Update barrel.yml * Price * Update barrel.yml * Update cargo_medical.yml * No used for refill, ever * sprite * Update barrel.yml * Cleanup * Yep * Sprites, white, black barrels, cargo entries * it's called o2 because there's two of them * Barrel spawner, service-ish barrels * white/black sprite touchups, paper labels & fixes * Booze barrels, barrel spawners * Oliveoil, not OliveOil * Open option * Up all the prices nothing final but should be good for first merge * ChefVend: reduce oil jug count, 1 of each * mayo is a condiment, not an oil * realphabetize reagent labels * reorder empty barrel * Removed chemicals from cargo * SpaceCleaner * Update dungeon_items_kitchen.yml * Update migration.yml --------- Co-authored-by: rosieposie <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Initial commit * Couple component tweaks, switch from vanilla to new version for spawners, crates. Add migration line. * Add version with keys, flatpack, and research path for Janicart * Suffixes -> Prefixes. Rename research target. * More slots. Remove from cargo menu * Set abstract true on cargo entry rather than delete * Adopt suggestions from whatston3 * Tweak values of Janicart + flatpack * Equalize prices, fix Guidebook error
* Added alt verb to toggle handicomms * remove extraneous conditional on the alt verb * Comment alt verb subscription * RadioDeviceSystem: check intercom access, state --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
* PTK changes: proof of concept * Add hard rock ores for other asteroids than ice * IconSmoothSystem: reduce redundnacy * add NF prefix to OreDiamondDense refs * Fix salvage.yml merge issues * No duped crate spawner * PTK-1500e, not 3000e * Fix asteroid scrap spawner parenting * PTK description * Add "overpowered" comment on PTK * Create supercompacted.yml * Added super compacted spawners * Update supercompacted.yml * mineral spawners * undupe spawners * Separate mineral tables out from floorplan * Fix scrap mineral table * WIP: add RoomMarkers * minerals to spawners, fix rock dupe * Fix missing ice spawner ref * Sprites for mineral spawns, hard supercomp. spawns * rich hard mineral spawners * fewer diamonds on andesite, more chunk spawners * More frequent clusters * order of magnitude --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Why / Balance
How to test
Media
Breaking changes
Changelog