-
Notifications
You must be signed in to change notification settings - Fork 154
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
X-01 multiphase gun & antique laser gun bullet projectiles #1030
Merged
nomad0260
merged 9 commits into
Rxup:master
from
Agronomist-NN:multiphase_and_antique_lasers_bullets
Feb 9, 2025
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b9d7fc7
oppening commit
Agronomist-NN 0861c23
metadata fix
Agronomist-NN dab6526
metadata fix №2
Agronomist-NN c76a990
proto fix
Agronomist-NN a5e1bc4
tags in the official proto
Agronomist-NN 3349dd7
pomogite
Agronomist-NN 2b48515
NO PROBEL!!!
Agronomist-NN c60316b
noSpawn converted to categories: [ HideSpawnMenu ]
Agronomist-NN 444e003
Merge branch 'Rxup:master' into multiphase_and_antique_lasers_bullets
Agronomist-NN 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
Binary file added
BIN
+9.52 KB
...urces/Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg
Binary file not shown.
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
2 changes: 2 additions & 0 deletions
2
...ces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/weapons/guns/battery/X01.ftl
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,2 @@ | ||
ent-WeaponMultiphaseEnergyGun = мультифазная энергетическая пушка X-01 | ||
.desc = Первая попытка Nanotrasen переделать антикварный лазерный пистолет. Имеет больше режимов стрельбы, но не имеет возможности самозарядки. |
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 |
---|---|---|
|
@@ -577,10 +577,13 @@ | |
- type: Clothing | ||
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi | ||
- type: Gun | ||
projectileSpeed: 40 #Backmen edit | ||
soundGunshot: | ||
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg | ||
- type: HitscanBatteryAmmoProvider | ||
proto: RedMediumLaser | ||
path: /Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg #Backmen edit | ||
params: | ||
volume: -2 | ||
- type: ProjectileBatteryAmmoProvider #Backmen edit | ||
proto: BulletEnergyGunLaserMk2 | ||
fireCost: 100 | ||
- type: BatterySelfRecharger | ||
autoRecharge: true | ||
|
@@ -596,7 +599,7 @@ | |
- Sidearm | ||
- WeaponAntiqueLaser | ||
- type: StaticPrice | ||
price: 750 | ||
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. где коммент бэкмен эдит? |
||
price: 5750 #Backmen edit | ||
- type: StealTarget | ||
stealGroup: WeaponAntiqueLaser | ||
- type: SentienceTarget # I hope this is only the captain's gun | ||
|
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
-435 Bytes
(62%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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
+217 Bytes
...s/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-419 Bytes
(64%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/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 modified
BIN
+162 Bytes
(130%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-55 Bytes
(91%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-78 Bytes
(87%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-71 Bytes
(88%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-87 Bytes
(86%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
+90 Bytes
(110%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-80 Bytes
(87%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-87 Bytes
(86%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-93 Bytes
(85%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-114 Bytes
(82%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
+12 Bytes
(100%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-20 Bytes
(90%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-11 Bytes
(94%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-4 Bytes
(98%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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 modified
BIN
-25 Bytes
(89%)
Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.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.
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
-336 Bytes
(68%)
Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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 modified
BIN
-611 Bytes
(41%)
Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/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 modified
BIN
+141 Bytes
(180%)
...es/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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 modified
BIN
+46 Bytes
(130%)
...es/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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 modified
BIN
+45 Bytes
(130%)
...es/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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 modified
BIN
+47 Bytes
(130%)
...es/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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 modified
BIN
+31 Bytes
(120%)
...es/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.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.
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.
где коммент бэкмен эдит?