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

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

biomass_rift.dm

- Made biomass a viable thing to spawn. It spreads and grows exactly the same as space vines (kudzu), but unlike kudzu, which is opaque, but not dense, biomass is dense, but not opaque.

2013-01-12 22:27:21 +00:00

bump_teleporter.dm

- Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list.

2012-10-07 21:08:23 +00:00

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

Fixes.

2013-10-07 20:35:26 +01:00

landmarks.dm

WIP: Implementing space ninja gamemode

2013-06-15 16:09:23 -07:00

manifest.dm

Map and Animal fixes!

2012-08-29 22:59:53 +00:00

mines.dm

Changes all appropriate instances of toxins to phoron

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

misc.dm

More file structuring.

2012-09-05 22:44:48 +00:00

overlays.dm

Fixed palm trees. You can no longer shove them around, and you'll no longer appear standing over the top half of them.

2012-10-17 05:12:39 +00:00

portals.dm

File restructuring!

2012-08-29 18:00:30 +00:00

spiders.dm

Fixed #2598

2013-03-31 16:54:53 +04:00

step_triggers.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00