Martyr Cyborg Module, borg law 2 explode (#25815)

* borg law 2 explode

* attributions fix + CL fix

* please dear god work i beg you

* maybe this will work :godo:

* 50% off deal + disc change

* absolving merge conflict

* merge conflict fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml

* Apply suggestions from code review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
Mangohydra
2024-04-29 00:16:04 -04:00
committed by GitHub
parent 16f65f42fc
commit 8afae8a1f1
10 changed files with 69 additions and 3 deletions

View File

@@ -0,0 +1,8 @@
- files:
- SDS_Charge.ogg
- SDS_Charge2.ogg
license: Custom
source: https://freesound.org/people/Teh_Bucket/sounds/518739/
# couldn't figure out how to source multiple (the right way) without shit breaking so heres the rest: https://pixabay.com/sound-effects/switchbigpowerwav-14710/ https://pixabay.com/sound-effects/shield-recharging-107016/
copyright: '"Electric Charge + Shot" by Teh_Bucket on Freesound.org. This is adapted from multiple works by dylanperitz, satanicupsman, CaptainGusterd, arightwizard, BigKahuna360, michael_grinnell, weaveofkev, MichelleGrobler, Alex_John73, sandyrb and breo2012 all of Freesound.org. The work by sandyrb is licensed under CC-BY-4.0. , "switchbigpower-14710.wav" and "shield-recharging-107016.wav" by Pixabay on pixabay.com'
# i have no idea how to set these up, it uses all 3 sound effects and i copied the electric charge one from the powersink, godo

View File

@@ -157,6 +157,9 @@ uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio co
uplink-syndicate-weapon-module-name = Weapon Cyborg Module
uplink-syndicate-weapon-module-desc = This module will give a cyborg advanced laser and machete
uplink-syndicate-martyr-module-name = Martyr Cyborg Module
uplink-syndicate-martyr-module-desc = Turn your emagged borg friend into a walking bomb with just this module. Make sure they're loyal to your cause, results may vary.
uplink-singularity-beacon-name = Singularity Beacon
uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed.

View File

@@ -757,6 +757,17 @@
categories:
- UplinkDisruption
- type: listing
id: UplinkSyndicateMartyrModule
name: uplink-syndicate-martyr-module-name
description: uplink-syndicate-martyr-module-desc
productEntity: BorgModuleMartyr
icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb }
cost:
Telecrystal: 4
categories:
- UplinkDisruption
- type: listing
id: UplinkSoapSyndie
name: uplink-soap-name

View File

@@ -552,5 +552,19 @@
- state: icon-syndicate
- type: ItemBorgModule
items:
- WeaponLightMachineGunL6C
- PinpointerSyndicateNuclear
- WeaponLightMachineGunL6C
- PinpointerSyndicateNuclear
- type: entity
id: BorgModuleMartyr
parent: [ BaseBorgModule, BaseProviderBorgModule ]
name: martyr cyborg module
description: "A module that comes with an explosive you probably don't want to handle yourself."
components:
- type: Sprite
layers:
- state: syndicateborgbomb
- state: icon-bomb
- type: ItemBorgModule
items:
- SelfDestructSeq

View File

@@ -120,6 +120,30 @@
params:
volume: 12
- type: entity
name: Self Destruct
description: Go out on your own terms!
parent: GrenadeBase
id: SelfDestructSeq
noSpawn: true
components:
- type: ExplodeOnTrigger
- type: Explosive
explosionType: Minibomb
totalIntensity: 400
intensitySlope: 30
maxIntensity: 125
canCreateVacuum: true
- type: OnUseTimerTrigger
delay: 4.5
beepSound:
path: /Audio/Effects/Grenades/SelfDestruct/SDS_Charge2.ogg
params:
volume: 30
initialBeepDelay: 0
beepInterval: 16
- type: entity
name: supermatter grenade
description: Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time.

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github).",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
"size": {
"x": 32,
"y": 32
@@ -106,6 +106,9 @@
{
"name": "janitor"
},
{
"name": "icon-bomb"
},
{
"name": "medical"
},
@@ -118,6 +121,9 @@
{
"name": "service"
},
{
"name": "syndicateborgbomb"
},
{
"name": "syndicate"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 686 B