Ccomp5950
a63f358049
Merge pull request #6272 from faerindel/dfreeze_pipe_dupe_fix
...
Fixes #6268 #6122 #6121
2014-09-04 04:18:10 -05:00
igalan
0aa6c4f38c
Fixes #6121
...
Moves HE pipes and junction dmi's to where the rest of the icon_manager dmi's are.
2014-09-04 05:02:03 +01:00
Mloc-Argent
11ba197b30
fix for contaminants not processing if air is OK otherwise
...
also a small fix for VV
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-03 19:00:00 +01:00
Zuhayr
0b6b3d8e0e
Merge pull request #6253 from mwerezak/skrell
...
Hardsuit refitting sprite sheet
2014-09-03 12:06:18 +09:30
Ccomp5950
ed9850b373
Merge pull request #6258 from mwerezak/rddesigns
...
Adds gas cooler/heater circuit designs
2014-09-02 10:06:48 -05:00
mwerezak
0675c332a1
Adds cooler/heater circuit designs
2014-09-02 08:43:51 -04:00
mwerezak
30464da6ef
Allows refitting to change worn sprite
2014-09-02 08:31:16 -04:00
Zuhayr
9f6c22d437
Reapplies LightningIron's fix for #6131
2014-09-02 10:02:37 +09:30
Zuhayr
e33280090c
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
2014-09-02 09:24:22 +09:30
Zuhayr
53bee60a27
Merge resolution.
2014-09-02 09:18:20 +09:30
Zuhayr
58a750398e
Fixes 5866#
2014-09-01 23:20:46 +09:30
Zuhayr
aedb3725f2
Fixes #5874
2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce
Fixes #5879
2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b
Fixes #6119
2014-09-01 22:41:15 +09:30
Whitellama
bdce104b6d
Improved anomaly chat message cooldowns.
2014-08-31 17:51:13 -07:00
Whitellama
628f56ce42
Nerfed celldrain/charge to a limited range and stopped anomaly effects from spamming synthetics
2014-08-31 01:48:52 -07:00
mwerezak
762a1d1f03
Increased disposal flow rate and pump power
2014-08-30 16:19:19 -04: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
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
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
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
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
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
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
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
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
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
Ccomp5950
1a51e72c1a
Merge pull request #6103 from Walter0o/water_fix
...
should fix #6099
2014-08-22 05:04:18 -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
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
mwerezak
170baf15c7
Improves rand_zone() and miss chance procs
2014-08-21 23:32:51 -04:00