Commit Graph

3 Commits

Author SHA1 Message Date
Mangohydra
8afae8a1f1 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>
2024-04-28 21:16:04 -07:00
Chronophylos
1aafcb0be3 Convert other attributions in Resources/Audio (#21609)
* convert some attributions

* use commit as source

* use preferred copyright

* update source with commit link

* convert more attributions

* finish Audio/Effects

* convert attributions

* convert attributions in Audio/Effects/Diseases

* renamed to attributions.yml

* convert attributions in Audio/Effects/Lightning

* convert attributions in Audio/Effects/PowerSink

* convert attributions in Audio/Effects/Shuttle

* convert attributions in Audio/Effects/Weather

* convert attributions in Audio/Magic

* convert attributions in Audio/Voice/Reptilian

* fix missing source field

* use note in copyright field instead of SPDX style License Reference for Custom licenses
2023-11-12 16:14:26 -07:00
AlexMorgan3817
62ccbdaeae Supermatter grenades (#13747)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-11 00:29:47 +10:00