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

..

ammo_casings.dm

Merge pull request #6254 from FlattestGuitar/erifle

2017-01-31 00:43:15 -05:00

boxes.dm

Ports Enforcer handgun, rubber bullets, and new ammoboxes.

2017-01-15 21:13:22 -05:00

energy.dm

Refactors telegun, mimicgun, and tempgun

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

magazines.dm

Adds a laser carbine!

2017-01-26 12:45:36 +01:00

special.dm

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

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