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

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

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

..

ammunition

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

guns

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-20 23:43:35 +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