PsiOmega
bd48c76620
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786
Merge pull request #8592 from comma/maxlen
...
Readded missing check for paper editing
2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64
Readded missing check for paper editing
...
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
Zuhayr
14950a7e3a
Merge pull request #8584 from Kelenius/ofBorgsAndGlass
...
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
1908ba59e2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4
Fixed construction borg's Rglass
2015-03-23 12:11:58 +03:00
Zuhayr
a454e77444
Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
...
Fixes stray character.
2015-03-23 10:55:08 +10:30
Zuhayr
1474c6fdd1
Merge pull request #8574 from PsiOmegaDelta/AIDel
...
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
Chinsky
f4dd077d50
Merge pull request #8571 from PsiOmegaDelta/EyeFix
...
Fixes #8534 .
2015-03-22 21:47:17 +03:00
PsiOmega
767f4dd537
Deletes AI eye along with the AI.
2015-03-22 18:51:15 +01:00
PsiOmega
9286f10a35
Fixes stray character.
2015-03-22 18:45:03 +01:00
PsiOmega
f9b8c2dbc9
Fixes #8534 .
...
Sets icontype to its proper value.
2015-03-22 16:25:24 +01:00
Zuhayr
8791c2bf1e
Fixing a typo.
...
! and ~ both compile. Feh.
2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6
Vines should now respect coverage and magboots.
2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
GinjaNinja32
26d878fb02
Move closing bracket outside <i> tag
...
Opening bracket is outside. Consistency!
2015-03-21 21:08:54 +00:00
GinjaNinja32
04640eafb1
Fix issues with skill class procs
2015-03-20 22:47:51 +00:00
Chinsky
5fae54e4a8
Merge pull request #8554 from Zuhayr/dev-freeze
...
Fixes #8543
2015-03-20 17:04:23 +03:00
Zuhayr
87fe7d80f0
Merge pull request #8542 from PsiOmegaDelta/IWasFrozenToday
...
Cryopod naming fixes.
2015-03-20 21:00:07 +10:30
PsiOmega
6e2488ccb0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
Zuhayr
fb52e095d0
Fixes #8543
2015-03-20 12:37:55 +10:30
PsiOmega
3d9d05afce
Fixes #8107 .
...
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
PsiOmega
44c8b03fcd
Cryopod naming fixes.
...
Fixes issue where the cryopod name would not update if left willingly.
Fixes issue where the cryopod name would not update if forced inside.
2015-03-19 20:10:51 +01:00
Vivalas
1040ffbede
Fixes #8519
...
Gives CMO EVA access, like they should have.
2015-03-18 09:06:01 -05:00
Mandurrrh
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04:00
MrSnapwalk
9463ab028a
Adds Andrewmeythaler's custom item.
2015-03-17 22:19:13 -05:00
Zuhayr
11b1b40358
Merge pull request #8505 from PsiOmegaDelta/NanoDebug
...
Makes it possible to debug the NanoUI manager.
2015-03-18 02:52:22 +10:30
Chinsky
d3b202db4d
Merge pull request #8512 from Zuhayr/dev-freeze
...
Fixes.
2015-03-17 14:19:59 +03:00
PsiOmega
018bd4ebdd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-17 12:01:09 +01:00
Zuhayr
92f53d6b80
Fixes #8478
2015-03-17 20:08:46 +10:30
Zuhayr
033f758abd
Fixes #8477
2015-03-17 20:04:07 +10:30
Zuhayr
145b4442e5
Fixes #8388
2015-03-17 19:49:18 +10:30
Zuhayr
beaba0b88f
Fixes #8440
2015-03-17 19:35:25 +10:30
Zuhayr
b766f9efcf
Fixes #8378
2015-03-17 19:20:33 +10:30
Zuhayr
7cbe2c94fb
Fixes #8388
2015-03-17 19:19:28 +10:30
Zuhayr
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
Zuhayr
0267f156b5
Fixes #8446
2015-03-17 19:17:36 +10:30
Zuhayr
1f1fe76ec6
Fixes #8495
2015-03-17 19:16:56 +10:30
PsiOmega
db3dddfff9
Makes it possible to debug the NanoUI manager.
...
For debugging purposes.
2015-03-16 22:27:31 +01:00
PsiOmega
cfb3bad3e2
Fixes #8498 .
...
Simple animals should now die properly when killed.
2015-03-16 13:46:08 +01:00
PsiOmega
172110b582
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-16 12:37:43 +01:00
Zuhayr
7276efc48e
Merge pull request #8480 from AstatorDem/processingTheProcess
...
Added a check to process() to recognize machines that use auto_use_power
2015-03-15 12:15:50 +10:30
PsiOmegaDelta
e61494561d
Merge pull request #8460 from comma/master
...
Fixes organ bioprinter and the organs.
2015-03-15 02:43:47 +01:00
Daniel García Baldomir
2e571e5448
Pass at removing empty process() on game/machinery
2015-03-14 21:38:23 +01:00
Daniel García Baldomir
a50bebcbae
Added check for use_power in machinery.dm process
2015-03-14 21:07:55 +01:00
Daniel García Baldomir
1c67f811a7
Updated power usage of the Autholathe.
2015-03-14 20:46:41 +01:00
Daniel García Baldomir
9e464d823f
Added process to robo-fabs and teleporter.
2015-03-14 20:06:52 +01:00
Daniel García Baldomir
78798e7548
Added process on machines A to J. Changed some world iterations to machines iterations.
2015-03-14 19:45:34 +01:00
Daniel García Baldomir
8e5751a632
Bodyscanner : idle 60, active 10k
2015-03-14 19:27:36 +01:00
mwerezak
6c794a8608
Fixes damage multiplier mixup, bumped var not being reset
2015-03-14 02:56:05 -04:00
