Commit Graph

14633 Commits

Author SHA1 Message Date
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
mwerezak
46533d299c Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net 2014-07-16 16:17:26 -04:00
mwerezak
5ca36fcadb Merge branch 'dev' into power-net
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
2014-07-16 16:14:52 -04:00
mwerezak
1eee72d118 Updates body scanner readout for internal organs 2014-07-16 15:59:18 -04:00
mwerezak
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04:00
mwerezak
d6a070e6fc Improved full body scanner infection readout
Now provides a higher level of precision on infection severity.
2014-07-16 15:44:16 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Atlantiscze
bfe6d719f3 Adds Walter0o's suggestion 2014-07-16 17:32:53 +02:00
PsiOmega
7f16a35265 Adds the binary channel as a potential statement target. 2014-07-16 16:45:48 +02:00
PsiOmega
f8ff7a5510 Allows the AI to select which channel to state laws on. 2014-07-16 16:02:10 +02:00
Mloc
3d7fac2555 Merge pull request #5628 from Zuhayr/master
Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.
2014-07-16 14:39:38 +01:00
Atlantiscze
4e588c6602 Better version, less copypaste code. 2014-07-16 15:25:30 +02:00
Walter0o
8baf6e4661 another missing battery check 2014-07-16 15:20:23 +02:00
Walter0o
9d3a87115a missing power check
people could still use this without any charge
2014-07-16 15:13:13 +02:00
atlantiscze
4f2b47e57b Update telecomunications.dm
bad characters fix
2014-07-16 15:11:16 +02:00
Atlantiscze
21397d0ac7 Adds ability to repair TCommsat machinery without having to dismantle the machines and rebuild them from scratch. Applying nanopaste will restore 10-20 integrity points. 2014-07-16 14:54:18 +02:00
Atlantiscze
56ef90a0fb Fix for issue which caused telecomms machinery to take no damage when temperature was 70C. Now it adds damage according to temperature. Higher temperature will cause the machinery to fail faster. 2014-07-16 14:52:48 +02:00
Chinsky
4c4c248a72 Merge pull request #5623 from Decius-R/aeneas_labcoat_edit
Changes labcoat sprite to be closed on custom item...
2014-07-16 16:23:43 +04:00
Chinsky
61f8713941 Possible fix for #5645
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
2014-07-16 16:22:26 +04:00
Chinsky
5018330a5a Fixes #5650
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
2014-07-16 14:37:12 +04:00
Loganbacca
d97ea2230d Merge remote-tracking branch 'remotes/upstream/dev' into atmosmerge 2014-07-16 22:25:28 +12:00
Mark Aherne
75e2a703b0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 11:20:39 +01:00
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Chinsky
d1687dc50e Fixes #5648
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.
2014-07-16 13:39:56 +04:00
Loganbacca
0dd2397ef7 Atmos update tweaks
- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
2014-07-16 21:37:43 +12:00
Loganbacca
35f75ce805 Merge remote-tracking branch 'remotes/upstream/dev' into atmosmerge 2014-07-16 21:36:41 +12:00
Chinsky
561eb99561 Fixes #5647 Fixes #5646 2014-07-16 13:26:13 +04:00
Chinsky
bd080c237f Merge pull request #5641 from JimTheCactus/limb_sparks_fix
Fixes #5640 Make sparks effect target mob, not organ
2014-07-16 13:03:14 +04:00
Chinsky
d04433aa87 Merge pull request #5626 from mwerezak/damage-fixes
A few damage and defence related fixes
2014-07-16 12:19:29 +04:00
Chinsky
47a61c66a7 Merge pull request #5629 from mwerezak/throwing
Fixes #5586
2014-07-16 12:19:15 +04:00
Chinsky
a7379f925a Merge pull request #5634 from Whitellama/master
Made LOOC show character names of living players, fixing #5633
2014-07-16 12:18:49 +04:00
Chinsky
857cbe23bf Merge pull request #5635 from mwerezak/air-alarm-fix
Fixes air alarms not updating icons, fixes siphoning or cycling being stopped even though environmental mode is set
2014-07-16 12:17:52 +04:00
Zuhayr
9fe00c09a6 Merge pull request #5625 from JimTheCactus/med_records_fix
Corrects Issue With Record Entries Containing All Whitespace (#5538)
2014-07-16 15:32:29 +09:30
mwerezak
3c65c7dda4 Vent pumps now draw power 2014-07-16 00:47:38 -04:00
mwerezak
ec676896bc Some gas pump cleanup 2014-07-16 00:45:38 -04:00
JimTheCactus
ff382bb231 Fixes #5640 Make sparks effect target mob, not organ
The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner.
2014-07-15 20:34:08 -06:00
mwerezak
aeb3537ae4 Improves update_use_power() proc
Now no longer misses power usage on the tick that it is called
2014-07-15 20:35:10 -04:00
mwerezak
1011800d78 Updates gas heaters
Gas heaters now draw power.
Removed the heat_resevoir base type because it was dumb and unused.
Adds a circuit board for gas heaters.
2014-07-15 20:34:48 -04:00
mwerezak
f207888316 Replaces the volume gas pump 2014-07-15 19:31:02 -04:00
Atlantiscze
db18074f90 Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard.
AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again,
even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all
AI cores/intellicards/etc. This does not stop AI from using intercom, however.

 Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260
2014-07-16 00:54:54 +02:00
mwerezak
a4bef09a69 Fixes air alarm icons not updating
I'm not sure how I missed that the first time.
2014-07-15 18:27:15 -04:00
mwerezak
c469b188ee Fixes air alarms not siphoning or cycling 2014-07-15 16:35:03 -04:00
Whitellama
8ec8c615e4 Made it so admins see global LOOC character names/BYOND keys based on whether that player is alive/dead 2014-07-15 13:33:52 -07:00
mwerezak
90f7029f4e Adjusts the volume change in space
Did some playtesting with energy guns and revolvers in space.
2014-07-15 16:26:05 -04:00
Whitellama
866a486ad6 Made LOOC show character names of living players and BYOND keys of observing/dead players 2014-07-15 12:55:21 -07:00
PsiOmega
08e13c7d46 Merge branch 'dev' into Engine 2014-07-15 21:31:53 +02:00
mwerezak
005c6589c2 Limits hearing sounds in a vacuum 2014-07-15 15:30:10 -04:00
PsiOmega
0bb878d198 Makes it possible to activate emitters using control buttons. 2014-07-15 21:16:27 +02:00