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

Add Centcom Disabler #1845

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/loadouts/itemgroups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms
# Dignitary - Nanotrasen Representative
character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks
character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms
character-tiem-group-LoadoutNanotrasenRepresentativeWeapon = Nanotrasen Representative Weapons
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
character-tiem-group-LoadoutNanotrasenRepresentativeWeapon = Nanotrasen Representative Weapons
character-item-group-LoadoutNanotrasenRepresentativeWeapon = Nanotrasen Representative Weapons

Also correct the line above it.

# Engineering
character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,11 @@
- type: loadout
id: LoadoutClothingUniformJumpskirtNanotrasenRepresentative
- type: loadout
id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative
id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative

- type: characterItemGroup
id: LoadoutNanotrasenRepresentativeWeapon
maxItems: 1
items:
- type: loadout
id: LoadoutNanotrasenRepresentativeDisabler
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,35 @@
bluntStaminaDamageFactor: 2.5
wideAnimationRotation: 135

- type: entity
name: CentCom disabler
parent: WeaponDisabler
id: WeaponCCDisabler
description: An improved self-defense weapon that exhausts organic targets, weakening them until they collapse. Only for the finest officers that we don't trust with lethals.
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 20
- type: StealTarget
stealGroup: WeaponCCDisabler
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to also add an objective to steal an item from this group, otherwise it'll never be assigned. But also this really should be genericised to stealGroup: NTRepWeapon since we would hypothetically want to add other options to the category. Steal groups are kinda funny like that. :FaridaBirb.png:

- type: Gun
fireRate: 3
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/ccdisabler.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-0
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Tag
tags:
- HighRiskItem
- Taser
- Sidearm

- type: entity
name: disabler SMG
parent: BaseWeaponBattery
Expand Down
16 changes: 14 additions & 2 deletions Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,19 @@
# Ears

# Equipment

- type: loadout
id: LoadoutNanotrasenRepresentativeDisabler
category: JobsCommandNanorep
cost: 0
canBeHeirloom: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNanotrasenRepresentativeWeapon
- !type:CharacterJobRequirement
jobs:
- NanotrasenRepresentative
items:
- WeaponCCDisabler
# Eyes

# Gloves
Expand Down Expand Up @@ -63,4 +75,4 @@
jobs:
- NanotrasenRepresentative
items:
- ClothingUniformJumpsuitNanotrasenRepresentative
- ClothingUniformJumpsuitNanotrasenRepresentative
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.
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.
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.
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,81 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, painted green by Timfa",
"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
}
]
}
Loading