Walter0o
df6ac58d84
fixes nullpointer caused by broken organ list pt 2
...
more a prevention than a fix, but meh
2014-07-26 13:08:25 +02:00
Walter0o
23811e7e5c
fixes nullpointer caused by broken organ list
...
the mysterious broken list bug has struck again
2014-07-26 11:54:32 +02:00
DJSnapshot
d4ce124fe0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix
2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77
fixes admin show-skills verb.
2014-07-25 19:34:13 -07:00
DJSnapshot
de282a4e2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
DJSnapshot
a4fc2b04a2
fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work)
2014-07-25 16:56:56 -07:00
Chinsky
f33e11383b
Merge pull request #5751 from DJSnapshot/hotfix
...
Bug Fixes!
2014-07-26 03:28:54 +04:00
DJSnapshot
ec238be981
Revert and fix for e-nets.
2014-07-25 16:23:26 -07:00
Chinsky
2e043adb48
Merge pull request #5758 from Kelenius/OfVotesAndPlayers
...
Adds amount of required players to gamemode vote.
2014-07-26 00:23:00 +04:00
Zuhayr
b32bbf8d2c
Merge pull request #5741 from mwerezak/wound-infections
...
Attempts to prevent ninja infections, body temperature fix, icon fix
2014-07-26 01:30:12 +09:30
Zuhayr
005ac89aad
Tweaks to previous commit.
2014-07-25 23:41:41 +09:30
Zuhayr
19cfe8940c
Added table layout to vote form.
2014-07-25 23:32:05 +09:30
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
Zuhayr
99909e3aba
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-25 22:47:57 +09:30
Kelenius
a7748c8542
Adds amount of required players to gamemode vote.
2014-07-25 17:05:15 +04:00
Chinsky
8884310b8c
Merge pull request #5753 from Loganbacca/trainmerge
...
Cargo Trains
2014-07-25 13:05:55 +04:00
DJSnapshot
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
Loganbacca
31fe0d5e34
Cargo train fixes
...
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
2014-07-24 20:14:58 +12:00
Chinsky
4c4aa7b52b
Merge pull request #5749 from Ccomp5950/languages_fix
...
Added . and # prefix to language keys checks (like radios)
2014-07-24 10:48:40 +04:00
Loganbacca
1b1e4bc118
Cargo train update
...
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
2014-07-24 18:01:10 +12:00
Zuhayr
f2f9a5afc4
Removes the flying baton of justice.
2014-07-24 15:21:57 +09:30
DJSnapshot
bb336b7691
temporary fix for #4907
2014-07-23 21:48:32 -07:00
DJSnapshot
75c1a4bac3
Disabling E-nets after admin discussion.
2014-07-23 21:26:12 -07:00
DJSnapshot
25bd9c3187
fixes #4961
2014-07-23 21:12:03 -07:00
DJSnapshot
f8d478fcbb
Updates to gun targeting UI. Fixes #5710
2014-07-23 20:51:58 -07:00
Ccomp5950
2acf93215b
Added . and # prefix to language keys checks (like radios)
...
Fixes #5748
2014-07-23 21:58:50 -05:00
mwerezak
78e4e259db
Fixes icons not being updated for necrosis
2014-07-23 22:41:52 -04:00
mwerezak
d9f70c2fd2
Adjusts the rate that infections deal toxin damage
2014-07-23 22:35:04 -04:00
mwerezak
60c6a2ea92
Fixes fever temperature not being reached
2014-07-23 22:34:04 -04:00
Zuhayr
61d38a3e86
Merge pull request #5740 from Ccomp5950/taser_slow_down
...
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4
Compromise on speach_sound, will check distance instead of just checking if ghost.
2014-07-23 01:48:48 -05:00
Ccomp5950
569e8361dc
Crew Monitor will no longer show "weird characters"
...
It has been talked to and feels very sorry for it's actions.
Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.
2014-07-22 20:21:22 -05:00
Ccomp5950
477d32ff64
Ghosts will no longer hear clientless mobs random talking unless they are in view.
...
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
2014-07-22 19:33:56 -05:00
Ccomp5950
75803c5140
Positronic brains (and every other mob) using binary chat will no longer send their messages twice.
...
Fixes : #5444
2014-07-22 19:32:52 -05:00
Ccomp5950
e01e081cbb
screen_shake (meteors, etc.) made more robust and works with aiEyes
...
Before: multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.
Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.
Test: Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.
Yay.
2014-07-22 19:05:04 -05:00
Ccomp5950
11ab2ec412
Chem Master won't resize it's window by adding a scroll bar on selection.
...
Fixes #5574
2014-07-22 18:33:54 -05:00
Mloc
a9bd931345
Merge pull request #5734 from Walter0o/borer_hotfix
...
borer mindcontrol release hotfix
2014-07-22 18:50:59 +01:00
Zuhayr
5feb5b8a93
Merge pull request #5726 from Ccomp5950/fix_antagHUD_mutiny
...
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-23 00:27:08 +09:30
Walter0o
a274cd7326
borer mindcontrol release hotfix
...
forgot to remove this remnant ckey check
2014-07-22 16:49:09 +02:00
Chinsky
1bab1d4a31
Merge pull request #5722 from Zuhayr/crossbows
...
Crossbow/pneumatic cannon cleanup.
2014-07-22 10:56:51 +04:00
Chinsky
3668cc5b1d
Merge pull request #5718 from Walter0o/double_sleep
...
fixes issue #5717
2014-07-22 10:56:45 +04:00
Chinsky
f51c377626
Merge pull request #5713 from Hubblenaut/master
...
Economy and Engineering Access Fixes
2014-07-22 10:56:39 +04:00
Ccomp5950
e942ca258f
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-21 15:36:08 -05:00
Hubblenaut
c2f1a23e3e
Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping
2014-07-21 12:08:51 +02:00
Hubblenaut
52c0d83a2c
Cans now actually make use of the new 4x4 grid
2014-07-21 12:08:50 +02:00
Hubblenaut
2151e279cc
Fixes Runtime Error, doesn't query for PIN on lowest account security level
2014-07-21 12:08:50 +02:00
Zuhayr
d02e370830
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
2014-07-21 19:02:38 +09:30
Zuhayr
811fc5f65f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-21 16:30:01 +09:30
Zuhayr
1ba147d9da
Cleaning up the previous commit a little.
2014-07-21 16:22:19 +09:30
