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

up #14

Merged
merged 14 commits into from
Jul 9, 2024
Merged

up #14

merged 14 commits into from
Jul 9, 2024

Conversation

Vonsant
Copy link
Owner

@Vonsant Vonsant commented Jul 9, 2024

Description

Description.


TODO

  • Task
  • Completed Task

Media

MutantMan2040 and others added 14 commits July 8, 2024 11:32
* Decrease Radroach Health from 30 to 12
Rad roaches are currently very tanky, this change would allow them to be killed by all ammunition instantlty, except for 5mm, making them seem sqaushible and satisfying to kill. making them feel more like pests. More radroaches will be mapped to spawn to compensate for this change.

* Update insects.yml

---------

Co-authored-by: Peptide90 <[email protected]>
* new 45-70 sprites and brushgun speedload tube

* adds crafting of speedloader tube

* Increases fireRate of brushgun, sequoia

* brushgun sounds

* moves gunshot to - type: Gun

* indentation, attribution, shortening

* internal magazine speedLoader system
* buffs and nerfs to various weapons angle/ firerate

* heavy weapons became more menacing, miniguns dont fire laserbeam style

* fixes duplicate `-type: Gun` issue

---------

Co-authored-by: Peptide90 <[email protected]>
* introduces NCR tinned rations

* replaces ranger rations with K rations

* adds C rations to NCR loadouts

* `N14CigarettePackRepublic` not `N14CigarettePackRepublics`
* fix healing powder error state

* fix all pill parents

* Adds animal reproduction and egg laying.

* fix reproduction tags

* fix terminal offsets for walls

* fix ladder offset

* more tags

* new factions and turrets

* faction code test on roles

* adds factions to all roles

* animal fixes and chicken spawners

* vault hostile faction and turrets pack

* makes ID cards work

* brings back starvation damage

* fix typo
rebalances existing loadouts, replaces magnum with hunter revolver
* gives ncr troops filled backpacks, removes `backpack` from kits

* removes satchels from kits
* updates desert ranger faction, redundant Republic Ranger description

* moves republic ranger vet to department ncr
@Vonsant Vonsant merged commit fae36ad into Vonsant:master Jul 9, 2024
9 of 12 checks passed
Copy link

github-actions bot commented Jul 9, 2024

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

Copy link

github-actions bot commented Jul 9, 2024

RSI Diff Bot; head commit ca23abe merging into 2c19586
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi

State Old New Status
base-1 Modified
base-2 Modified
base-3 Modified
base-4 Modified
base-5 Modified
base-6 Modified
base Modified
icon Modified

Resources/Textures/_Nuclear14/Structures/Machines/Terminals/terminal_classic.rsi

State Old New Status
broken Modified
computer Modified
screens Modified

Resources/Textures/_Nuclear14/Mobs/Animals/chicken.rsi

State Old New Status
chicken-1 Removed
chicken-2 Removed
chicken-3 Removed
dead-1 Removed
dead-2 Removed
dead-3 Removed
chicken Added
dead Added

Resources/Textures/_Nuclear14/Objects/Consumable/Food/Tins/c_ration_1.rsi

State Old New Status
icon-open Added
icon Added
trash Added

Resources/Textures/_Nuclear14/Objects/Consumable/Food/Tins/c_ration_2.rsi

State Old New Status
icon-open Added
icon Added
trash Added

Resources/Textures/_Nuclear14/Objects/Consumable/Food/Tins/c_ration_3.rsi

State Old New Status
icon-open Added
icon Added
trash Added

Resources/Textures/_Nuclear14/Objects/Consumable/Food/Tins/crackers.rsi

State Old New Status
c_cracker Added
k_cracker Added

Resources/Textures/_Nuclear14/Objects/Consumable/Food/Tins/k_ration.rsi

State Old New Status
icon-open Added
icon Added
trash Added

Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loadertube.rsi

State Old New Status
base-1 Added
base-10 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base-7 Added
base-8 Added
base-9 Added
base Added
icon Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants