Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

2014-05-31 00:17:56 +01:00

..

decals

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters

2014-04-19 19:24:45 +02:00

spawners

fix another merge issue

2014-05-11 13:56:17 +00:00

aliens.dm

alien weeds performance and layer fixes

2014-05-29 19:02:17 +02:00

barsign.dm

…

biomass_rift.dm

…

bump_teleporter.dm

…

chemsmoke.dm

Chemsmoke tweaks and bug fixes

2014-02-27 00:59:01 +13:00

effect_system.dm

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2014-02-26 09:38:40 -06:00

gibs.dm

Gib rewrite/resprite to allow for arbitrary blood and flesh colours.

2013-12-30 21:48:34 +10:30

glowshroom.dm

…

landmarks.dm

…

manifest.dm

…

mines.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

misc.dm

…

overlays.dm

…

portals.dm

…

spiders.dm

…

step_triggers.dm

…