Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

closets

…

effects

Added spawnpoint datum, moved existing latejoin spawn to datum setup.

2014-06-24 13:33:48 +09:30

items

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-06-30 23:44:46 +01:00

random

…

structures

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-06-30 23:44:46 +01:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Merge pull request #4968 from MrLeebo/mutiny

2014-05-28 00:13:42 -05:00

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.

2014-06-29 09:40:37 +09:30

weapons.dm

…