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

Weaker ninja gloves #1230

Merged
merged 2 commits into from
Jan 9, 2025
Merged
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Impstation/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
stamp-component-stamped-name-borg = Cyborg
stamp-component-stamped-name-ninja = Spider Clan
1 change: 0 additions & 1 deletion Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ stamp-component-stamped-name-syndicate = Syndicate
stamp-component-stamped-name-ce = Chief Engineer
stamp-component-stamped-name-greytide = Greytide
stamp-component-stamped-name-psychologist = Psychologist
stamp-component-stamped-name-borg = Cyborg
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Antags/ninja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
mask: ClothingMaskNinja
head: ClothingHeadHelmetSpaceNinja
eyes: ClothingEyesVisorNinja
gloves: ClothingHandsGlovesSpaceNinja
gloves: ClothingHandsGlovesSpaceNinjaWeak # imp
outerClothing: ClothingOuterSuitSpaceNinja
shoes: ClothingShoesSpaceNinja
id: AgentIDCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,35 @@
fiberMaterial: fibers-leather
fiberColor: fibers-regal-black
- type: FingerprintMask

- type: entity
parent: ClothingHandsGlovesSpaceNinja
id: ClothingHandsGlovesSpaceNinjaWeak
suffix: weak stun
components:
- type: NinjaGloves
abilities:
- components:
- type: BatteryDrainer
- type: StunProvider
stunTime: 3
cooldown: 30
stunCharge: 180
noPowerPopup: ninja-no-power
whitelist:
components:
- Stamina
- type: EmagProvider
whitelist:
components:
- Airlock
- objective: StealResearchObjective
components:
- type: ResearchStealer
- objective: TerrorObjective
components:
- type: CommsHacker
threats: NinjaThreats
- objective: MassArrestObjective
components:
- type: CriminalRecordsHacker
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
- type: entity
name: energy katana
suffix: stun
parent: Katana
parent: EnergyKatana
id: EnergyKatanaStun
suffix: stun
description: A katana infused with strong energy. Few possess the strength to contain it.
components:
- type: StaminaDamageOnHit
damage: 30
sound: /Audio/Weapons/egloves.ogg
sound: /Audio/Weapons/bladeslice.ogg
- type: MeleeWeapon
wideAnimationRotation: -60
damage:
Expand Down Expand Up @@ -43,16 +42,6 @@
slots:
- Back
- Belt
- type: EnergyKatana
- type: DashAbility
- type: LimitedCharges
maxCharges: 3
charges: 3
- type: AutoRecharge
rechargeDuration: 20
- type: Reflect
- type: ThrowingAngle
angle: 300
- type: ItemToggleDamageOtherOnHit
- type: ItemToggle
predictable: false
Expand All @@ -76,3 +65,18 @@
enum.ToggleVisuals.Layer:
True: {state: on-icon}
False: {state: off-icon}
- type: Stamp
stampedName: stamp-component-stamped-name-ninja
stampedColor: "#21a52e"
stampState: "paper_stamp-ninja"
# Inherited
# - type: EnergyKatana
# - type: DashAbility
# - type: LimitedCharges
# maxCharges: 3
# charges: 3
# - type: AutoRecharge
# rechargeDuration: 20
# - type: Reflect
# - type: ThrowingAngle
# angle: 300
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich. paper_stamp-borg by aada. paper_stamp-signature by Mnemotechnician.",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich. paper_stamp-borg by iaada(github). paper_stamp-ninja by iaada(github). paper_stamp-signature by Mnemotechnician.",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -234,6 +234,9 @@
{
"name": "paper_stamp-borg"
},
{
"name": "paper_stamp-ninja"
},
{
"name": "paper_stamp-signature"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading