Commit Graph

13951 Commits

Author SHA1 Message Date
JimTheCactus
e02ccd5564 Ported blank field patch to Computer3 systems 2014-07-30 01:25:15 -06:00
Chinsky
1150331bc4 Merge pull request #5828 from mwerezak/wound-infections
Fixes chest not being coloured by necrosis
2014-07-29 18:13:02 +04:00
Chinsky
4d8db295d8 Merge pull request #5814 from JimTheCactus/polaroid
Improves Polaroid Camera Images
2014-07-29 17:57:41 +04:00
mwerezak
9680cd85b7 Fixes chest not being coloured by necrosis 2014-07-28 20:51:04 -04:00
JimTheCactus
f5df1acaaa Added handler for pixel stepping 2014-07-28 13:05:29 -06:00
JimTheCactus
6b1f696203 Ported multi-turf behavior
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)
2014-07-28 12:44:42 -06:00
JimTheCactus
f0594b6e21 Made camera render turf effects. 2014-07-28 12:10:21 -06:00
JimTheCactus
df3fcbc9b2 Ported nearest-neighbor scaling from TG 2014-07-28 11:54:01 -06:00
Mloc
f7cfe55867 Merge pull request #5816 from Loganbacca/trainfix
More train fixes
2014-07-28 12:45:00 +01:00
Loganbacca
5457cee527 More train fixes
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
2014-07-28 20:39:42 +12:00
JimTheCactus
8e4ac0a807 Modified to check every pixel
Checking only a few pixels had the tendancy to turn my charcter's head inside out when I was pointing directions other than south. Worse case is 1024 tests per object in the image. This test should be uncommon and the CPU usage is constrained by other factors.
2014-07-28 01:46:07 -06:00
JimTheCactus
bdbc404d07 Added workaround for non-directional icons with dir!=2
Several items in the map are set with a dir other than 2 but the icon associated with the item doesn't have directions. As such they misrender.

This resolves that specific issue, for the most part. Due to an odd behavior of Byond, when this circumstance occurs the icon proc produces a 32x32 image that is all alpha 0. At least that's what my testing suggests; it may be possible with large icons to encounter this as an issue and cause it to ignore an icon that should be reloaded from the default. However, this can't do any worse than the current software.
2014-07-28 01:04:52 -06:00
Zuhayr
f61139f501 Merge pull request #5811 from DJSnapshot/hotfix
Massive bugfix/improvement to 3D sounds
2014-07-28 15:45:11 +09:30
DJSnapshot
f6b75d833c now you can hear next to you in space! 2014-07-27 23:10:57 -07:00
DJSnapshot
3b5d40c470 Big nerf and cleanup of 3D sound. should fix most of #5789 2014-07-27 21:27:41 -07:00
JimTheCactus
1d7310c49d Patched display and dealt with lying. 2014-07-27 22:05:24 -06:00
Snapshot
acd290ddcf Merge pull request #5807 from PsiOmegaDelta/Muta
Fixes #5805
2014-07-27 19:13:00 -07:00
Zuhayr
da42b20039 Merge pull request #5794 from Loganbacca/cups
Cup grammar fix
2014-07-28 10:11:57 +09:30
JimTheCactus
646aad945e Merged getFlatIcon rendering from tgstation
Based on tgstation #2826. This is not all of it though.
2014-07-27 17:21:19 -06:00
PsiOmega
fc5d33917b Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 2014-07-27 23:32:36 +02:00
Loganbacca
4861c5a5d4 Grammar tweak 2014-07-28 07:38:24 +12:00
Chinsky
ed5b05772f Merge pull request #5777 from Loganbacca/trainfix
Cargo train fixes
2014-07-27 14:46:45 +04:00
Chinsky
c9d862b89a Merge pull request #5783 from Walter0o/master
fixes nullpointer caused by broken organ list reading
2014-07-27 14:46:31 +04:00
Loganbacca
fbc9b03e73 Cup fix
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
2014-07-27 20:04:45 +12:00
Chinsky
5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
JimTheCactus
0b7e858000 Changes check to an isnull rather than a truth test
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-26 16:19:14 -06:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3
Fixes #5691
2014-07-26 17:18:38 +04:00
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
Jarcolr
9e233f1597 Fixes #5691
Chef >> Chefhat
2014-07-26 13:41:43 +03: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
Jarcolr
17f86962ac Fixes #5773
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 12:50:41 +03:00
Loganbacca
99f755b986 Cargo train fixes
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler
2014-07-26 17:55:30 +12: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
JimTheCactus
b0db2ba347 Added check for blank on name entry
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-25 19:36:58 -06: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