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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

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

..

decals

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

2014-02-11 18:07:19 -06:00

spawners

Converted robots over to current blood system/paths, updated various files to work with update.

2013-12-29 02:48:20 +10:30

aliens.dm

Fix for destroying alien walls with your bare hands.

2013-06-21 19:03:12 -07: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

effect_system.dm

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

2014-02-26 09:34:38 -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

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10: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