]>
git.smokeofanarchy.ru Git - space-station-14.git/commit
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>