nemvar 00eb91eb25 Fixes ORM again. ...

Same fix as last time. Learn to properly resolve conflicts.

2019-08-06 14:09:34 +02:00

..

equipment

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

laborcamp

No ID insertion for everything except the hop console (fixes the ORM) (#45693)

2019-08-04 22:53:55 +12:00

lavaland

[READY] Floydmats (Datum materials) & custom toolboxes (#45118)

2019-07-24 11:27:01 -04:00

abandoned_crates.dm

Clothing /under repath (#45548)

2019-07-30 19:20:21 +12:00

aux_base_camera.dm

…

aux_base.dm

Adds a GPS component. (#45660)

2019-08-05 19:13:19 -07:00

fulton.dm

* "Is already...", "Can not...", "Not when..." etc.

2019-06-27 06:15:43 +03:00

machine_processing.dm

[READY] Floydmats (Datum materials) & custom toolboxes (#45118)

2019-07-24 11:27:01 -04:00

machine_redemption.dm

Fixes ORM again.

2019-08-06 14:09:34 +02:00

machine_silo.dm

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

machine_stacking.dm

…

machine_unloading.dm

…

machine_vending.dm

Remove debug message from mining vendor (#45706)

2019-08-04 10:05:33 -07:00

mine_items.dm

Clothing /under repath (#45548)

2019-07-30 19:20:21 +12:00

minebot.dm

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

mint.dm

[READY] Floydmats (Datum materials) & custom toolboxes (#45118)

2019-07-24 11:27:01 -04:00

money_bag.dm

Gets rid of the GetComponent macros (#44220)

2019-06-04 17:39:58 +02:00

ores_coins.dm

Adds parent calls to almost all tool_acts (#45582)

2019-08-03 22:25:57 -07:00

satchel_ore_boxdm.dm

…

shelters.dm

…