Markolie 3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/obj/objects.dmi

2017-02-08 19:25:47 +01:00

..

ammunition

Kinetic accelerator update, other fixes

2017-02-06 18:39:03 +01:00

guns

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

2017-02-08 19:25:47 +01:00

projectile

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +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

Minor fixes, prevent ABSTRACT items from being summoned

2017-02-07 23:54:50 +01:00

projectile.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00