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

Апстричанский #47

Merged
merged 20 commits into from
Apr 22, 2024
Merged

Апстричанский #47

merged 20 commits into from
Apr 22, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Apr 22, 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

Salvantrix and others added 20 commits April 19, 2024 19:12
* 04/18/2024 - Uplink fixes and FUC value changes.

Fixes the access issue with Sheriff, Bailiff and Sergeant.

Changes a couple of unbalanced FUC values for various items.

* 04/18/2024

Fixed accidental EMP grenade slipping itself back in

* 04/18/2024 - SecTec

Updated SecTec inventory

* 04/18/2024

Fixed Crate naming conventions

* 04/18/2024 - YML Fixes

Updated parents and ID names

* Revert "04/18/2024 - YML Fixes"

This reverts commit e77cbff.

* 04/18/2024 - yml fixes

Fixed in scuffed yml parent names

* Revert "04/18/2024 - yml fixes"

This reverts commit 14a00b2.

* 04/18/2024 - yml fixes

Actual yml fixes please god.

* 04/18/2024 - yml fixes

More yml

* 04/18/2024

AHHHHHHHHHHHHHHHHHHH

* You are killing me

* Ptech

* Pain

* 04/18/2024

Boot YML fix

* AAAAAAAAAA

* It do be like this

* Why

* Aaaa...

* More

* Update pda.yml

* Update cart.yml

* Fixing

* More fixing

* Fixing

* God help me

* This is

* Not fun

* Headset

* Update messenger.yml

* Small Edits

* Fix

* 04/19/2024

Updated Sergeant Job Icon

* Update nfsd.yml

* 04/19/2024

Removed Whistle from drobe and added to tec

* Here we go

* Update satchel.yml

* Fix

* Pain

* Update armor.yml

---------

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

* rebase onto upstream hardsuits
* 04/19/2024

Update Uplink to include NFSD items and not Security.

* SuitMan

* 04/19/2024 - Updated values of NFSD armor

* 04/19/2024 - Updated NFSD Ptech

Includes a suffix to not confuse our mapping friends

* 04/19/2024 - Ship Removal

Removed unused NFSD ships.

* 04/19/2024 - Gas masks

Correct gas masks added to suit storage lockers

* NFSD

* Update thrusters.yml

* Update thrusters.yml

* 04/19/2024 - Combat/Command suit storages

Added the combat and command suit wall and locker storage.

* 04/19/2024 - FIXES

FIXES TO STUFF

* AHHHHHHHHHHHHH

AHHHHHHHHHHHHHHHHHHHHHHHHHH

* Helmets

* Update hardsuit-helmets.yml

* nfsd

* Update hardsuits.yml

* Update hardsuits.yml

* Fixed

* Update suit_storage.yml

* Jet

* Update hardsuit-helmets.yml

* Update hardsuits.yml

* Fixed

* Helmet

* Mail Up

---------

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

* Last ones

* Update thrusters.yml

* Update nfsdarmory.yml

* Update duffel.yml

---------

Co-authored-by: Dvir <[email protected]>
* templar and hosp rework

* add fax machine to templar

* oops forgot an evidence locker

* rollers can't sit on tables i guess

* extra apu because they're kinda silly

* nfsd names since they were borked

* Update

* Update bedsheets.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* Randomized most vending machines and added smuggling spawn.

* Added proper airlocks and firelocks, connected firelocks to air alarms, redid decals to make dirt cleanable.

* Revert "Added proper airlocks and firelocks, connected firelocks to air alarms, redid decals to make dirt cleanable."

This reverts commit a923f76.

* Added names and descriptions for buttons, APCs, air alarms, and important doors.

* Revert "Added names and descriptions for buttons, APCs, air alarms, and important doors."

This reverts commit 4e4dd7e.

* First iteration for the Vagabond Freighter

* Added suit storage and expanded hull slightly to acommodate

* Properly changed HS nomenclature and added a pre-flight checklist.

* Added correct airlocks, firelocks, redid decals to make dirt cleanable and paint permanent.

* Added an LV wire to power the southern airlock

* Revert "Added an LV wire to power the southern airlock"

This reverts commit 9d5cb46.

* Added LV wires to the southern airlock

* Added names and descriptions for buttons, air alarms, APCs, substations, and important doors. Added flavor to Saturn Devouring His Son painting.

* YML

* no errors

* Added 2 missing plastic flaps

* Replaced second cap EVA with QM

* Added external room support

* Added glass floors under shuttle corners

* Added Gas canisters and recoloured distro

* Mapped Salvage vendor

* Removed mapped disabler

* Added minor decals

* Added scrubbers to air alarm

* Reduced ship price to 60,000

* Remove grity.yml from pr

* Remove beacon.yml

* Added author and maintainer comments to shipwayrd

* Reverted changes to cargo air alarm

* Added missing atmos tiles

* Redone wiring, atmos and thruster locations

* Made requested interior changes

* REvert donk pocket spawner back to regular pocket

---------

Co-authored-by: Sam H <[email protected]>
Co-authored-by: Dvir <[email protected]>
…rs-14#1242)

* aaaaaaa

* linter auughh

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

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

---------

Co-authored-by: whatston3 <[email protected]>
* prototype and sprites

* name and balance

* liberation station

* Update snipers.yml

* sprite alpha fix
@Vonsant Vonsant merged commit 7765457 into master Apr 22, 2024
13 checks passed
@Vonsant Vonsant deleted the upstream-220424 branch April 22, 2024 14:57
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.

7 participants