Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

anti_photon_grenade.dm

Odd typo fixes.

2015-09-21 20:31:47 +02:00

chem_grenade.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

emgrenade.dm

Renames the classic EMP grenade

2016-05-28 17:12:43 -04:00

explosive.dm

Adds a variable to check for grenade loading, makes frags unloadable.

2016-02-16 12:58:17 -05:00

flashbang.dm

510 Improved Overlays

2016-06-18 15:50:10 -03:00

fragmentation.dm

Adds a variable to check for grenade loading, makes frags unloadable.

2016-02-16 12:58:17 -05:00

grenade.dm

Adds a variable to check for grenade loading, makes frags unloadable.

2016-02-16 12:58:17 -05:00

smokebomb.dm

Makes smoke grenades last longer and adjusts checks

2016-05-06 17:25:28 +01:00

spawnergrenade.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00