Kyep 1b6b1deecc fixes merge conflict in custom_grenades.dm

2018-04-01 18:59:25 -07:00

..

__DEFINES

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

__HELPERS

recursive checking for putting objects inside slicable foods

2018-03-26 20:19:11 +01:00

_DATASTRUCTURES

…

_globalvars

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

_onclick

spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos

2018-03-05 02:07:31 +05:00

ATMOSPHERICS

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

controllers

Merge pull request #8616 from Tayyyyyyy/shuttle_cheese

2018-04-01 18:48:31 -07:00

datums

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

defines

…

game

fixes merge conflict in custom_grenades.dm

2018-04-01 18:59:25 -07:00

js

…

LINDA

Remove stun

2018-03-25 22:47:12 -04:00

modules

fixes merge conflict in custom_grenades.dm

2018-04-01 18:59:25 -07:00

_compile_options.dm

…

hub.dm

…

world.dm

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00