Kyep 4d4eb16a3a fixes merge conflict

2018-06-06 16:32:31 -07:00

..

effects

fixes merge conflict

2018-06-06 16:32:31 -07:00

items

fixes merge conflict

2018-06-06 16:32:31 -07:00

random

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

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

structures

fixes merge conflict

2018-06-06 16:32:31 -07:00

buckling.dm

…

empulse.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

explosion.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

items.dm

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

obj_defense.dm

Makes Hulk Attacking Less Snowflakey

2018-05-19 02:32:34 -04:00

objs.dm

Power Cell Code Cleanup

2018-05-02 19:35:18 -04:00

structures.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00