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

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm

2015-03-08 14:26:52 -07:00

..

decals

Fixes #8116 trails bug

2015-03-04 19:53:11 -05:00

effect_system

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

2015-03-08 14:26:52 -07:00

spawners

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

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

aliens.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

anomalies.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00: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

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

landmarks.dm

Randomizes Order of Job Spawn Points

2015-03-02 20:01:36 -07: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

More file structuring.

2012-09-05 22:44:48 +00:00

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

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

step_triggers.dm

Fixes some backwards logic

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