Unknown 85be5a9166 [5654] Resolves Merge Error ...

"But I wanted to play Hearts of Iron..."
"NO."

2019-03-01 23:58:05 -05:00

..

devices

Merge branch 'master' into upstream-merge-5654

2019-03-01 05:42:07 -05:00

robot

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

stacks

Merge pull request #5747 from Neerti/fulltile_window_improvements

2018-12-04 14:37:19 -05:00

weapons

[5654] Resolves Merge Error

2019-03-01 23:58:05 -05:00

antag_spawners.dm

Partially ports the GLOB system

2018-08-14 18:14:09 -05:00

apc_frame.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

blueprints.dm

…

bodybag.dm

Partially ports the GLOB system

2018-08-14 18:14:09 -05:00

contraband_vr.dm

…

contraband.dm

…

crayons.dm

…

glassjar.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

gunbox_vr.dm

…

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

Custom RIG Framework (#5613)

2018-09-30 17:50:39 -04:00

poi_items.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

shooting_range.dm

…

toys.dm

Merge pull request #5619 from SpadesNeil/toy-sounds

2018-10-02 14:20:47 -04:00

trash_vr.dm

…

trash.dm

…