]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Martyr Cyborg Module, borg law 2 explode (#25815)
authorMangohydra <156087924+Mangohydra@users.noreply.github.com>
Mon, 29 Apr 2024 04:16:04 +0000 (00:16 -0400)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2024 04:16:04 +0000 (21:16 -0700)
commit8afae8a1f14d0f935b25470ece5a38e6ddeaa6ac
tree6d3bec739e77e898d8e9fa19bd224bf5b5a264f2
parent16f65f42fc266fb640ee8ef1eecf549b8ce73279
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>
Resources/Audio/Effects/Grenades/SelfDestruct/SDS_Charge.ogg [new file with mode: 0644]
Resources/Audio/Effects/Grenades/SelfDestruct/SDS_Charge2.ogg [new file with mode: 0644]
Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml [new file with mode: 0644]
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-bomb.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/syndicateborgbomb.png [new file with mode: 0644]