Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

bluespaceartillery.dm

…

corpse.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

exile.dm

…

gateway.dm

Machinery: Always use update_use_power()

2020-03-23 23:21:10 -04:00

loot_vr.dm

Fixing conflicts

2020-10-05 18:10:53 -07:00

loot.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

pamphlet.dm

…

trigger.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

zlevel.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00