PsiOmegaDelta
|
df83203356
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
|
2015-07-09 08:45:49 +02:00 |
|
Zuhayr
|
550ea5f127
|
Fixes #9740
|
2015-07-09 03:40:26 +09:30 |
|
Zuhayr
|
76571bf758
|
Fixes #9646
|
2015-07-09 03:29:24 +09:30 |
|
Zuhayr
|
062f06ecb9
|
Fixes #9835
|
2015-06-20 21:00:02 +09:30 |
|
PsiOmegaDelta
|
06a1ece4b8
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
|
2015-06-16 10:52:33 +02:00 |
|
Zuhayr
|
f9134028b6
|
Fixes #9777
|
2015-06-10 23:14:34 +09:30 |
|
PsiOmega
|
fc6de24042
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
|
2015-06-07 10:51:41 +02:00 |
|
Zuhayr
|
f03fc826f1
|
Fixes #9597
|
2015-06-06 11:20:56 +09:30 |
|
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 |
|