forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 9
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
constitution rifle, magnum disabler, railgun #123
Closed
+318
−1
Closed
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
db3e7dd
constitution rifle, magnum disabler, railgun
bruhmogus 9ad0fb8
Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/bat…
bruhmogus 8ed6378
Update Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fb…
bruhmogus 7377f6e
Merge branch 'master' into pileofshit
bruhmogus 2095f45
Update battery_guns.yml
bruhmogus 8170e6e
Update battery_guns.yml
bruhmogus 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
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
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 |
---|---|---|
|
@@ -258,6 +258,49 @@ | |
collection: WeakHit | ||
forceSound: true | ||
|
||
- type: entity | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this will also cause a merge conflict later, you should have a seperate file for these. |
||
name : magnum disabler bolt | ||
id: BulletDisablerMagnum | ||
parent: BaseBullet | ||
categories: [ HideSpawnMenu ] | ||
components: | ||
- type: Reflective | ||
reflective: | ||
- Energy | ||
- type: FlyBySound | ||
sound: | ||
collection: EnergyMiss | ||
params: | ||
volume: 5 | ||
- type: Sprite | ||
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi | ||
layers: | ||
- state: omnilaser | ||
shader: unshaded | ||
- type: Physics | ||
- type: Fixtures | ||
fixtures: | ||
projectile: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.15,-0.3,0.15,0.3" | ||
hard: false | ||
mask: | ||
- Impassable | ||
- BulletImpassable | ||
fly-by: *flybyfixture | ||
- type: Ammo | ||
- type: StaminaDamageOnCollide | ||
damage: 45 | ||
- type: Projectile | ||
impactEffect: BulletImpactEffectDisabler | ||
damage: | ||
types: | ||
Heat: 8 | ||
soundHit: | ||
collection: WeakHit | ||
forceSound: true | ||
|
||
- type: entity | ||
name : disabler bolt practice | ||
id: BulletDisablerPractice | ||
|
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
Binary file modified
BIN
+4 Bytes
(100%)
...ces/Textures/Nyanotrasen/Objects/Consumable/Food/lollipop.rsi/equipped-MASK.png
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
+531 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png
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
+244 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png
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
+244 Bytes
...s/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png
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
+352 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png
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
+345 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png
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
+322 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png
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
+323 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png
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
+344 Bytes
...Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png
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
+601 Bytes
...s/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png
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
+323 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png
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
+357 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png
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
+369 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png
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
+344 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png
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
+340 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png
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
+593 Bytes
.../Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png
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
+222 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png
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
+169 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png
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
+169 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png
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
+170 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png
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
+170 Bytes
...extures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions
81
Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.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,81 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, slightly edited by FBI to be revolver", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "base" | ||
}, | ||
{ | ||
"name": "mag-unshaded-4" | ||
}, | ||
{ | ||
"name": "mag-unshaded-3" | ||
}, | ||
{ | ||
"name": "mag-unshaded-2" | ||
}, | ||
{ | ||
"name": "mag-unshaded-1" | ||
}, | ||
{ | ||
"name": "mag-unshaded-0", | ||
"delays": [ | ||
[ | ||
0.3, | ||
0.3 | ||
] | ||
] | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left-0" | ||
}, | ||
{ | ||
"name": "inhand-left-1" | ||
}, | ||
{ | ||
"name": "inhand-left-2" | ||
}, | ||
{ | ||
"name": "inhand-left-3" | ||
}, | ||
{ | ||
"name": "inhand-left-4" | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right-0" | ||
}, | ||
{ | ||
"name": "inhand-right-1" | ||
}, | ||
{ | ||
"name": "inhand-right-2" | ||
}, | ||
{ | ||
"name": "inhand-right-3" | ||
}, | ||
{ | ||
"name": "inhand-right-4" | ||
}, | ||
{ | ||
"name": "equipped-BELT", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-SUITSTORAGE", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+685 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/base.png
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
+1.68 KB
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/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.
Binary file added
BIN
+1.68 KB
...rces/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/equipped-SUITSTORAGE.png
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
+555 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/icon.png
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
+664 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+654 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/inhand-right.png
Oops, something went wrong.
Binary file added
BIN
+146 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-1.png
Oops, something went wrong.
Binary file added
BIN
+145 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-2.png
Oops, something went wrong.
Binary file added
BIN
+145 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-3.png
Oops, something went wrong.
Binary file added
BIN
+146 Bytes
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-4.png
Oops, something went wrong.
53 changes: 53 additions & 0 deletions
53
Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/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,53 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by FBI", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "base" | ||
}, | ||
{ | ||
"name": "mag-unshaded-1" | ||
}, | ||
{ | ||
"name": "mag-unshaded-2" | ||
}, | ||
{ | ||
"name": "mag-unshaded-3" | ||
}, | ||
{ | ||
"name": "mag-unshaded-4" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-SUITSTORAGE", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1 KB
...urces/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+1.23 KB
...rces/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-right.png
Oops, something went wrong.
Binary file added
BIN
+741 Bytes
Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/base.png
Oops, something went wrong.
Binary file added
BIN
+755 Bytes
Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/bolt-open.png
Oops, something went wrong.
Binary file added
BIN
+1007 Bytes
...Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-BACKPACK.png
Oops, something went wrong.
Binary file added
BIN
+1007 Bytes
...tures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-SUITSTORAGE.png
Oops, something went wrong.
Binary file added
BIN
+908 Bytes
...urces/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+839 Bytes
...rces/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-right.png
Oops, something went wrong.
41 changes: 41 additions & 0 deletions
41
Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.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,41 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, and then I FBI just recolored it to shit", | ||
bruhmogus marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "base" | ||
}, | ||
{ | ||
"name": "bolt-open" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-SUITSTORAGE", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+784 Bytes
...xtures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+797 Bytes
...tures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-right.png
Oops, something went wrong.
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.
putting this in this file will cause merge conflicts later