kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

effects

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

items

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

structures

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

buckling.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

empulse.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

explosion.dm

Explosion flame_range now defaults to light range instead of zero

2017-05-13 18:00:49 -05:00

items.dm

Vending machines are more dangerous when throwing items

2017-05-18 16:37:18 -05:00

obj_defense.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

objs.dm

Moves languages to a holder datum, gives mind its own language holder

2017-05-05 08:13:04 -05:00

radiation.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

structures.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

weapons.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00