Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

area_teleport.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

charge.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

conjure.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

construct_spells.dm

Singularity Refactor

2015-06-10 20:04:28 -04:00

dumbfire.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

emplosion.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

ethereal_jaunt.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

explosion.dm

Explosion Rework

2015-06-20 04:13:55 -04:00

fake_gib.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

genetic.dm

Fixes, Genetics, and Balance

2015-02-24 22:58:05 -05:00

horsemask.dm

2/3 of port done

2015-05-25 19:48:13 -04:00

inflict_handler.dm

issmall fixes and order of operations

2015-05-25 23:50:53 -04:00

knock.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

lightning.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

magnet.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

mind_transfer.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

projectile.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

summonitem.dm

FIX: Attack logs being backwards

2015-05-16 04:41:37 -07:00

trigger.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

turf_teleport.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

wizard.dm

Explosion Rework

2015-06-20 04:13:55 -04:00