Incoming 69aea446a3 Fixes conflicts ...

Adds handling for canister teleportation shinanagans
Refactors nozzles slightly so they act properly if someone manages to swipe the tank without it ever touching the floor

2015-01-03 17:15:08 -05:00

..

area_teleport.dm

Fixes wizard slipping on all the area soaps

2014-11-22 19:24:57 -03:00

charge.dm

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

2014-03-26 13:03:12 -04:00

conjure.dm

Allow casting conjuration spells like forcewall when stunned.

2014-11-17 21:21:01 -08:00

construct_spells.dm

Allow casting conjuration spells like forcewall when stunned.

2014-11-17 21:21:01 -08:00

dumbfire.dm

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

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

emplosion.dm

…

ethereal_jaunt.dm

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

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

explosion.dm

…

genetic.dm

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00

horsemask.dm

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

2014-03-02 21:39:27 -08:00

inflict_handler.dm

Make ei nath not destroy brains

2014-03-26 08:38:26 -07:00

knock.dm

…

mime.dm

Changelings can use hivechat while muzzled.

2014-06-17 00:13:56 -04:00

mind_transfer.dm

Summon Events Initial Commit: See the pull for complete details

2014-08-21 20:05:41 -04:00

projectile.dm

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

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

santa.dm

Adds a santa event where a dead player is spawned as Santa! HO HO HO!

2014-12-08 17:03:52 +01:00

summonitem.dm

Fixes conflicts

2015-01-03 17:15:08 -05:00

trigger.dm

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

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

turf_teleport.dm

Changed blink to only spawn a single static smoke cloud.

2014-01-05 20:41:06 +00:00

wizard.dm

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00