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

..

ammunition

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

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

guns

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

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

projectile

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

2017-01-27 17:28:14 +01:00

ammunition.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

firing.dm

Mass replace

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

gun.dm

Fixes Gun Renaming

2016-11-12 01:32:50 +00:00

projectile.dm

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

2017-01-09 22:00:31 +01:00