Artur f910a0fd32 Conflict fixes

2020-04-14 09:27:54 +03:00

..

bullets

that was easy

2020-04-06 08:40:34 -04:00

energy

Nerfs HoS taser and warden stun pump action blaster (#11352)

2020-03-20 16:09:10 +01:00

magic

…

reusable

arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)

2020-03-18 19:34:14 +01:00

special

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

2020-03-09 16:49:32 +08:00

beams.dm

Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675)

2020-03-29 17:45:01 +02:00

bullets.dm

…

magic.dm

Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic

2020-03-24 12:36:21 +02:00

megabuster.dm

…

plasma.dm

…