Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2019-04-04 22:04:55 +02:00

..

energy

Suicide Refactor

2019-03-27 22:54:26 -04:00

magic

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

2019-01-19 23:35:15 -05:00

misc

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

projectile

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

throw

Update Crossbow.Dm

2019-01-27 01:35:26 -05:00

alien.dm

further conversion

2018-07-18 01:13:24 -04:00

dartgun.dm

TG container_type refactor

2018-10-13 08:20:52 +08:00

energy.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

grenade_launcher.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

magic.dm

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

medbeam.dm

Adds Medical Beamgun to a Syndicate Medical Cyborg

2019-03-25 01:35:50 +01:00

mounted.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

projectile.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

rocket.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

syringe_gun.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

throw.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00