Desolate f7627d2fcb Resolves conflicts.

2018-10-11 05:36:22 -05:00

..

area_teleport.dm

Review changes

2017-01-27 17:46:38 +01:00

bloodcrawl.dm

Hopefully final magic fixes, and fixes the possessor

2016-10-25 23:32:35 +02:00

charge.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

cluwne.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

conjure.dm

Merge branch 'master' into findnreplace

2017-03-09 17:32:42 +01:00

construct_spells.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

dumbfire.dm

Hopefully final magic fixes, and fixes the possessor

2016-10-25 23:32:35 +02:00

emplosion.dm

EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged.

2018-05-23 18:33:12 +08:00

ethereal_jaunt.dm

Ports over Timer Subsystem

2018-04-28 20:26:04 -04:00

explosion.dm

Fix spells, shadow/Diona QoL improvements (HUD icons)

2016-10-25 18:11:09 +02:00

fake_gib.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

genetic.dm

Fix spells, shadow/Diona QoL improvements (HUD icons)

2016-10-25 18:11:09 +02:00

horsemask.dm

Review changes

2017-01-27 17:46:38 +01:00

infinite_guns.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

inflict_handler.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2016-12-23 19:32:19 +01:00

knock.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

lichdom.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

lightning.dm

Spacing fixes

2017-04-11 20:49:18 -04:00

magnet.dm

Spacing fixes

2017-04-11 20:49:18 -04:00

mime.dm

Them

2018-05-25 18:34:28 -07:00

mind_transfer.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

projectile.dm

Hopefully final magic fixes, and fixes the possessor

2016-10-25 23:32:35 +02:00

rathens.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

rod_form.dm

Rod form is now half-speed, and has a warning sound

2017-03-22 10:30:24 -07:00

shapeshift.dm

Tiger's comments

2017-01-22 19:15:26 +01:00

summonitem.dm

Fixed it + handled the moving of disposal units

2018-10-03 22:01:49 +02:00

touch_attacks.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

trigger.dm

Hopefully final magic fixes, and fixes the possessor

2016-10-25 23:32:35 +02:00

turf_teleport.dm

Review changes

2017-01-27 17:46:38 +01:00

wizard.dm

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00