MagmaRam cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat ...

Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.

2014-11-16 02:56:32 -05:00

..

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

- 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

Fix for infinite loop in smokeFlow() proc.

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

effect_system.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +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

All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle

2014-11-11 11:27:11 -05:00

manifest.dm

…

mines.dm

integrate XGM into the code

2014-07-22 19:52:12 +01: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

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