Walter0o
c0b6f82ad0
emergency HTML/JS injection fix MK2, the underping.
...
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca
emergency HTML/JS injection fix.
...
sanitation of status display input was missing everywhere.
2014-08-27 14:42:58 +02:00
Zuhayr
7b366f092d
Fixes some issues with new Hydro.
2014-08-27 22:04:19 +09:30
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
Chinsky
ac6ffacec8
Merge pull request #6182 from PsiOmegaDelta/HoloAI
...
AI camera/holopad fix
2014-08-27 14:35:34 +04:00
Kilakk
0aa11b16bb
Merge remote-tracking branch 'upstream/master'
2014-08-26 21:08:13 -04:00
Kilakk
fa9d9062bd
Fixes #6163
...
* Rounded res.amount to keep the fabricator from dispensing non-integer numbers of stacks
* Added a check to prevent stacks of < 1 from being put into the fabricator
2014-08-26 21:02:06 -04:00
Chinsky
471be0eab7
Merge pull request #6171 from mwerezak/gas-entropy
...
Fixes gas entropy calculation + engine pump/injector flow imbalance issue
2014-08-27 04:24:14 +04:00
Chinsky
0d6b1aede7
Merge pull request #6170 from mwerezak/shuttle-fixes
...
Fixes shuttle ETA being given before arrive_time is set
2014-08-27 04:24:03 +04:00
Chinsky
50d7e98eb2
Merge pull request #6175 from mwerezak/master-fixes
...
Fixes #6118
2014-08-27 01:33:39 +04:00
PsiOmega
0090efb210
Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online.
2014-08-26 16:38:44 +02:00
mwerezak
cd661d9280
Adds ChessPiece's species hardsuit sprites
...
Adds ChessPiece's onmob and inventory sprites for unathi and skrell hardsuits, as well as nicer tajaran hardsuit inventory sprites to replace the current placeholder ones. Adds hardsuit spritesheet entries for unathi (skrell will come later).
2014-08-25 21:57:56 -04:00
mwerezak
9859fc0b00
Fixes #6118
2014-08-25 21:02:57 -04:00
mwerezak
54d11506d0
Allows power to be read by examining the collectors
2014-08-25 20:57:32 -04:00
GinjaNinja32
778a0fc608
Removed debug statements
2014-08-26 01:43:54 +01:00
mwerezak
9fea39dea2
Quick fix for engine core flow imbalance
...
A more thorough fix should probably involve providing a way for players
to control the flow rate.
Also tweaks emitters and allows collectors to be read using a multitool.
2014-08-25 20:37:07 -04:00
mwerezak
82a862e07e
Fixes entropy calculation
...
Fixed the entropy calculation so that it is easier to remove gas from a
hot gas mix, not harder. Added comments explaining the entropy
calculation. Also returns pump and filter efficiency to previous values.
2014-08-25 15:49:39 -04:00
Chinsky
b05f9a16ac
Merge pull request #6155 from LightningIron/master
...
Changes some messages to make more sense
2014-08-25 22:18:49 +04:00
mwerezak
f1a1162c3f
Fixes shuttle ETA given before arrive_time is set
2014-08-24 22:43:19 -04:00
GinjaNinja32
4a484d4207
Various grammar and spelling fixes in ion laws
2014-08-24 23:40:25 +01:00
LightningIron
7de4825a87
Changes some messages to make more sense
2014-08-24 14:09:39 -05:00
Chinsky
5924670ca4
Merge pull request #6148 from LightningIron/master
...
Fix for #6131 .
2014-08-24 21:46:03 +04:00
Chinsky
5fa876d9f5
Merge pull request #6144 from PsiOmegaDelta/Cryo
...
Improved cryo object-recovery
2014-08-24 21:44:45 +04:00
Ccomp5950
1cd87c0eb9
Merge pull request #6138 from mwerezak/dev-freeze-fixes
...
Dev-Freeze fixes: Heaters, Freezers, Supermatter
2014-08-24 12:37:40 -05:00
Ccomp5950
fd37cf44e3
Merge pull request #6104 from mwerezak/power-net
...
Fixes for APCs (from dev), fix for solars area, and simple APC load balancing
2014-08-24 12:26:29 -05:00
Chinsky
12d3dadc5f
Merge pull request #6112 from PsiOmegaDelta/med
...
Fixes #6106
2014-08-24 01:58:53 +04:00
Chinsky
2c73f3b2d5
Merge pull request #6107 from mwerezak/dev-fixes
...
Fixes rad suits not completely protecting against radiation
2014-08-24 01:58:26 +04:00
Chinsky
60d3dc5178
Merge pull request #6117 from PsiOmegaDelta/Camera
...
Camera names are now sanitized
2014-08-24 01:57:23 +04:00
LightningIron
89c160dfd6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-08-23 13:21:06 -05:00
mwerezak
bad772d9c5
Adjusts the supermatter reaction parameters
2014-08-23 12:35:12 -04:00
LightningIron
39182f0c8f
Fix for #6131 .
2014-08-23 11:19:15 -05:00
mwerezak
3cd0cdf27f
Fixes freezers never quite reaching their thermostat temperature
2014-08-23 10:52:57 -04:00
PsiOmega
f8aebd6853
Improved cryo object-recovery.
...
Cryo object-recovery now offers a list of items to recover, when one wish to recover a single object, instead of directly disgorging the first item it finds.
2014-08-23 15:38:31 +02:00
mwerezak
aa97002e88
Removes comment, adjusts rel_sizes
2014-08-22 22:09:23 -04:00
mwerezak
025838532a
Adjusts SM charging and output
2014-08-22 21:43:03 -04:00
mwerezak
88a2c21764
Fixes #6123
2014-08-22 21:38:53 -04:00
Hubblenaut
f6e8594a65
Hostile mobs break windows in reasonable order
2014-08-23 01:59:35 +02:00
Hubblenaut
640144a6e7
Space carp inflict damage to obstacles every 14 seconds
2014-08-23 01:59:35 +02:00
mwerezak
56068092d0
Merge remote-tracking branch 'upstream/dev-freeze' into power-net
2014-08-22 17:41:12 -04:00
PsiOmega
98cbc8f220
Camera names are now sanitized.
...
When assembled camera no longer default to names such as "The mproper Central Primary Hallway (632)" but instead "Central Primary Hallway (632)".
2014-08-22 14:16:46 +02:00
PsiOmega
6fa9ebddc2
Fixes #6106 and prevents placing a mountain of humans on the same op-table.
2014-08-22 12:14:01 +02:00
Ccomp5950
722e100195
Merge pull request #6109 from Kelenius/OfEyesAndLazers
...
Fixes wizard's mutate lazers not working
2014-08-22 05:05:33 -05:00
Ccomp5950
1a51e72c1a
Merge pull request #6103 from Walter0o/water_fix
...
should fix #6099
2014-08-22 05:04:18 -05:00
Ccomp5950
5a0abbaee4
Merge pull request #6098 from PsiOmegaDelta/Pref
...
Fixes #6038
2014-08-22 05:03:47 -05:00
Ccomp5950
d636136e61
Merge pull request #6092 from comma/master
...
Optimized pulse reagent checking a little.
2014-08-22 05:01:41 -05:00
Kelenius
d8b35de058
Fixes wizard's mutate lazers not working
2014-08-22 10:16:00 +04:00
mwerezak
ababfc1d0c
Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak
c8f2d040a1
Fix for rad suits not protecting against radiation
...
Rad suits were not providing complete protection from radiation. This is
probably not the best solution. Better solutions would be to either add
the HANDS and FEET coverage flags as done here in addition to updating
the sprite to reflect the additional coverage, or to add radiation proof
gloves and boots as part of the radiation suit set (potentially
problematic for taj and unathi engineers).
2014-08-22 01:15:17 -04:00
mwerezak
ec52bf830d
Fixes human armor value for full body effects not being weighted by body part
...
This was an issue because it meant that not having hand or feet
protection reduced the player's protection from full body effects much
more than it should have, and meant that not having your hands protected
was just as bad as not having your chest protected.
2014-08-22 01:12:07 -04:00
mwerezak
1477fe17ab
Fixes apply_effect() used without armour checks
2014-08-22 00:02:50 -04:00
