Commit Graph

10842 Commits

Author SHA1 Message Date
Whitellama
c6ae920eda Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger) 2014-08-27 13:06:20 -07:00
Zuhayr
7b366f092d Fixes some issues with new Hydro. 2014-08-27 22:04:19 +09:30
Zuhayr
ddf860fb13 Update preferences.dm
Fixing a merge error.
2014-08-27 20:56:05 +09:30
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +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
Chinsky
eab2ef935b Fixed copypaste derp resulting in runtime when you are naked sans gloves. 2014-08-27 03:41:11 +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
Chinsky
f40298715f Merge pull request #6153 from PsiOmegaDelta/AtmosList
Central Atmospherics Computer - Air alarm sub-list
2014-08-26 15:25:59 +04:00
Chinsky
1c2cc138d6 Merge pull request #6168 from Kelenius/OfCablesAndStacks
Cables are now stacks
2014-08-26 15:25:31 +04: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
PsiOmega
2786c8e8b9 Remote air alarm control for the isolation cells now available on the outpost. 2014-08-25 23:24:35 +02: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
Chinsky
124217fab9 Merge pull request #6134 from PsiOmegaDelta/Construction
Fixes #6130
2014-08-25 22:12:28 +04:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +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
7d18ddfab1 Merge pull request #6146 from PsiOmegaDelta/Dylovene
Renames anti-toxin bottles to dylovene.
2014-08-24 21:45:00 +04:00
Chinsky
bd3544be7b Merge pull request #6145 from Walter0o/hud_update_fix
removes duplicate handle_hud_list()
2014-08-24 21:44:49 +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
PsiOmega
f19001feb8 Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific.
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
2014-08-23 17:22:04 +02:00
Walter0o
368f6ef744 removes duplicate handle_hud_list() 2014-08-23 16:23:23 +02:00
PsiOmega
d8b803d5e3 Fixes #6130
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
2014-08-23 10:20:24 +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
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
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
Hubblenaut
f92b31c1c5 Hazardly low pressure induces OxyLoss up to 55 points 2014-08-22 14:49:08 +02: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
Ccomp5950
7db352fcc6 Merge pull request #6075 from MrSnapwalk/ertv3
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -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