PsiOmega cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +02:00

..

browser

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

2014-06-22 03:31:06 -07:00

changelogs

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

2015-07-06 18:33:09 +02:00

images

Moves us to the changelog system used by /vg/, /tg/, and others.

2015-04-18 13:00:28 +02:00

templates

Corrects AGPL link text (target link was correct however).

2015-04-29 14:41:57 +02:00

88x31.png

…

archivedchangelog.html

…

bug-minus.png

…

burn-exclamation.png

…

changelog.css

Map tweaks now have their own changelog icon.

2015-05-06 11:24:35 +02:00

changelog.html

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

2015-07-06 18:33:09 +02:00

changelog.js

Moves us to the changelog system used by /vg/, /tg/, and others.

2015-04-18 13:00:28 +02:00

chevron-expand.png

…

chevron.png

…

create_object.html

Moves us to the changelog system used by /vg/, /tg/, and others.

2015-04-18 13:00:28 +02:00

cross-circle.png

…

hard-hat-exclamation.png

…

image-minus.png

…

image-plus.png

…

map-pencil.png

Map tweaks now have their own changelog icon.

2015-05-06 11:24:35 +02:00

music-minus.png

…

music-plus.png

…

panels.css

…

search.js

…

spell-check.png

…

tick-circle.png

…

wrench-screwdriver.png

…