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.

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

UZI gun #1307

Merged
merged 2 commits into from
Feb 9, 2025
Merged

UZI gun #1307

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ ent-WeaponSubMachineGunVector = Вектор
ent-WeaponSubMachineGunWt550 = WT550
.desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто.
.suffix = Пистолет-пулемёт
ent-UplinkSubMachineGunUzi = Узи
.desc = Старая и любимая тарахтелка с далёких улиц Терра Групп. Использует 35 калибр, при стрельбе высокая скорострельность и низкая отдача может сломать палец.
Original file line number Diff line number Diff line change
Expand Up @@ -299,3 +299,53 @@
steps: 6
zeroVisible: true
- type: Appearance

- type: entity
name: ent-UplinkSubMachineGunUzi-name
parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
id: UplinkSubMachineGunUzi
description: ent-UplinkSubMachineGunUzi-name
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/uzi.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Gun
minAngle: 15
maxAngle: 16
fireRate: 9
soundGunshot:
collection: famas # Sunrise-Edit
params:
volume: 10
availableModes:
- FullAuto
- SemiAuto
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolSubMachineGun
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance

17 changes: 16 additions & 1 deletion Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1297,4 +1297,19 @@
conditions:
- !type:BuyerJobCondition
whitelist:
- Clown
- Clown

- type: listing
id: UplinkSubMachineGunUzi
name: uzi-name
description: uzi-desc
productEntity: UplinkSubMachineGunUzi
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 6
cost:
Telecrystal: 12
categories:
- UplinkWeaponry
conditions:
- !type:BuyerJobCondition
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by RaMbUt878, for SunRise",
"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
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
"directions": 4
}
]
}
}
RaMbUt878 marked this conversation as resolved.
Show resolved Hide resolved
Loading