From 337870f60de57f9d03ab6ee7c8791264668f18c7 Mon Sep 17 00:00:00 2001 From: Slava0135 <40753025+Slava0135@users.noreply.github.com> Date: Mon, 17 Jul 2023 22:36:37 +0300 Subject: [PATCH] Add holy hand grenade (#18107) * no sound yet * point light * hallelujah * uplink * fix license maybe? * 3.0 then (fake) --- Resources/Audio/Effects/attributions.yml | 7 ++++- Resources/Audio/Effects/hallelujah.ogg | Bin 0 -> 21200 bytes .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Catalog/uplink_catalog.yml | 14 +++++++++ .../Objects/Weapons/Throwable/grenades.yml | 25 ++++++++++++++++ .../holyhandgrenade.rsi/equipped-BELT.png | Bin 0 -> 684 bytes .../Grenades/holyhandgrenade.rsi/icon.png | Bin 0 -> 327 bytes .../Grenades/holyhandgrenade.rsi/meta.json | 27 ++++++++++++++++++ .../Grenades/holyhandgrenade.rsi/primed.png | Bin 0 -> 867 bytes 9 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/Effects/hallelujah.ogg create mode 100644 Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/primed.png diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 9cccf2651f..6624f15ba6 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -31,4 +31,9 @@ - files: ["beep1.ogg"] license: "CC0-1.0" copyright: "Taken from thisusernameis via freesound.org + mixed from stereo to mono." - source: "https://freesound.org/people/thisusernameis/sounds/426891/" \ No newline at end of file + source: "https://freesound.org/people/thisusernameis/sounds/426891/" + +- files: ["hallelujah.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Composer: Georg Friedrich Händel; Performed by: MIT Concert Choir; Directed by William C. Cutter; + cropped and mixed from stereo to mono" + source: "https://en.wikipedia.org/wiki/File:Handel_-_messiah_-_44_hallelujah.ogg" \ No newline at end of file diff --git a/Resources/Audio/Effects/hallelujah.ogg b/Resources/Audio/Effects/hallelujah.ogg new file mode 100644 index 0000000000000000000000000000000000000000..188a0b861fc60d8eeb0cf68fe0023c68429295bb GIT binary patch literal 21200 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 a3D8JLcG$HOV1DMac8d10@Un25022U)+ywjp literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 5fb96cede8..ba07ce1df9 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -166,6 +166,9 @@ uplink-rigged-boxing-gloves-desc = Float like a butterfly, sting like a bee. uplink-necronomicon-name = Necronomicon uplink-necronomicon-desc = An unholy book capable of summoning a demonic familiar. +uplink-holy-hand-grenade-name = Holy Hand Grenade +uplink-holy-hand-grenade-desc = O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy. + uplink-revolver-cap-gun-fake-name = Fake Cap Gun uplink-revolver-cap-gun-fake-desc = Fool your enemy! It can use both cap and magnum bullets. Comes loaded with magnum bullets. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 07d637b218..1f5fd6952f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -668,6 +668,20 @@ components: - SurplusBundle +- type: listing + id: uplinkHolyHandGrenade + name: uplink-holy-hand-grenade-name + description: uplink-holy-hand-grenade-desc + productEntity: HolyHandGrenade + cost: + Telecrystal: 20 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chaplain + - type: listing id: uplinkRevolverCapGunFake name: uplink-revolver-cap-gun-fake-name diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 9aaffa6769..607260f3f5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -202,3 +202,28 @@ - type: TimerTriggerVisuals primingSound: path: /Audio/Effects/countdown.ogg + +- type: entity + name: holy hand grenade + description: O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy. + parent: GrenadeBase + id: HolyHandGrenade + components: + - type: Sprite + sprite: Objects/Weapons/Grenades/holyhandgrenade.rsi + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default # same as macrobomb + totalIntensity: 3500 + intensitySlope: 15 + maxIntensity: 70 + canCreateVacuum: true + - type: OnUseTimerTrigger + delay: 3 # by canon + - type: PointLight + radius: 7 + energy: 3 + netsync: false + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Effects/hallelujah.ogg diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..b56d1d264458907dcd4d1e94995ad3e38f2b7725 GIT binary patch literal 684 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP zNSl20(nVr|vMwyfD>$?|nk=$pcZq0jZHo7nz8vO}?Gd$P2bUfnEBnQx>krm1Sp8s? z0!Np^qi64~E2+-QZV}sPerHbm_j}(9KC#sZ2A{Y3I(fp`r*9)HmYmhs$!Zj5+9J55 z{b0+xh~SGEEwf&K?z0NbZx3C6>-)dhv)XNoonse&*pYX$GI3_xiK=@+dvxzCOc&BV z)PBf$8;?fK(l1MnpYOUXw_khP z=Ahjv<&OoFeK>kmSi=lY8ta&<&;0vd`sc^98`R`t?}@qQ6fQa0QSNc2sl;^2G8gkF zhMKGH{D1ax$uYOR?{pP2DvIuIx8r!@u=B~Tc=vVDc5MHZW1eXJGd-F4$oWf<>ucMF zYrYn{*JPZGwYcAOj$J!Zy-sC+PP`WD`sD&K4d0|QqCRc;3=*pLn`BhEy=Vy=BOENI`@l;L%x` z9nH$_FFN-$ix-(6Imvt_Rj6dW2D7@>>g6+ z+uoF}+?ze;+SIlEvzBQtne%)~P;J5E4nb3?Xl_M&`Okl==GkwooaFUL&UDw?hU;%X z$({(}9X{LLHku$-8Gl5|Cz;?*hWE# zy?$N)%h;z_GpY7D*oXASSw9HqzQhA_8bf0tQ+`2r%vQN?zN|q1GI+ZBxvX~eNzxbTI8A!zj!a7>aD z5@dzIfI9$|a0e_3Mjdc(o+CIBg202Dui!T z%R%N4od}UFMb3`M4j|QXvK@dN9WV!wV>v|*z?LA%5hE)K$gv2Qo>2#khQMeDjD`RJ Z)kCo%P{)5k00000NkvXXu0mjf006#5c5eUx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json new file mode 100644 index 0000000000..d3547be774 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by slava0135 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b3a4c6abedddc148fa45b96446e1fce6f690b9 GIT binary patch literal 867 zcmV-p1DyPcP)8*Zo??#@}85Jh#7P93r6sT zAZ>(*5K1c79-EqqQ*(XZQK#!|zwTB0-oLA5*>n}uH3<(Z+wp{D8se*-t$9nhLuHc7 z!iU09M+OwW(t4`Q&zjR^e%I{GB*r12dm8CqochHo0Xz25 zjQ{`u32;bRa{vGf5&!@T5&_cPe*6Fc0h~!hK~!i3V_+Bsqai?c2)us#^8fMkXa19I z0EHTGl080gyh9->Um`AD}YT7^IQvj)fkD{I$ zc@V`w5;@ecf5fMN5g!0#6xh3IOGK z5QYKdG5{n7Di2^~0!$4xX;7XAVHiLz13+S+@&HyQz|;_;NeTc$h7Cn|k~%}6JdX^} z%K%*20a*_vY*3y@1|Ys9Qac2_JU~{9i%oPH05Sl*5CVzadGr`Wp#WO-3Ta_KNm)Qt zSe#&h(aQ6n5T=FwBn1E=N6^yquq1{r5XiBg