Zuhayr
63da854471
Merge pull request #5659 from mwerezak/op-hideout
...
Maps the new op hideout into an asteroid base
2014-07-17 23:56:00 +09:30
Zuhayr
55021687d2
Merge pull request #5661 from PsiOmegaDelta/Soap
...
Deluxe soap now has a more pleasant range of smells.
2014-07-17 23:55:51 +09:30
Zuhayr
3999c0bfb5
Fixed runtime with host bioscan, added verb cooldowns.
2014-07-17 23:31:12 +09:30
Zuhayr
1345ee5a5c
Initial commit for mobile pAIs. Almost guaranteed to be broken as shit.
2014-07-17 23:09:47 +09:30
Mark Aherne
26e0c64801
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 13:48:52 +01:00
Chinsky
9e0569cfb9
Merge pull request #5631 from PsiOmegaDelta/Engine
...
Remote-controlled emitters
2014-07-17 15:42:03 +04:00
Chinsky
248affdebe
Merge pull request #5656 from mwerezak/wound-infections
...
Infection system tweaks
2014-07-17 15:39:16 +04:00
Chinsky
e2e944dc66
Merge pull request #5655 from Walter0o/patch-2
...
should fix #5618 , trivial kitchen utensil bug
2014-07-17 15:38:42 +04:00
Chinsky
543ab8acc3
Merge pull request #5653 from atlantiscze/tcomms-fix
...
TComms heat fix + repairing
2014-07-17 15:37:52 +04:00
Zuhayr
ea8cdb52c7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:59:45 +09:30
Zuhayr
3976433396
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:57:06 +09:30
PsiOmega
d2cdf01a60
Deluxe soap now has a more pleasant range of smells.
2014-07-17 12:54:51 +02:00
PsiOmega
dfcf25ce49
Allows the AI to state laws over the holopad. Modifies say-code to return true on success.
...
Say-code updated to return true on success.
This allows for quitting early when stating laws without having to duplicating the checks made in the say-code.
2014-07-17 12:43:41 +02:00
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
