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 0000000000..188a0b861f Binary files /dev/null and b/Resources/Audio/Effects/hallelujah.ogg differ 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 0000000000..b56d1d2644 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/icon.png new file mode 100644 index 0000000000..5e94c9e3e9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/icon.png differ 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 0000000000..d7b3a4c6ab Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/holyhandgrenade.rsi/primed.png differ