Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs ...

Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi

2015-02-20 22:00:53 -08:00

..

decals

finally actually fixes the blood decals

2015-02-01 00:29:37 -08:00

effect_system

Foam spreading now respects type.

2015-02-14 13:32:32 -06:00

spawners

Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs

2015-02-20 22:00:53 -08:00

aliens.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-16 02:52:08 +03:00

anomalies.dm

Anomaly Event Changes

2014-10-19 17:07:07 -05:00

bump_teleporter.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

explosion_particles.dm

Removes old/unused code from the tree. Use version control if you need it for some reason.

2014-11-16 16:53:18 -03:00

forcefields.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

gibs.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

glowshroom.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

landmarks.dm

EmergencyResponseTeamV2

2015-01-11 19:21:38 +08:00

manifest.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

mines.dm

fixes kickmine runtime

2015-02-17 09:56:16 -07:00

misc.dm

…

overlays.dm

makes the singularity's pulling OOP with the magic of atom proc

2014-10-27 16:43:35 -07:00

portals.dm

Bluespace wormhole projector

2014-10-26 15:06:30 +02:00

spiders.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

step_triggers.dm

Fixes some backwards logic

2014-12-12 16:48:06 +00:00