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
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
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
mwerezak
e6e0c87062
Aggressive grab auto hit only applies to close targets and melee attacks
2015-03-14 01:53:11 -04:00
mwerezak
c4e4c77320
Having a neck grab on someone causes them to be hit by projectiles first instead of you.
...
If however the bullet misses or passes through the person being grabbed then it continues on and may still hit the person doing the grabbing.
2015-03-14 01:30:09 -04:00
mwerezak
812ff9869d
Implements projectile point blank damage multipliers for targets being grabbed.
2015-03-14 00:41:55 -04:00
mwerezak
6a5dd6c89e
Aggressive grabs prevent missing with weapons
2015-03-13 21:30:18 -04:00
PsiOmega
14811d35e9
Fixes #8439 .
...
Appears to be the last of the major re-occuring runtimes. Good work team.
2015-03-13 23:27:35 +01:00
PsiOmega
ac25b0a614
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-13 14:21:38 +01:00
PsiOmega
2efa9c78f0
Corrects pulling icon_states.
2015-03-13 11:02:18 +01:00
Chinsky
f03759a246
Fixes organ bioprinter and the organs. Now less debuggy and less buggy too.
2015-03-13 12:24:27 +03:00
PsiOmega
0cc60870f5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-13 09:31:03 +01:00
Zuhayr
100ffe4966
Merge pull request #8451 from comma/master
...
Fixes #8438
2015-03-13 17:19:36 +10:30
Chinsky
64a94a5043
Fixes #8438
...
Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.
2015-03-12 17:00:53 +03:00
PsiOmega
3af652fb77
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-12 10:30:16 +01:00
Mloc
d96e46bf10
fix sanitize_simple(), broken in #8008
...
fixes OOC newlines and IRC bot crashing.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-03-11 11:39:02 +00:00
Zuhayr
b5419a1673
Merge pull request #8443 from Baystation12/master
...
Master into dev-freeze.
2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6
Merge pull request #8421 from Neerti/3_9_2015-examine-text-med
...
Examine Tab Text: (Some) Medical Stuff
2015-03-11 07:28:54 +03:00
Zuhayr
a72b94e3f8
Merge pull request #8432 from PsiOmegaDelta/WanderingNano
...
Fixes #8264
2015-03-11 08:08:04 +10:30
PsiOmega
b00138aa42
Fixes #5787 .
...
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279 .
2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4
I shouldn't proofread when sleep deprived.
2015-03-10 10:55:14 -04:00
PsiOmega
373921fa44
Fixes #8264 .
...
updateUsrDialog() doesn't play well with nanoUI, forcing it to re-open and reposition on each cal.
2015-03-10 14:06:05 +01:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
d3d9e0b2ed
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 12:48:27 +01:00
