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

test PR taser #233

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
@@ -0,0 +1,2 @@
ent-WeaponTaserAspid = Аспид
.desc = Однозарядный, самозаряжающийся тазер. Шокируй всех своим присутствием.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ uplink-fire-axe-flaming-name = Пылающий топор
uplink-fire-axe-flaming-desc = Классическое оружие, оснащённое передовой атмос-технологией, позволяющей ему поджигать цели. Теперь с прочной прорезиненной рукояткой!
uplink-gloves-north-star-name = Перчатки Полярной звезды
uplink-gloves-north-star-desc = Пара перчаток, которые значительно сокращают время между ударами, позволяя избивать людей до смерти шквалом ударов.
uplink-syndicate-taser-name = Аспид
uplink-syndicate-taser-desc = Однозарядный, самозаряжающийся тазер. Шокируй всех своим присутствием.
# Explosives
uplink-explosive-grenade-name = Разрывная граната
uplink-explosive-grenade-desc = Простая граната с 3,5-секундным запалом, ориентированная на поражение личного состава. Наносит минимальные повреждения стенам и полу.
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,25 @@
Telecrystal: 30
categories:
- UplinkWeaponry

- type: listing
id: UplinkSyndicateTaser #corvax-next
name: uplink-syndicate-taser-name
description: uplink-syndicate-taser-desc
icon: { sprite: /Textures/_CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi, state: icon }
productEntity: WeaponTaserAspid
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 6
cost:
Telecrystal: 10
categories:
- UplinkWeaponry
conditions:
- !type:StoreWhitelistCondition
blacklist:
tags:
- NukeOpsUplink

# Explosives

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
name: aspid
parent: [ BaseWeaponBatterySmall, BaseSyndicateContraband]
id: WeaponTaserAspid
description: A single-shot, self-recharging taser. Shock everyone with your presence.
components:
- type: Sprite
sprite: _CorvaxNext/Objects/Weapons/Guns/Battery/syndicate_taser.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-1
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
quickEquip: false
slots:
- Belt
- suitStorage
- type: Gun
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletTaser
fireCost: 100
- type: Battery
maxCharge: 100
startingCharge: 100
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 20
- type: MagazineVisuals
magState: mag
steps: 2
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by KommissarRed",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-unshaded-0"
},
{
"name": "mag-unshaded-1"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading