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

up #382

Open
wants to merge 5,272 commits into
base: master
Choose a base branch
from
Open

up #382

wants to merge 5,272 commits into from

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jul 17, 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

IamVelcroboy and others added 9 commits December 29, 2024 21:14
added id for captain

Co-authored-by: dylanhunter <[email protected]>
* Step 01: Remade arrivals

* Nearly finished, also added new beacons and a holopad

* Wrapped up all changes, also added a beacon for the docking arm
* dechrismassified

* removed camera from shower
* dechristmassified

* further dechristmassified
* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

---------

Co-authored-by: Emisse <[email protected]>
renamed cryopod.yml to cryogenic_sleep_unit.yml
removed christmas merry
whatston3 and others added 30 commits January 17, 2025 18:51
* BluespaceErrorRule: localize strings

* radar fixes, brighter blue

---------

Co-authored-by: Dvir <[email protected]>
* Removed Uranium, Incendiary, and Shuttle research

Goodbye Research

* Update arsenal.yml

* Update lathe.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* NFSD atmos adjustment

* Thumbs

* down

* Fire in the disco
* interrogation sign, bus sign changes

* map NFSD armory sign, "armory" in name/desc

* fire alarm dearth, interrogation sign name fix

* Add DeviceNetwork references to modified firelocks

---------

Co-authored-by: Dvir <[email protected]>
* Revert "Revert "Weapons from Delta-V (#2527)" (#2692)"

This reverts commit 1fac436.

* Fix

* Fix left

* Fix

* Fix

* Fix

* reduce vulcan price, wieldable ceremonial rifle

* expedition gun variation, universal buff & swap

* add typewriter gun, copy universal sound

* Revert "AkExpedition" references

* Revert weapon case name change

---------

Co-authored-by: Whatstone <[email protected]>
* Clean Syndicate Items that are not for frontier use

* Update space_cash.yml

* Update uplink_catalog.yml

* Set pen value to 30 (placeholder for paperlock)

* Job-specific syndicate items: remove conditions

* briefcase of 200k spessos, 8 tc cyberpen

---------

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

* gaslock WIP

* gaslock: entity's more or less good

* deposits & drills, WIP

* gas deposit drill WIP

* More work on deposits and drills, still WIP

* random gas deposits, drill fixes

* drill visualizers, ignore deposits, yaml fixes

* Gas deposits, pipe fixes for the drill

* gaslock RSI fix

* gaslock to binary.yml, joinSystem test

* GasDepositExtractor: push into net, not pipe

* Clear pump on undock

* WIP docking types, sale point

* selective docking WIP

* WIP gas sale point, console, gas sale UI

* Bidirectional pressure pipes

* gaslock console wip

* cleanup, smaller deposits

* Add gaslocks to the atmospheric alerts computer

* Fix gaslock pipe readout

* Remove unused deposits

* Undupe AtmosDirectionChanged log value

* Address test failures

* Add remaining missing containers

* Fix missing source/sink port refs in gas sale comp

* maps and maps

* fix gas drill examine text

* make storage canisters craftable

* gas price changes

* N2/O2 to zero, fix trit/frezon comment

* comment out edison for now

* Lower cargo canister prices, raise plasma

* gasbender: resolve duped IDs

* Fix invalid network config ref

* canister arbitrage fix

* Narrow gaslock, fix bidirectional pump UI overlap

* Remove GaslockReversed reference in ambition

* internal gas sale point, better piping

* max extraction rate, deposit suffixes

* gas sale point: inherit from basemachinepowered

* sale point: fix parent order

* gas sale port: dockable pump->dockable pipe

* No gas sale point alerts entry

* Rename dockablepumpsystem file, nix unneeded deps

* Dirty gas deposit extractor UI on open

* MapInit, not ComponentInit, hide unanchored docks

* Working sale point

* Gasbender: fix unpowered thrusters

* Gas sale console UI

* Appraise, not Refresh

* Edison: two online SMESes, coloured pipes

* cleanup

* fix mining drill BUI

* muddled gas deposits

* Gas sale UI: only show present gases

* fix ref to gaslock window

* gas sale point screen, remove unused console

* ShuttleDockControl: Frontier comments

* Remove other missing Gaslock console windows

* add generic keys, panel open to NF computers RSI

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Checkraze <[email protected]>
* Add gaslock changelog entry

* and no comma
* Update lathe.yml

* Tech Cleanup

* Clean up and tech

* Update technologies.ftl
* Doubles default jug storage.

* Slight change

* Sprite cleanup. Whups.

* Additional sprite sanitation. I need to establish a better sprite process.

* and one more cleanup pass

* Update civilianservices.yml

* Sprite update.

* Slight lid edit for better placement and consistency.

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Checkraze <[email protected]>
* Add alt verb to toggle accents from clothing

* Update Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs

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

* Update Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs

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

* Add toggling accents to AccentPickupSystem, and also fixed accent pickup system to trigger correctly

* Edit comments

* component datafield visibility edit

* Adjust frontier comments

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

* add suggested changes to pickupevent

* switched to using EntityUid.Invalid

* changed namespace of pickupevent

* missed an include, whoops

* migrate AddAccentPickup under _NF (oops)

* PickedUpEvent vs. GettingPickedUp, no Has then Rem

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Un gas the planets

* Update salvage_mods.yml
* use unused filled chemmaster sprite

* map BeakerInserted layer

* Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

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

* Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

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

* Apply suggestions from code review

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

---------

Co-authored-by: Whatstone <[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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.