Commit Graph

17479 Commits

Author SHA1 Message Date
Ccomp5950
eaec825fbc Merge pull request #6140 from PsiOmegaDelta/atmos
Atmospherics computer now displays a sorted list of air alarms
2014-08-24 12:43:19 -05: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
6e8722de53 Merge pull request #6120 from PsiOmegaDelta/Sanity
Can again create newfeeds
2014-08-24 12:30:53 -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
PsiOmega
61d40e2405 Non-random traitor code word assignment. 2014-08-24 12:47:48 +02:00
PsiOmega
b5ff2048ab Is now possible to create a sub-list of air alarms the atmos control console will list.
Will be used to allow scientists on the outpost to remotely control their isolation cell air alarms.
2014-08-24 12:35:47 +02:00
Chinsky
12d3dadc5f Merge pull request #6112 from PsiOmegaDelta/med
Fixes #6106
2014-08-24 01:58:53 +04:00
Chinsky
58a05802c0 Merge pull request #6110 from PsiOmegaDelta/Sec
Fixes #5984 by having ED-209s now pass through each other.
2014-08-24 01:58:33 +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
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
mwerezak
3cd0cdf27f Fixes freezers never quite reaching their thermostat temperature 2014-08-23 10:52:57 -04:00
Walter0o
368f6ef744 removes duplicate handle_hud_list() 2014-08-23 16:23:23 +02:00
PsiOmega
54706d79b3 Sec-huds can now handle alt-titles. 2014-08-23 16:03:51 +02: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
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
PsiOmega
bca85c8921 Adds a brief description on how to use the department and other channels on join. 2014-08-23 12:13:49 +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
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
dfa960c55b Can again create newfeeds.
sanitizeSQL returned nothing most likely because the input more often than not is not proper SQL.
Removes the check and replaces strip_html_simple with strip_html to match all other sanitizing calls in the class.
2014-08-22 22:48:58 +02: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
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
e7385e829b Fixes #5984 by having ED-209s now pass through each other. 2014-08-22 12:31:47 +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
Ccomp5950
7db352fcc6 Merge pull request #6075 from MrSnapwalk/ertv3
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -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
mwerezak
170baf15c7 Improves rand_zone() and miss chance procs 2014-08-21 23:32:51 -04:00
Raptor1628
5a030ac82b Brig Fixes Clean
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
2014-08-21 20:58:00 -04:00
mwerezak
006c98bcdd Merge remote-tracking branch 'upstream/dev-freeze' into power-net 2014-08-21 20:25:58 -04:00
mwerezak
5d97c9d6a2 Fixes fore solars control room area
Also changes solar area requires_power and always_unpowered to match
area/space
2014-08-21 20:11:23 -04:00
mwerezak
304d88a4d4 Adds simple load balancing 2014-08-21 19:27:12 -04:00
Walter0o
1d9d9f7650 should fix #6099 2014-08-22 00:52:19 +02:00
PsiOmega
6a44883afb Fixes #6038. Adds a missing ' 2014-08-21 21:52:59 +02:00