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

Up16072024 #31

Merged
merged 32 commits into from
Jul 16, 2024
Merged

Up16072024 #31

merged 32 commits into from
Jul 16, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jul 16, 2024

Апсрим плюс перевод

MutantMan2040 and others added 30 commits July 14, 2024 16:41
Adds a fridge for yummy loot

Spawns in 1 Food item (or mouldy food), 1 drink (or bottle), and 1 trash
* map update

* adds chair crafting

* fix chair sprites

* progress on camera networks

* add settler table crafting
* RadAway changes, RadAway Inhaler, RadAway Phial

* removes obsolete

* removes second state

* Broken stuff

* some more fixes

* finishes RadAwayInhaler

* adds phial craft, more WIP

* progress

* makes a base version

* base, simplify

* adds phial to crafting bench and makes the end product breakable

* Inhaler icons
* nospawn intercom

* new belts and outer clothing

* new loadouts

* spear and quiver fix
* fixes for ranger and custom helmet

* rebalances ncr gear to be up to par with combat armor / marine armor
(cherry picked from commit 0c63b90)
* NCR Ranger startingGear fix (Vault-Overseers#262)

fixes a typo

* Adds 45-70 / 50 / welding glasses and speedLoaders to crafting benches (Vault-Overseers#266)

* adds .45-70, .50 and speed loaders into crafting benches

* removes single cartridges from crafting benches

* adds welding glasses into workbench

* SteeL

* Changes Deathclaw damage slowdown thresholds (Vault-Overseers#270)

* Smooth movement system (Vault-Overseers#267)

Smooth Movement

* Added bat shortcuts for quick server and client startup

* fixed files naming

* fixed vault door sprite error

* fixed jobs name and descriptions

* fixed some missing locale

* fixed bad weapon id naming

* Nothing to see here.

---------

Co-authored-by: BlueHNT <[email protected]>
Co-authored-by: FrostRusty <[email protected]>
* NCR Ranger startingGear fix (Vault-Overseers#262)

fixes a typo

* Adds 45-70 / 50 / welding glasses and speedLoaders to crafting benches (Vault-Overseers#266)

* adds .45-70, .50 and speed loaders into crafting benches

* removes single cartridges from crafting benches

* adds welding glasses into workbench

* SteeL

* Changes Deathclaw damage slowdown thresholds (Vault-Overseers#270)

* Smooth movement system (Vault-Overseers#267)

Smooth Movement

* RespawnButton

* Fix server shutdown

---------

Co-authored-by: BlueHNT <[email protected]>
Co-authored-by: FrostRusty <[email protected]>
* Fixes 12.7mm smg and nerfs overpowered smgs a bit more

* removes accidental change
* Adds armors and coats, changes washington from navy blue to black

* fixes duplicate

* Adds X02 APA (Mass produced ver of X01)

* unstaged change

* meta fix

* removes unshaded

* adds unshaded

* mistakes have been made

* Adds Hellfire APA

* Power armor speed +5% and resistance +5%
 Lines starting with '#' will be ignored, and an empty message aborts
@Vonsant Vonsant closed this Jul 16, 2024
@Vonsant Vonsant reopened this Jul 16, 2024
@Vonsant Vonsant merged commit 18d2859 into master Jul 16, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants