Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

energy

X-01 grammar fix

2016-10-24 16:43:30 +02:00

magic

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-20 23:43:35 +01:00

projectile

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

throw

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

alien.dm

Mimic Gun and Gun Fixes (#4699)

2016-06-19 13:14:33 -04:00

dartgun.dm

Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor

2017-01-26 03:47:30 -08:00

energy.dm

Refactors telegun, mimicgun, and tempgun

2016-07-22 16:08:17 -04:00

grenade_launcher.dm

Sprites & fixes

2016-05-31 22:50:57 -04:00

magic.dm

Mass replace

2016-07-07 19:34:02 -07:00

medbeam.dm

Compiles, and guns work™

2016-05-31 22:50:55 -04:00

mounted.dm

Finishing touches

2016-06-08 15:11:24 -04:00

projectile.dm

Mass replace

2016-07-07 19:34:02 -07:00

rocket.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

syringe_gun.dm

Compiles, and guns work™

2016-05-31 22:50:55 -04:00

throw.dm

Crossbows and piescannons

2016-06-02 22:17:19 -04:00