Zuhayr 2b4cd94650 Merge resolution.

2014-11-19 23:28:09 +10:30

..

decals

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

spawners

integrate XGM into the code

2014-07-22 19:52:12 +01:00

aliens.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

biomass_rift.dm

…

bump_teleporter.dm

…

chemsmoke.dm

Fix for infinite loop in smokeFlow() proc.

2014-08-13 06:26:30 +08:00

effect_system.dm

Manual merge of head.dmi.

2014-11-14 23:02:16 +10:30

gibs.dm

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

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

glowshroom.dm

Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.

2014-07-20 16:29:18 +09:30

landmarks.dm

Merge pull request #6987 from MagmaRam/labcoat

2014-11-17 04:17:16 +03:00

manifest.dm

…

mines.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

misc.dm

…

overlays.dm

…

portals.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-09-10 22:14:37 +01:00

spiders.dm

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

2014-09-29 06:19:26 +09:30

step_triggers.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00