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

..

automatic.dm

Adds a laser carbine!

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

bow.dm

Bow fix

2016-10-25 14:43:11 +02:00

launchers.dm

Action Button Update

2016-07-18 13:23:01 -07:00

pistol.dm

Makes the description generic.

2017-01-16 00:14:30 -05:00

revolver.dm

Fixes Gun Renaming

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

saw.dm

Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage

2017-01-23 01:56:47 -05:00

shotgun.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

sniper.dm

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

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

toy.dm

Small fixes for foam force weapons

2016-09-14 20:11:38 -08:00