Skip to content

Commit

Permalink
Add a foam sabre (DeltaV-Station#2310)
Browse files Browse the repository at this point in the history
* Added sabre + sheath

* Can't forget the filled sheath

* Fix comment + fun StaminaDamageOnHit

* Add the sabre to the maints loot pool

* Add the sword to the mime loadout

* Let's add a sharp version!

* Why not add it to the syndicate catalog?

* Conventions!

* Grammar!

* Fix indent

* Fix indent on the sabre

* Now in mail!

* Indent!

---------

Co-authored-by: Milon <[email protected]>
Co-authored-by: deltanedas <[email protected]>
  • Loading branch information
3 people authored Dec 6, 2024
1 parent bdc0a52 commit 2698e89
Show file tree
Hide file tree
Showing 20 changed files with 159 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to
uplink-home-run-bat-name = Home Run Bat
uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
uplink-foam-sabre-name = Sharp Foam Sabre
uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assassins that pretend playing around.
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,23 @@
- id: Bloodpack
- id: SyringeEphedrine
- id: EmergencyMedipen

- type: entity
id: ClothingBeltFoamSheathFilled
parent: ClothingBeltFoamSheath
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- FoamSabre

- type: entity
id: ClothingBeltRealFoamSheathFilled
parent: ClothingBeltFoamSheath
suffix: Filled, Real
components:
- type: ContainerFill
containers:
item:
- RealFoamSabre
15 changes: 15 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,18 @@
Telecrystal: 16
categories:
- UplinkWeaponry

- type: listing
id: UplinkRealFoamSabre
name: uplink-foam-sabre-name
description: uplink-foam-sabre-desc
productEntity: ClothingBeltRealFoamSheathFilled
icon:
entity: RealFoamSabre
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 4
cost:
Telecrystal: 6
categories:
- UplinkWeaponry
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,14 @@
ents: []
medkit: !type:ContainerSlot {}
- type: Appearance

- type: entity
parent: ClothingBeltSheath
id: ClothingBeltFoamSheath
name: foam sheath
description: A foam sheath to cosplay as the captain! It seems to be able to fit a real sabre in it.
components:
- type: Sprite
sprite: DeltaV/Clothing/Belt/foamsheath.rsi
- type: Clothing
sprite: DeltaV/Clothing/Belt/foamsheath.rsi
30 changes: 30 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,33 @@
- type: Sprite
sprite: DeltaV/Objects/Fun/Toys/zerotoy.rsi
state: icon

- type: entity
parent: BaseItem
id: FoamSabre
name: foam sabre
description: Cosplay as a captain and command your group of friends!
components:
- type: Sprite
sprite: DeltaV/Objects/Fun/Toys/foam_sabre.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 1.5
range: 2.0
damage:
types:
Blunt: 0
- type: Reflect # Imitation of captain's sword, 1% chance of reflecting a projectile for the fun chance of it happening.
reflectProb: .01
spread: 90
- type: Item
size: Normal
sprite: DeltaV/Objects/Fun/Toys/foam_sabre.rsi
- type: Tag
tags:
- CaptainSabre # To be able to store it a captain's sheath if you get your hands on one.
- type: StaminaDamageOnHit
damage: 5
- type: Execution
doAfterDuration: 3.0
Original file line number Diff line number Diff line change
Expand Up @@ -1732,3 +1732,12 @@
amount: 1
- id: PaperMailHydroCoTrial
amount: 1

- type: entity
parent: BaseMailLarge
id: MailFoamSabre
suffix: Foam sabre
components:
- type: Mail
contents:
- id: ClothingBeltFoamSheathFilled
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
parent: FoamSabre
id: RealFoamSabre
name: foam sabre
suffix: Real
components:
- type: MeleeWeapon
attackRate: 1.5
damage:
types:
Slash: 14
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: StaminaDamageOnHit
damage: 0
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Belt
- type: loadout
id: FoamSabre
equipment:
belt: ClothingBeltFoamSheathFilled
3 changes: 2 additions & 1 deletion Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
MailNFSodaSpaceUp: 0.2
#End Soda
MailNFSmoke: 0.4
MailSpaceVillainDIY: 0.5
MailSpaceVillainDIY: 0.4 # Lowered to accommodate the foam sabre
MailSignallerKit: 0.5
MailSunglasses: 1
MailNFSoaps: 0.5
Expand All @@ -63,6 +63,7 @@
MailNFUnusualFood: 1.09 # DeltaV: increased to offset throngler toy
MailNFUnusualProduce: 1
MailNFVagueThreat: 0.5
MailFoamSabre: 0.1
# Mainly for Glacier
MailWinterCoat: 1.5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
- id: CigarGold
- id: ClothingUniformJumpsuitFamilyGuy
- id: WristwatchGold
- id: ClothingBeltFoamSheathFilled # DeltaV - Add small chance of it spawning in maints locker.
#- id: RubberStampGreytide # Delta-V: prevent greytide stamp from spawning

- type: entity
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@
loadouts:
- MimeSuspendersRed
- MimeSuspendersBlack
- FoamSabre # DeltaV - Add foam sabre to the mime's loadout.

- type: loadoutGroup
id: SurvivalMime
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf , edited by Skarletto (github), modified by Radezolid for foam sheath",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "sheath-sabre-equipped-BELT",
"directions": 4
},
{
"name": "sheath-sabre"
},
{
"name": "sheath"
}
]
}
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,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf, modified by Radezolid for foam sabre",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 2698e89

Please sign in to comment.