Skip to content

Commit

Permalink
Merge pull request #18 from Thurtik/telebaton
Browse files Browse the repository at this point in the history
Telebaton for command
  • Loading branch information
Doctor-Cpu authored Aug 19, 2024
2 parents c94f49b + 28aa65b commit 1c8206a
Show file tree
Hide file tree
Showing 15 changed files with 95 additions and 7 deletions.
6 changes: 6 additions & 0 deletions Resources/Changelog/Mira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,9 @@ Entries:
type: Tweak
id: 52
time: '2024-08-18T18:37:00.0000000+00:00'
- author: Thurtik
changes:
- message: All heads (except hos) now spawn with a new 'telescopic baton' - a weaker, retractable baton for self-defense, instead of a flash.
type: Add
id: 53
time: '2024-08-19T23:07:00.0000000+00:00'
51 changes: 50 additions & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,56 @@
guides:
- Security
- Antagonists


- type: entity
name: telescopic baton
parent: [BaseItem, BaseCommandContraband]
id: Telescopicbaton
description: A self-defense weapon designed for the head staff of NanoTrasen's many stations. It's easier to handle and carry but less robust than the standart-issue stun batons.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/telebaton.rsi
layers:
- state: telebaton_off
map: [ "enum.ToggleVisuals.Layer" ]
- type: ItemToggle
predictable: false
soundActivate:
path: /Audio/Weapons/telescopicon.ogg
params:
variation: 0.250
soundDeactivate:
path: /Audio/Weapons/telescopicoff.ogg
params:
variation: 0.250
- type: ItemToggleSize
activatedSize: Huge
- type: ItemToggleMeleeWeapon
activatedDamage:
types:
Blunt: 0
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 5
bluntStaminaDamageFactor: 2.0
angle: 60
animation: WeaponArcSlash
- type: StaminaDamageOnHit
damage: 25
sound: /Audio/Weapons/egloves.ogg
- type: UseDelay
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: {state: telebaton_on}
False: {state: telebaton_off}
- type: StaticPrice
price: 80

- type: entity
name: truncheon
parent: [BaseItem, BaseRestrictedContraband]
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
pocket1: AppraisalTool
storage:
back:
- Flash
- Telescopicbaton
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Command/captain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
ears: ClothingHeadsetAltCommand
storage:
back:
- Flash
- Telescopicbaton
# - StationCharter
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@
belt: BoxFolderClipboard
storage:
back:
- Flash
- Telescopicbaton
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
belt: ClothingBeltUtilityEngineering
storage:
back:
- Flash
- Telescopicbaton
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
belt: ClothingBeltMedicalFilled
storage:
back:
- Flash
- Telescopicbaton
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
ears: ClothingHeadsetRD
storage:
back:
- Flash
- Telescopicbaton
33 changes: 33 additions & 0 deletions Resources/Textures/Objects/Weapons/Melee/telebaton.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation, tweaked by Thurtik",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "telebaton_off"
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "telebaton_on"
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.

0 comments on commit 1c8206a

Please sign in to comment.