Commit Graph

10420 Commits

Author SHA1 Message Date
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr
fb52e095d0 Fixes #8543 2015-03-20 12:37:55 +10:30
MrSnapwalk
9463ab028a Adds Andrewmeythaler's custom item. 2015-03-17 22:19:13 -05:00
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
0267f156b5 Fixes #8446 2015-03-17 19:17:36 +10:30
Zuhayr
1f1fe76ec6 Fixes #8495 2015-03-17 19:16:56 +10:30
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
PsiOmegaDelta
e61494561d Merge pull request #8460 from comma/master
Fixes organ bioprinter and the organs.
2015-03-15 02:43:47 +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
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
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
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
PsiOmegaDelta
ff11ae9d54 Merge pull request #8426 from mwerezak/misc
Penetrating bullets are now more likely to go through glass doors
2015-03-10 09:26:11 +01:00
PsiOmega
a86c16b3e3 Fixes hydroponics update_icon() runtime.
Rounding could cause plant maturation to have a value of 0.
2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd Penetrating bullets are now more likely to go through glass doors 2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 07:58:25 +01:00
PsiOmegaDelta
56516d1ec5 Merge pull request #8419 from mwerezak/blazer
Adds custom item for Von2531
2015-03-10 07:11:18 +01:00
Neerti
be0971e690 Adds sabiram's help text to the game. 2015-03-09 23:19:15 -04:00
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix
Examine fix
2015-03-10 09:30:51 +10:30
mwerezak
1150902c9f Adds custom item for Von2531
Blue blazer loadout item
2015-03-09 16:57:10 -04:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack
More tweaks
2015-03-09 23:28:15 +03:00
mwerezak
645910947b Adds orderable flaregun crate
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
mwerezak
91d7dd7049 Adjusts item_state placeholders
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
Chinsky
ec9511c943 Merge pull request #8402 from PsiOmegaDelta/RemoteAir
Fixes various alarm issues.
2015-03-09 22:07:02 +03:00
PsiOmegaDelta
b09606d85c Merge pull request #8415 from mwerezak/runtimes
More runtime fixes
2015-03-09 17:51:59 +01:00
mwerezak
188c4491c7 Fixes xenoarch runtime 2015-03-09 12:20:08 -04:00
mwerezak
e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
mwerezak
385ff4f2fa Examine tab modularity
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
6bfa4ef3d5 Fixes AI freelook runtime 2015-03-09 11:59:02 -04:00