diff --git a/Resources/Audio/_Goobstation/Weapons/Effects/attributions.yml b/Resources/Audio/_Goobstation/Weapons/Effects/attributions.yml new file mode 100644 index 00000000000..c80ee7d8507 --- /dev/null +++ b/Resources/Audio/_Goobstation/Weapons/Effects/attributions.yml @@ -0,0 +1,52 @@ +# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 Aviu00 <93730715+Aviu00@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 Aviu00 +# SPDX-FileCopyrightText: 2025 GoobBot +# SPDX-FileCopyrightText: 2025 SX-7 <92227810+SX-7@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 Solstice +# SPDX-FileCopyrightText: 2025 SolsticeOfTheWinter +# SPDX-FileCopyrightText: 2025 Spatison <137375981+Spatison@users.noreply.github.com> +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +#Hypothesis removal +# - files: ["pierce1.ogg"] +# license: "CC-BY-SA-3.0" +# copyright: "Taken from tgstation." +# source: "https://github.com/tgstation/tgstation/blob/80ab61c8c7741e1d95e5f168357a9e6e61b38f2c/sound/effects/wounds/pierce1.ogg" + +- files: ["nanotrasenenergyhum.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from freesound.org, and edited by SolsticeOfTheWinter" + source: "https://freesound.org/people/Za-Games/sounds/540214/" + +- files: ["nanotrasenenergyon.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from freesound.org, and edited by SolsticeOfTheWinter" + source: "https://freesound.org/people/pip_/sounds/557194/" + +- files: ["nanotrasenenergyoff.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from freesound.org, and reversed by SolsticeOfTheWinter" + source: "https://freesound.org/people/pip_/sounds/557194/" + +#Hypothesis removal +# - files: ["energy-short-sword-swing.ogg"] +# license: "CC-BY-SA-3.0" +# copyright: "Taken from freesound.org" +# source: "https://freesound.org/people/ejfortin/sounds/49675/" +# +# - files: ["metalcrush.ogg"] +# license: "CC-BY-SA-3.0" +# copyright: "Taken from freesound.org, and edited by SolsticeOfTheWinter" +# source: "https://freesound.org/people/Artninja/sounds/752072/" + +# - files: ["throwhard.ogg"] +# license: "CC-BY-SA-3.0" +# copyright: "Taken from tgstation." +# source: "https://github.com/tgstation/tgstation/blob/80ab61c8c7741e1d95e5f168357a9e6e61b38f2c/sound/items/weapons/throwhard.ogg" + +# - files: ["laserpointer.ogg"] +# license: "CC-BY-NC-4.0" +# copyright: "night_vision.wav by Syna-Max" +# source: "https://freesound.org/s/60345/" diff --git a/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyhum.ogg b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyhum.ogg new file mode 100644 index 00000000000..a254c50e17b Binary files /dev/null and b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyhum.ogg differ diff --git a/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyoff.ogg b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyoff.ogg new file mode 100644 index 00000000000..f136bf41734 Binary files /dev/null and b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyoff.ogg differ diff --git a/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyon.ogg b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyon.ogg new file mode 100644 index 00000000000..f2f6d903fd1 Binary files /dev/null and b/Resources/Audio/_Goobstation/Weapons/Effects/nanotrasenenergyon.ogg differ diff --git a/Resources/Locale/en-US/_Hypothesis/ghost/ghost-role-component.ftl b/Resources/Locale/en-US/_Hypothesis/ghost/ghost-role-component.ftl new file mode 100644 index 00000000000..44a5551c735 --- /dev/null +++ b/Resources/Locale/en-US/_Hypothesis/ghost/ghost-role-component.ftl @@ -0,0 +1,4 @@ +# Justice Phoron Saber Persona Role + +justice-phoron-role-name = Justice Phoron Saber Persona +justice-phoron-role-description = Help the holy NanoTrasen deathsquad priest by shouting NT scripture for them while they deliver their sermon. diff --git a/Resources/Prototypes/_Hypothesis/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Hypothesis/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..61f1f2d0aaf --- /dev/null +++ b/Resources/Prototypes/_Hypothesis/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,31 @@ +- type: entity + parent: ClothingBeltSheath + id: ClothingBeltSheathJusticePhoron + name: Justice Phoron Sabre Magnet + description: A super strong magnet, designed to hold the deathsquad priest's holy phoron blade. + components: + - type: Sprite + sprite: _Hypothesis/Clothing/Belt/jupsheath.rsi + state: sheath + - type: Clothing + sprite: _Hypothesis/Clothing/Belt/jupsheath.rsi + - type: Item + size: Ginormous + - type: ItemSlots + slots: + item: + name: Sabre + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - PhoronJustice + - type: ItemMapper + mapLayers: + sheath-sabre: + whitelist: + tags: + - PhoronJustice + - type: Appearance diff --git a/Resources/Prototypes/_Hypothesis/Entities/Objects/Weapons/Melee/justice_phoron_sabre.yml b/Resources/Prototypes/_Hypothesis/Entities/Objects/Weapons/Melee/justice_phoron_sabre.yml new file mode 100644 index 00000000000..cb109e49a0f --- /dev/null +++ b/Resources/Prototypes/_Hypothesis/Entities/Objects/Weapons/Melee/justice_phoron_sabre.yml @@ -0,0 +1,77 @@ +- type: entity + name: justice phoron sabre + parent: [BaseMeleeWeaponEnergy, BaseCentcommContraband] + id: JusticePhoronSabre + suffix: DO NOT MAP + description: The signature weapon of the holy deathsquad priests. It's not mainly for show. + components: + - type: ItemToggle + soundActivate: + path: /Audio/_Goobstation/Weapons/Effects/nanotrasenenergyon.ogg + soundDeactivate: + path: /Audio/_Goobstation/Weapons/Effects/nanotrasenenergyoff.ogg + - type: ItemToggleActiveSound + activeSound: + path: /Audio/_Goobstation/Weapons/Effects/nanotrasenenergyhum.ogg + - type: Sprite + sprite: _Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi + layers: + - state: jup_sword + - state: jup_sword_blade + color: "#b5fbfa" + visible: false + shader: unshaded + map: [ "blade" ] + + - type: GhostRole + name: justice-phoron-role-name + description: justice-phoron-role-description + rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar + - type: GhostTakeoverAvailable + - type: TypingIndicator + proto: robot + - type: Speech + speechVerb: Robotic + speechSounds: Pai + - type: MobState + allowedStates: + - Alive + + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Slash: 12 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 + activatedDamage: + types: + Slash: 30 + Heat: 35 + Radiation: 10 + Structural: 80 + + - type: Item + sprite: _Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi +# size: Ginormous + - type: Tag + tags: + - PhoronJustice diff --git a/Resources/Prototypes/_Hypothesis/tags.yml b/Resources/Prototypes/_Hypothesis/tags.yml new file mode 100644 index 00000000000..d355c4c130f --- /dev/null +++ b/Resources/Prototypes/_Hypothesis/tags.yml @@ -0,0 +1,7 @@ +# PUT YOUR TAGS IN ALPHABETICAL ORDER +# ALSO DOCUMENT WHAT THE HELL THEY DO + +## P ## + +- type: Tag + id: PhoronJustice # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath diff --git a/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/equipped-BELT.png b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/equipped-BELT.png new file mode 100644 index 00000000000..a732502b1d6 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/meta.json b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/meta.json new file mode 100644 index 00000000000..7cc7333808b --- /dev/null +++ b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Mince", + "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/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre-equipped-BELT.png new file mode 100644 index 00000000000..36d7112a69a Binary files /dev/null and b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre-equipped-BELT.png differ diff --git a/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre.png b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre.png new file mode 100644 index 00000000000..c27364b587c Binary files /dev/null and b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath-sabre.png differ diff --git a/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath.png b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath.png new file mode 100644 index 00000000000..bcc980cad91 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Clothing/Belt/jupsheath.rsi/sheath.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/icon.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/icon.png new file mode 100644 index 00000000000..cc3b2be8874 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/icon.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword.png new file mode 100644 index 00000000000..0272790cfea Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword_blade.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword_blade.png new file mode 100644 index 00000000000..e201d845e47 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/jup_sword_blade.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/meta.json b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/meta.json new file mode 100644 index 00000000000..302d1b2c523 --- /dev/null +++ b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original Justice Sword and Phoron Saber by Taro Varne, modified by Mince", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "jup_sword" + }, + { + "name": "jup_sword_blade", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left-blade.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..faf08780525 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..4f739ae7da2 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right-blade.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..bd76c2f39d9 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right.png b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..907b5954518 Binary files /dev/null and b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/meta.json b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/meta.json new file mode 100644 index 00000000000..09776d424b8 --- /dev/null +++ b/Resources/Textures/_Hypothesis/Objects/Weapons/Melee/justice_phoron_sabre_inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original Justice Sword and Phoron Saber by Taro Varne, modified by Mince", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +}