diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl index 4b860e6efdd..4cf03df5f92 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl @@ -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. diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml index b563757acb5..cbdee1d05fa 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index f8c317772ae..f03c88af6b5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index cef0cf394c1..a609238d9be 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 2a22e6fd938..39593702130 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 2fa02ebc002..9bb228637a3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/foam_blade.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/foam_blade.yml new file mode 100644 index 00000000000..ac47fed7992 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/foam_blade.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml new file mode 100644 index 00000000000..43740a3097a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml @@ -0,0 +1,5 @@ +# Belt +- type: loadout + id: FoamSabre + equipment: + belt: ClothingBeltFoamSheathFilled diff --git a/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml b/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml index c951d09986e..d7cd57d75bf 100644 --- a/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 2ef16c6ec18..93194945ee3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -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 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 0a167aca0c7..d801a9fce93 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -634,6 +634,7 @@ loadouts: - MimeSuspendersRed - MimeSuspendersBlack + - FoamSabre # DeltaV - Add foam sabre to the mime's loadout. - type: loadoutGroup id: SurvivalMime diff --git a/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d404e4143e0 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/meta.json new file mode 100644 index 00000000000..6383a3c4561 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre-equipped-BELT.png new file mode 100644 index 00000000000..94674c9adb2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre-equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre.png b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre.png new file mode 100644 index 00000000000..22f78689188 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath-sabre.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath.png b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath.png new file mode 100644 index 00000000000..3e85e396f94 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/foamsheath.rsi/sheath.png differ diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/icon.png new file mode 100644 index 00000000000..b96fff801ac Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-left.png new file mode 100644 index 00000000000..8c609f03958 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-right.png new file mode 100644 index 00000000000..44f5e32a291 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/meta.json new file mode 100644 index 00000000000..e9322bc4d34 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Fun/Toys/foam_sabre.rsi/meta.json @@ -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 + } + ] +}