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

Ап? #369

Closed
wants to merge 79 commits into from
Closed

Ап? #369

wants to merge 79 commits into from

Conversation

Vonsant
Copy link
Collaborator

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

dvir001 and others added 30 commits July 6, 2024 07:08
* Fix

* Update VendingMachineMenu.xaml.cs

* Update VendingMachineMenu.xaml.cs

* fixup
Updates copyright section to have my current tag (I am the spriter for it)
* rped debugging

* More RPED debugging

* PartExchangerSystem: RemoveAt, respect stack split

* rped fix: index with invalid state, reverse iter

* WIP rped fixes

* Refactor: BuildMachinePartState, less redundancy

* PartExchanger, ConstructionSystem: debugging

* PartExchangerSystem: it works

* PartExchangerSystem: comment cleanup
* ATM: feedback if invalid items inserted

* AGPL headers
* Filled and empty chem wall lockers.

Filled and empty chem wall lockers using chem crate inventory. Uses med locker sprite with chem department coloring.

* Update chemistry_storage_wallmount.yml

Grrrrr efficiency grrrr

* Update chemistry_storage_wallmount.yml

Updated to remove pieces already supported by parent.

* Update meta.json

I guess I edited it. Immortalized forever.

* Fixup

* Fixup

* Update wall_lockers.yml

---------

Co-authored-by: Dvir <[email protected]>
* Update mailtruck.yml

* Rename mailtruck.yml to parcel.yml

* Rename

* Update parcel.yml

* Update parcel.yml

* Update computers_shipyard_mothership.yml

* Update parcel.yml

* menace

* Update menace.yml
* NFSD Access Overhaul
Fixed ship console refresh on id insert or removal
Added Access to VesselPrototype
Added Filtration to Ship List based off of Access
Added Bailiff and Sergeant Access levels
Added Access levels to all NFSD ship
Added appropriate access groups to NFSD roles

* removed: Atmospherics and Engineering from ID console

* Update IdCardConsoleComponent.cs

Fixing issue where re-sharper removed un-used using statements per request.

* NFSD Access Overhaul
Fixed ship console refresh on id insert or removal
Added Access to VesselPrototype
Added Filtration to Ship List based off of Access
Added Bailiff and Sergeant Access levels
Added Access levels to all NFSD ship
Added appropriate access groups to NFSD roles

* removed: Atmospherics and Engineering from ID console

* Update IdCardConsoleComponent.cs

Fixing issue where re-sharper removed un-used using statements per request.

* Updating Access per request,  fixing SR access to include Srg and Bailiff

* fixing mirge issue

that VS so politly decided to fuck up and then hide the fact that the code would not compile by compiling old code like the little shit that it is.  thank god i dont have to be proffessional with my code comments here like i do at work because i ant shit talk VS or Git when i am working so i shall unleach all my rage in this commnet for the 2 of them (git and VS) for being dicks and wasting everybody's time

* ShipyardSystem cleanup, LINQ removal, vessel proto

* Access: prefer NFSD accesses outright to groups

* Shipyard console: fix condition, check accessgroup

* ShipyardSystem: comment skipping for no access

---------

Co-authored-by: neuPanda <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* adds SSS Camper

adds the SSS Camper, a shuttle manufactured by Settler's Shuttle LLC

* Fixes Author Info

* removed author discord

* Adds Guidebook and the Altered Shuttle Design

* Altered the design again, and updated the guidebook.

* adds a sink and a trash bag cuz i forgor

* Changed shuttle design, Added guidebook entry, and decreased price.

* Condensed Guidebook Icons

* removed overflowJobs in camper.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: ErhardSteinhauer <[email protected]>
* Fixes Grid portal Creation

* Compacting!

* Making it non abstract

* Who dosent like funsies descriptions!

* Portal suggestions

name, description, no randomTeleport, no "Base" on a concrete
instance, fixing map attribute

* Added license headers

---------

Co-authored-by: Whatstone <[email protected]>
* add a new weapon to the game

svt new gun

* update

update

* small updates

small updates

* so i can fix it

so i can fix it

* fix

fix

* some updates

pratice is more of an outlier now to look more like the tip of the bullet

* Update weapon_cases_shuttle_guns.yml

SOOOOOOOO

* rifle

IM NOT GOOD AT ENGLISHER

* In the wrong place

Mags where in the wrong place

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml

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

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml

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

* updates

upated.  recentering the PNG files, changes to the IDs

* updates again

# changes

* Shuttle update

Shuttle update

* ammo

ammo

* aaa

updates to the yml again

* Delete snipers.yml

moves stuff around

* Update snipers.yml

* Resolve merge conflicts (for real this time)

* aaa

aaaa oogabogaa

* Update dungeon_items_weapons.yml

YEET

* Update weapon_cases_expedition.yml

this should work?

* GADDAMNIT WHATSONE

AAAAAAAAAAAAAA

* ADSFGAFGA

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

---------

Co-authored-by: whatston3 <[email protected]>
Co-authored-by: Whatstone <[email protected]>
…ry loadout parts. (#1501)

* fix expensive loadouts on broke characters

* Add loadout group fallback, apply to loadoutgroups

Also, cleanup redundancies in mercenary_loadout_groups.yml

* mercenary loadout: restore security backpacks

* StationSpawningSystem: check for duplicate entries

* Remove TODO

* Remove optional pilot fallback, cleanup, comments

* Added checks to fallback loadouts, n2 box fallback

* resolve security_guard_groups.yml merge conflicts

---------

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

* solution transfer fix, fleshed out flesh monster entries

* expedition overview section and flesh are kind of finished

* templates

* memes

* started argocytes

* different stat block

* more template deliberations

* Argocytes done (kinda)

* cult stuff

* argocytes meat and mats

* blood cultist (kinda done)

* assimilated miner

* carps done, visual improovements to some sprites

* dinosaurs done

* explorers done

* Fixed Slowdown Thresholds For Hostile NPCs

* no AA for mobs

* mercenaries done

* punks done

* new objectives, syndicate kinda done

* small fixes

* xeno done

* might be done

* fix

* more fixes

* fixes

* less fun in party supplies

* bells and whistles

* digestive sack, mr. bond

* fix

* sprite upd

* the sack spawnes things now

* electrified ai node, walkable digestive sack

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml

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

* Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml

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

* Update Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/xenos.xml

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

* Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml

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

* spessos

* Spesso currency

* tweaks

* better fixture for sack, renamed to assimilation sack

* small note about spawning

* viscerator, no regen on drones

* tweaks

* moved some files around

* Rewrites pt 1

* expedition rework suggestions pt 2

* Blood cultist partial rewrite

* gestio rifle to merc mob

* exped loot buff

* intermediate

* void syndie mobs

* contrafaction

* spawners for voidsmen

* despawn timers

* Guidebook rewrites, cash stacks, gobbo rewrite

* Whitespace, syndicate & xeno sections

* jittering for punk leader

* punks shit graffity

* descriptions to mob ymls

* commented out despawntimers

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
* tactical maid harduit and tweak numbers

* bigger package

* resolve issues

* fix issues

* revert step sound to sound_mecha_powerloader_step

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
* pumpkin spice latte (thank you, stagnation)

* Fix copyright license, meta & flavors whitespace

* Update drinks.yml

* pumpkin spice latte: new name, 3:1:1:1->6 ratios

---------

Co-authored-by: ErhardSteinhauer <[email protected]>
Co-authored-by: Dvir <[email protected]>
* The start

* Update GunSystem.AutoFire.cs

* Fix

* Again

* Yes

* Edit

* Fix

* Update GunSystem.AutoFire.cs

* Update GunSystem.AutoFire.cs

* Works

* Cleanup

* Update AutoShootGunComponent.cs

* Cleanup, comments & wrench

* cannons.yml: EOL at EOF

* Hide this 2 again

* Update AutoShootGunComponent.cs

---------

Co-authored-by: Whatstone <[email protected]>
* Added RangeFilter to NavScreen

* moved ftl to _NF

* renamed RF to MaximumIFFDistance & added Slider

* fixed SpinBox margin

* set default Slider value to 3000 instead of 0

* RangeFilter: cleanup

---------

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

* More Blade

* More blades

* Update spaceblade.yml

* Let it rip

* Update security_uplink_catalog.yml

* Uplink

* Fixup

* Loadout

* Update spaceblade.yml

* Update spaceblade_boxes.yml

* Update spaceblade.yml

* Fixup

* Update uplink-catalog.ftl

* Update Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml

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

* Update Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml

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

---------

Co-authored-by: Whatstone <[email protected]>
FrontierATC and others added 21 commits July 12, 2024 14:17
* update empress, rogue and fix nfsd small thruster

* Gyro

* Update empress.yml

* Update empress.yml

* Update empress.yml

* Update config.py

* Update config.py

* Update whitelist.yml

* Update whitelist.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
…species (#1648)

* initial commit

* Update tattoos.yml

* Update gauze.yml

* Update scars.yml

* Update gauze.yml

* Update scars.yml

* Name Fix

* Name fix

* Cleanup Oni

---------

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

* eaglechanged

* radiationroom

* minorfixanddecals

* Pipes fucked

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Comment Out ContrabandClothing Faction

* make yml linter happy again

* refactor

* Update contraband_clothing_base.yml
* initial commit

* lpbravo

* fixed some errors

* Update headwear_syndicate.yml

* Update headwear_syndicate.yml

* Update headwear_syndicate.yml

* Update headwear_syndicate.yml

---------

Co-authored-by: Dvir <[email protected]>
…er fix (#1660)

* Lathe: respect initial upgrade rate as coefficient

* Fix CircuitImprinter prototype

* Lathe: fix displayed UI amounts, materials used
…#1406)

* NFSD ID Card Sprite

Added NFSD Captain ID Card Sprites

* Ship vouchers, rough draft

* Voucher cards with (non-functional) id tags & grps

* ship vouchers to separate file, console bugfix

* nfsd ship vouchers: remove clothing

* add vouchers to shipyard whitelist, sell check

* ShipyardSystem: voucher compilation fixes

* ship voucher: inherit from BaseItem

* bailiff/sergeant loadouts, voucher icons

* Shipyard: display "free" on voucher, rough draft

* missing semicolon, point and laugh

* ShipyardConsoleMenu: fix prototype price

* ShipyardConsoleMenu: ship appraisal 0 with voucher

* Round-start pirates and NFSD

* Remote meta.json

SAAAAAALV

* Revise role start count

* Cleanup, copyright

* Changelog: fix Troglodyte71 entry

* Update cadet & deputy sprites

* In-hand sprites: fix directions

* yet more ID/job icon changes

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
* ConnectionManager: respect existing sessions

* ConnectionManager: remove status.JoinedGame check
* Minor Dove fixes

- Fixed overlapping pipes

- All interior walls should now properly use the interior variant

- Re-added an airlock that got removed by an earlier rework

* AAAAAAAAAAAAA

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
…#1664)

* Cove: station records computer, BaseStationRecords

* Remove Dampening component and comment borg laws

* cove.yml: fix console location

* Update cove.yml

* Update cove.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Einstein-Engines fix

Simple-Station/Einstein-Engines#530

* Update BluespaceErrorRule.cs
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.