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.

Sign up for GitHub

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

Jump to bottom

chinese pistol and little changes #145

Merged
merged 16 commits into from
Mar 2, 2024
Merged

chinese pistol and little changes #145

merged 16 commits into from
Mar 2, 2024

Conversation

PatoGrone
Copy link
Contributor

added chinese pistol with his special variant and fixed some other problems like the change between auto/semi on some guns.
chinese pistol: just a 9mm pistol but with a integrated magazine
the spy: unique variant, automatic, silenced and with a extended mag.

fixed some sprites and eliminated the auto/semi change in some guns to make bolt closing or opening less janky.

@PatoGrone
chinese pistol and little changes
6445dfe 
added chinese pistol with his special variant and fixed some other problems like the change between auto/semi on some guns
@github-actions github-actions bot added Changes: Sprites No C# For easier issues relating to YAML labels Dec 18, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 18, 2023 •
edited
Loading

RSI Diff Bot; head commit 8c46156 merging into 3b92f9c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
mag-unshaded-0 Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
mag-unshaded-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
mag-unshaded-0 Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
mag-unshaded-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi

State Old New Status
bolt-open Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
bolt-open Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
mag-0 Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi

State Old New Status
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi

State Old New Status
icon Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi

State Old New Status
base Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi

State Old New Status
base Added
bolt-open Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi

State Old New Status
base Added
bolt-open Added
inhand-left Added
inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi

State Old New Status
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi

State Old New Status
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi

State Old New Status
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi

State Old New Status
bolt-open Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 8c46156

@PatoGrone
compact code and 22lr pistol
149c065 
22lr pistol and parented all pistols
@PatoGrone
mostly sprite changes, battery weapons now actually use ammo
15f0da2 
added 2 plasma weapons, added 2 ammo types for battery weapons and also finished adding wielding sprites for all firearms
@PatoGrone PatoGrone requested a review from Peptide90 as a code owner February 16, 2024 17:53
Peptide90
Peptide90 requested changes Feb 22, 2024
View reviewed changes
Copy link
Collaborator

@Peptide90 Peptide90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far, will recheck components and parenting but just that issue I spotted

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml Outdated Show resolved Hide resolved
Peptide90
Peptide90 requested changes Mar 2, 2024
View reviewed changes
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml Outdated
@@ -722,3 +722,42 @@
- Impassable
- HighImpassable
- type: GrapplingProjectile

- type: entity
name : plasma
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name:

@Peptide90 Peptide90 merged commit ccb405d into Vault-Overseers:master Mar 2, 2024
6 of 7 checks passed
Peptide90 pushed a commit that referenced this pull request Sep 11, 2024
@Tmanzxd
Fixes Failed to Cherry-Pick PR #25986: Return Detective to Security #145
fb7c4d9 
 (#656)

Partial fix to #145, as the changes in inventory will need reflected in
the Security Loadout system which will be in another PR.

Made so Detective has the same access as Security Officers.
Peptide90 pushed a commit that referenced this pull request Sep 11, 2024
@Tmanzxd @VMSolidus @DangerRevolution
Make Security Dripped Out Again (#660)
8b0c754 
Leadup to PR #656. The Loadout fix for #145. Adds and makes a lot of
loadout options for Security. Full Change Log Below:

**Change Notes:**

- Changed Wizden Security Vest sprites to DeltaV Sprites.

- Removed Wizden Security Vests from loadouts (can be re-added later in
another PR if sentiment changes.)

- Added Plate Carriers and Durathread Vests to loadouts

- Made non-specialist Security apparel generic to Security. Charge
Batong with style now!

- Added Flashes to Security Loadouts.

- Added Security Armor Vests to Security Loadouts.

- Added Detective Coats and Vests to Security Loadouts.

- Added Warden Armored Jacket to Warden Loadouts.

- Added Head of Security's Trenchcoat to Loadouts.

- Added Security gear & accessories to Loadouts.

- Added Brigmedic and Corpsman items for Corpsman!

- Added SecGlasses to Loadouts!

---------

Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Peptide90 Peptide90 Peptide90 requested changes

Assignees
No one assigned
Labels
Changes: Sprites No C# For easier issues relating to YAML Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@PatoGrone @Peptide90