PsiOmegaDelta c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney ...

Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm

2015-08-13 08:06:11 +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' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

images

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

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

templates

Updated old wiki link to a new one.

2015-08-11 17:20:55 +03:00

88x31.png

- Fixed Issue 185

2011-10-21 02:49:37 +00:00

archivedchangelog.html

Changelog updated and archived.

2013-05-25 22:15:42 +01:00

bug-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

burn-exclamation.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

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-08-12 21:18:18 +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

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

chevron.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

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

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

hard-hat-exclamation.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

image-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

image-plus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

map-pencil.png

Map tweaks now have their own changelog icon.

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

music-minus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

music-plus.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

panels.css

Removed the infra_sensor define for noddie.

2012-11-15 20:35:37 +00:00

search.js

Removed the infra_sensor define for noddie.

2012-11-15 20:35:37 +00:00

spell-check.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

tick-circle.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00

wrench-screwdriver.png

Changelog changes! Instructions on how to update it will be soon.

2012-04-30 18:41:01 +01:00