Unknown 4e67e1b9ab Conflict Resolution

2019-03-27 04:11:30 -04:00

..

devices

Conflict Resolution

2019-03-27 04:11:30 -04:00

robot

Merges AI Branch into Master

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

stacks

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

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

weapons

Merge pull request #4620 from VOREStation/upstream-merge-5779

2019-03-27 03:40:45 -04: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

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04: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

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04: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

…