Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

area

Remove slash from end of type refs/defs

2016-11-30 19:23:15 -08:00

gamemodes

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

machinery

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

mecha

w_class now uses defines

2016-12-01 21:33:14 -08:00

objects

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

pooling

Tiles are now (mostly) pooled objects (#19112)

2016-07-08 13:32:40 -04:00

turfs

Merge pull request #21584 from RemieRichards/swarmer_boss

2016-12-01 07:47:54 -06:00

alternate_appearance.dm

Fixes some Alternate Appearance issues (#19258)

2016-07-12 10:07:49 +12:00

asteroid.dm

Make energy guns able to use burst fire. (#21005)

2016-11-02 16:16:21 +13:00

atoms_movable.dm

VV refactor

2016-11-30 12:49:21 -08:00

atoms.dm

Fixes some bugs/runtimes. Makes vv var formating use less strings.

2016-11-30 12:50:16 -08:00

communications.dm

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

data_huds.dm

Cortical Borers (#21118)

2016-11-10 09:25:41 +13:00

say.dm

Ratvarian grammar/punctuation rules are now enforced by code, automatic ratvarian is no longer just rot13 without the rules.

2016-07-19 23:25:14 +01:00

shuttle_engines.dm

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

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

skincmd.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

sound.dm

Adds sounds and visuals to the camera console

2016-11-09 18:15:32 -05:00