7 Commits

Author	SHA1	Message	Date
PsiOmega	d0232732d4	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/machinery/floodlight.dm code/game/objects/items/devices/suit_cooling.dm code/modules/organs/subtypes/diona.dm code/modules/paperwork/pen.dm code/modules/reagents/reagent_containers/hypospray.dm html/changelogs/.all_changelog.yml	2015-05-30 16:11:57 +02:00
Zuhayr	c5df326533	Fixes #9414	2015-05-30 03:15:19 +09:30
Kelenius	5be2bd6a1b	Updates to properly DA materials	2015-05-23 15:21:11 +03:00
Zuhayr	a6f59edc22	Bit of documentation.	2015-05-20 14:00:14 +09:30
Zuhayr	4cd2a5a532	Updating stools/stool padding.	2015-05-17 12:53:23 +09:30
Zuhayr	ae3ad84634	Updated ashtrays and mineral doors.	2015-05-17 03:02:03 +09:30
Zuhayr	358867f3b5	Major sheet and material refactor.	2015-05-17 01:46:53 +09:30