Commit Graph

8542 Commits

Author SHA1 Message Date
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
PsiOmega
63ab44accc Makes it possible for the AI to take and view images. 2014-07-28 17:30:51 +02:00
Zuhayr
7f6b36e1dc Fixes some transposed values. 2014-07-29 00:25:46 +09:30
Zuhayr
f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
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
JimTheCactus
1d7310c49d Patched display and dealt with lying. 2014-07-27 22:05:24 -06:00
Zuhayr
da42b20039 Merge pull request #5794 from Loganbacca/cups
Cup grammar fix
2014-07-28 10:11:57 +09:30
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
mwerezak
5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
mwerezak
cd1ed034a8 Adds power net profiling verbs 2014-07-27 19:59:02 -04:00
Loganbacca
4861c5a5d4 Grammar tweak 2014-07-28 07:38:24 +12:00
Mloc
d6caf74e56 Merge pull request #5769 from comma/dev
Enables logging of people beating monkey
2014-07-27 12:02:26 +01: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
mwerezak
83d54af746 Adjusts power usage for R&D equipment 2014-07-27 03:36:28 -04:00
mwerezak
cb413454a3 Optimizes atmos machine power updates
Makes power usage but atmos machinery less accurate but reduces lag
somewhat.
2014-07-27 03:35:25 -04:00
Whitellama
0a0c18dbf6 Fixed issue with flavour text saving/loading from other characters 2014-07-26 18:50:34 -07: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
Whitellama
eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
Whitellama
425dfd2a6e Fixed issue with recognizing covered jumpsuit and gloves 2014-07-26 17:07:34 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07: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
mwerezak
5f9f6e2054 Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-26 13:56:52 -04:00
Zuhayr
e5eb9cc496 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:24:27 +09:30
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
976cb4f844 Fixed seeds not showing up properly in the vendor. 2014-07-27 03:19:43 +09:30
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3
Fixes #5691
2014-07-26 17:18:38 +04: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
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
5a108b2d05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:40:28 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
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
Chinsky
1e1d5a6d01 Enables logging of people beating monkey.
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix
Bug Fixes!
2014-07-26 03:28:54 +04:00
Zuhayr
69b397b5c4 Compile fix. 2014-07-26 01:42:05 +09:30