Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

decals

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

spawners

shotgun

2016-01-03 04:03:48 -05:00

aliens.dm

whoops

2016-03-12 21:58:50 -05:00

anomalies.dm

Port Bay's intercom overhaul

2015-09-03 21:21:20 +02:00

barsign.dm

…

biomass_rift.dm

…

bump_teleporter.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

datacore-effect.dm

Renamed manifest section Support to Service

2016-01-28 22:30:45 -05:00

effect_system.dm

Fixes stuff and stuff

2016-03-28 23:03:17 -07:00

explosion_particles.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

forcefields.dm

Miming Refactor

2016-02-28 22:40:00 -05:00

gibs.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

glowshroom.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

landmarks.dm

Removes Nations and Unused Game Modes

2015-10-11 19:51:19 -04:00

manifest.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

mines.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

misc.dm

…

overlays.dm

bwoink

2016-03-16 03:53:38 -04:00

portals.dm

Ports Wormhole Projector

2015-12-19 00:57:40 -05:00

spiders.dm

Fixes several midround antag assignments not asking ghosts first

2016-03-07 03:03:45 -05:00

step_triggers.dm

…