Desolate f7627d2fcb Resolves conflicts.

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

..

alien.dm

Vox-compatibility for Most Suits, Fixes Reactive Armour Icon Update Bug

2016-07-03 19:39:15 -04:00

armor.dm

Minor text edit.

2018-10-09 15:12:51 +02:00

bio.dm

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Vox_suits

2018-06-13 19:09:32 -08:00

hood.dm

Fix hood runtime

2018-08-01 13:05:34 +08:00

jobs.dm

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

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

labcoat.dm

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

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

miscellaneous.dm

global lists global defined

2018-10-02 15:52:46 -05:00

storage.dm

Removes All Weapons

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

utility.dm

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Vox_suits

2018-06-13 19:09:32 -08:00

wiz_robe.dm

Removes All Weapons

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