PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml

2015-10-11 17:37:01 +02:00

..

effects

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

2015-10-11 17:37:01 +02:00

items

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

2015-10-11 17:37:01 +02:00

random

…

structures

Updates blob

2015-10-05 18:10:16 +03:00

buckling.dm

Fixes beds occasionally buckling in odd directions

2015-09-19 15:27:24 +02:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Updates blob

2015-10-05 18:10:16 +03:00

objs.dm

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

structures.dm

Updates blob

2015-10-05 18:10:16 +03:00

weapons.dm

…