Joan Lung 4e0a3deb73 github is being kind of weird about these conflicts

2016-10-12 10:00:45 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

__HELPERS

Fixes antag spawners (#20882)

2016-10-12 09:53:47 +13:00

__PATH_COMPATIBILITY

…

_globalvars

modified: _maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm

2016-09-30 20:00:39 -04:00

_onclick

Fixes spacevines being immune to melee attack (typo). (#20907)

2016-10-12 09:01:03 +13:00

controllers

Fixes motion alarms (#20899)

2016-10-12 15:52:49 +13:00

datums

Fixes motion alarms (#20899)

2016-10-12 15:52:49 +13:00

game

github is being kind of weird about these conflicts

2016-10-12 10:00:45 -04:00

js

…

modules

github is being kind of weird about these conflicts

2016-10-12 10:00:45 -04:00

orphaned_procs

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

_compile_options.dm

Ups the player and station name length limits (#20073)

2016-08-26 16:43:56 +12:00

world.dm

Fixes hub not taking effect in certain edge cases.

2016-10-10 11:11:45 -07:00