Mloc-Hibernia d1d3620a12 fix another merge issue ...

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

2014-05-11 13:56:17 +00: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

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

…

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

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

…

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

…