From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:03:05 +0000 (-0400) Subject: ERT Janitor Weapon - Hydra (#34416) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=aa5d344a575fba462462ed62390fc82d38c592aa;p=space-station-14.git ERT Janitor Weapon - Hydra (#34416) * checkpointing work * Got this fully working and all sprites done * Exchanged my sprites with the ones made by AugustSun * Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead. * Modified the hydra to be a revolver * fixed container issue * Swapped in even newer sprites * review --------- Co-authored-by: Milon --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 42bd054ac7..2bd0dfc46d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -123,6 +123,23 @@ state: frag suffix: false +- type: entity + parent: BaseGrenade + id: GrenadeCleanade + name: cleanade grenade round + components: + - type: CartridgeAmmo + proto: BulletGrenadeCleanade + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: cleanade + map: [ "enum.AmmoVisualLayers.Base" ] + - type: Appearance + - type: SpentAmmoVisuals + state: frag + suffix: false + - type: entity id: GrenadeEMP name: EMP grenade diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 64f1fdac29..2fcf294a73 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -53,6 +53,46 @@ soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg +- type: entity + parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] + id: WeaponLauncherHydra + name: hydra + description: PLOOP... FSSSSSS + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: ContainerContainer + containers: + revolver-ammo: !type:Container + - type: RevolverAmmoProvider + whitelist: + tags: + - Grenade + proto: GrenadeCleanade + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg + - type: entity name: RPG-7 parent: [ BaseWeaponLauncher, BaseMajorContraband ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index ace364f127..4d7ef02f8a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -813,6 +813,36 @@ intensitySlope: 1 maxIntensity: 10 +- type: entity + parent: BaseBulletTrigger + id: BulletGrenadeCleanade + name: cleanade grenade round + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: cleanade + - type: ActiveTimerTrigger + timeRemaining: 0.3 + - type: SmokeOnTrigger + duration: 3.5 + spreadAmount: 30 + smokePrototype: Foam + solution: + reagents: + - ReagentId: SpaceCleaner + Quantity: 30 + - type: SoundOnTrigger + sound: /Audio/Items/smoke_grenade_smoke.ogg + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + totalIntensity: 0.01 # a little pop + intensitySlope: 1 + maxIntensity: 0.01 + tileBreakScale: 0.01 + - type: entity id: BulletGrenadeEMP name: EMP rocket diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png new file mode 100644 index 0000000000..ba40acdec2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json index 15ed620c3e..0d91035a83 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball, glassshot and grapeshot Made by Alekshhh (Github) for ss1, emp made by TheShuEd (github)", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball, glassshot and grapeshot Made by Alekshhh (Github) for ss1, emp made by TheShuEd (github), cleanade made by southbridge-fur (github)", "states": [ { "name": "baton" @@ -36,6 +36,9 @@ }, { "name": "spent" + }, + { + "name": "cleanade" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/bolt-open.png new file mode 100644 index 0000000000..9a88d3f8ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..31343acf34 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..31343acf34 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/icon.png new file mode 100644 index 0000000000..9a88d3f8ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-left.png new file mode 100644 index 0000000000..ba8ff16677 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-right.png new file mode 100644 index 0000000000..b4ed0ebe9b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/meta.json new file mode 100644 index 0000000000..df91b7ed4c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Hydra Launcher sprites by august-sun (Github) / augustsun (Discord) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..3f9ae1e9f0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4ce848601f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png new file mode 100644 index 0000000000..28a4bc828f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json index 87ce717f44..b4d8f09a82 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111, cleanade made by Southbridge_fur (github)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "buckshot-flare" }, - { + { "name": "depleted-uranium" }, { @@ -91,11 +91,20 @@ ] ] }, - { + { "name": "grapeshot" }, - { + { "name": "shard" + }, + { + "name": "cleanade", + "delays": [ + [ + 0.05, + 0.05 + ] + ] } ] }