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

STI Tactical DS 2011 10mm, now fixed #69580

Merged
merged 15 commits into from
Nov 22, 2023
Merged

STI Tactical DS 2011 10mm, now fixed #69580

merged 15 commits into from
Nov 22, 2023

Conversation

GuardianDll
Copy link
Member

Summary

Content "Adding a modernized 10mm 1911, as well as a standard and extended magazine for it, by Cataclysmo091"

Purpose of change

Reopen the PR with fixed itemgroups

Describe the solution

see #68638
closes #68638
should close Cataclysmo091#1

Describe alternatives you've considered

author merges Cataclysmo091#1 and we merge the original PR

Additional context

image

Cataclysmo091 and others added 11 commits October 13, 2023 17:14
@Cataclysmo091
STI Tactical DS 2011 10mm
1ec42bc
@Cataclysmo091 @github-actions
Update data/json/items/gun/10mm.json
4f16d19 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Cataclysmo091 @github-actions
Update data/json/items/gun/10mm.json
6d930ad 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Cataclysmo091 @TheShadowFerret
Update data/json/items/gun/10mm.json
fa70af3 
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
@Cataclysmo091 @TheShadowFerret
Update data/json/items/magazine/10mm.json
8eb4f29 
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
@Cataclysmo091 @TheShadowFerret
Update data/json/items/magazine/10mm.json
cc1fb34 
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
@Cataclysmo091
Update generic_guns_validator.py
de85ab1
@Cataclysmo091
Update generic_guns_validator.py
959e4d2
@Cataclysmo091
Update gg_firearms_migration.json
c44bb96
@Maleclypse @GuardianDll
Update data/json/items/gun/10mm.json
09d5681 
Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
@GuardianDll
add itemgroup, add the variant
fa6fb65
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Items: Magazines Ammo holding items and objects. Spawn Creatures, items, vehicles, locations appearing on map Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Generic Guns Anything to do with Generic Guns <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Nov 20, 2023
@github-actions GitHub Actions
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A lightweight, 17-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.
  • A lightweight, 22-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.
  • A next-gen model of the venerable 1911, ready to win World War Z. Modernized and manufactured by Staccato, sporting a double-stack magwell, sleek solid-steel frame, and ergonomic grip; favored by certain dog-loving assassins. This model is chambered in 10mm Auto.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 21, 2023
@Maleclypse Maleclypse merged commit deff799 into CleverRaven:master Nov 22, 2023
23 checks passed
@GuardianDll GuardianDll mentioned this pull request Nov 23, 2023
Closed
@GuardianDll GuardianDll deleted the STI_Tactical_DS_2011_10mm_fixed branch November 23, 2023 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Generic Guns Anything to do with Generic Guns Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GuardianDll @Maleclypse @Cataclysmo091