-
Notifications
You must be signed in to change notification settings - Fork 3
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
G11 #24
Closed
Closed
G11 #24
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
434c703
deer god lets hope this doesn't break
Plyushsune abfbefe
adds sprites
Plyushsune c3f1c9a
fixes error
Plyushsune 3346ac4
please work
Plyushsune 91be028
duftdvqgbhuwijokep[l[;rwae
Plyushsune 81645d9
feqghrwentjymru,tilju;ikl/
Plyushsune 0c1b361
over and over and over aand over and over and over and over and over …
Plyushsune 1739c38
a42esydruftigyhiuojpok[l];\[']
Plyushsune 5c7df54
test
Plyushsune 48976d9
Merge branch 'main' into G11
Plyushsune ebfcf5b
semi-auto and spelling mistake
Plyushsune e882802
converts to caseless
Plyushsune 7e986d1
fixes the yaml
Plyushsune 55216c4
tasrydtfgh
Plyushsune e2fc0b5
rqtgedga
Plyushsune c141547
srxdctfvgbhjnkmd
Plyushsune 8bc3eda
tyweurtypuiop
Plyushsune 25dee0e
final update
Plyushsune 9620ea8
Merge branch 'master' into G11
Plyushsune bbabcaa
Merge branch 'master' into G11
DEATHB4DEFEAT 5266216
Merge branch 'master' into G11
Plyushsune eb5f2e0
Update Resources/Prototypes/SimpleStation14/Entites/Weapons/rifle.yml
Plyushsune 7e7572a
bah bah black sheep
Plyushsune d44ec1f
Merge branch 'G11' of https://github.com/toasterpm87/Parkstation-Frie…
Plyushsune File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
50 changes: 50 additions & 0 deletions
50
Resources/Prototypes/SimpleStation14/Entites/Weapons/rifle.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
- type: entity | ||
name: G11 | ||
parent: BaseWeaponRifle | ||
id: WeaponRifleG11 | ||
description: A unique rifle with an clock-like internals and a top fed magazine. Uses .20 rifle ammo. | ||
components: | ||
- type: Sprite | ||
sprite: SimpleStation14\weapons\G11.rsi | ||
layers: | ||
- state: base | ||
map: ["enum.GunVisualLayers.Base"] | ||
- state: mag-0 | ||
map: ["enum.GunVisualLayers.Mag"] | ||
- type: Clothing | ||
sprite: SimpleStation14\weapons\G11.rsi | ||
- type: Gun | ||
fireRate: 10 | ||
soundGunshot: | ||
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg | ||
selectedMode: Burst | ||
availableModes: | ||
- Burst | ||
- FullAuto | ||
- type: ItemSlots | ||
slots: | ||
gun_magazine: | ||
name: Magazine | ||
startingItem: MagazineCaselessRifle | ||
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg | ||
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg | ||
priority: 2 | ||
whitelist: | ||
tags: | ||
- MagazineCaselessRifle | ||
gun_chamber: | ||
name: Chamber | ||
startingItem: CartridgeCaselessRifle | ||
priority: 1 | ||
whitelist: | ||
tags: | ||
- CartridgeCaselessRifle | ||
- type: ContainerContainer | ||
containers: | ||
gun_magazine: !type:ContainerSlot | ||
gun_chamber: !type:ContainerSlot | ||
- type: MagazineVisuals | ||
magState: mag | ||
steps: 1 | ||
zeroVisible: true | ||
- type: Appearance |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+9.57 KB
Resources/Textures/SimpleStation14/weapons/G11.rsi/equipped-BACKPACK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions
35
Resources/Textures/SimpleStation14/weapons/G11.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "plyushcat", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "base" | ||
}, | ||
{ | ||
"name": "bolt-open" | ||
}, | ||
{ | ||
"name": "mag-0" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.