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

..

aoe_turf

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

general

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

targeted

510 Improved Overlays

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

artifacts.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-27 13:36:56 +02:00

construct_spells.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

no_clothes.dm

…

spell_code.dm

Allowed grenades to be stuffed into mouths and primed.

2015-12-24 21:55:05 +10:30

spell_projectile.dm

Fixes #10410. Fixes #10411.

2015-08-11 13:36:56 +02:00

spellbook.dm

Removes Horsehead and Mindswap from Wizard spellbooks

2016-05-22 11:38:09 -05:00

spells.dm

…