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

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