Commit Graph

14717 Commits

Author SHA1 Message Date
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
Chinsky
e803c90aec Optimized pulse reagent checking a little. 2014-08-21 13:40:59 +04:00
mwerezak
f2b234fe81 Fixes APCs drawing more power than they can to use to charge 2014-08-21 01:18:26 -04:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
mwerezak
10f95933dd Fixes power draw not being processed if no power was available
Should address some of the issues raised in Pull Request #6080
2014-08-20 21:54:27 -04:00
Zuhayr
0397ce5f1a Merge pull request #6076 from Jarcolr/patch-1
Fixes #5943
2014-08-21 11:19:30 +09:30
igalan
d4be0bfc87 Removed pure laziness comment line 2014-08-21 02:46:18 +01:00
igalan
031d5070fc Cleans up chem dispenser code by taking out the unused broken_on_spawn var. And frankly, if we wanted that feature, it would be done in other way. 2014-08-21 01:02:54 +01:00
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
Chinsky
ec791bd81c Merge pull request #6068 from faerindel/vending_exploit_fix
Fixes #6054
2014-08-21 01:36:21 +04:00
Jarcolr
c481d035f5 Fixes #5943
Recharging should give rods.
2014-08-20 11:14:54 +03:00
Chinsky
6cc4280c48 Merge pull request #5990 from Hubblenaut/dev
Fixes phoron reactions
2014-08-20 00:19:34 +04:00
PsiOmega
a2253617cf Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration. 2014-08-19 21:09:14 +02:00
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping
Fixes #6027
2014-08-19 12:01:14 -05:00
igalan
322c5b53f2 Fixes #6054 2014-08-19 17:50:55 +01:00
Walter0o
eb7c2aa9c5 should fix #6065 2014-08-19 17:26:10 +02:00
Zuhayr
677ac1f7bb Merge pull request #6051 from comma/detcomp
Initial commit of detective console rewrite.
2014-08-19 21:46:52 +09:30
Ccomp5950
264aee843f Merge pull request #6063 from Whitellama/master
Fixed eggs not going back into egg boxes
2014-08-19 06:23:57 -05:00
Ccomp5950
8691d36ea1 Merge pull request #6062 from PsiOmegaDelta/Walls
Optimization - Walls deletion
2014-08-19 06:22:31 -05:00
Ccomp5950
3c19520df2 Merge pull request #6059 from mwerezak/power-net
Fixes APCs eating up all the power even when fully charged
2014-08-19 06:02:34 -05:00
Ccomp5950
cf2be93916 Merge pull request #6056 from mwerezak/dev-fixes
Fixes firedoors not opening
2014-08-19 06:02:08 -05:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Ccomp5950
3c9fa8ba61 Merge pull request #6050 from mwerezak/breathing
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
Whitellama
26721cf0d5 Fixed eggs not going back into egg boxes 2014-08-19 02:44:58 -07:00
PsiOmega
b3cd08068a Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos. 2014-08-19 10:50:17 +02:00
mwerezak
c42d9171d6 Makes power monitor a power machine again
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f Fixes APCs eating up all the power even when fully charged 2014-08-19 01:14:18 -04:00
mwerezak
f6f7c82e2a Fixes firedoors not opening 2014-08-18 22:53:43 -04:00
mwerezak
65bb47b7ec Setting computer vars on de/construction 2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0 Removes more unused vars from circuitboards 2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700 Makes power monitor computers actual computers
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
2014-08-18 18:27:51 -04:00
Chinsky
b43759fee9 Initial commit of detective console rewrite.
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
2014-08-19 00:50:14 +04:00
PsiOmega
11ce777d9c Fixes #6027
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
mwerezak
f9b4a78405 Fixes exhaling/inhaling types, cleanup 2014-08-18 14:58:18 -04:00
mwerezak
b04ac56d45 Cleanup/adjustment of inhale_pp handling 2014-08-18 13:33:51 -04:00
Walter0o
2bb22e5ddb fixes #6023 and cleans up mechbay.dm
- adds tile update on attackby() to fix #6023 using a so far dormant icon state ( line 49 )
- adds missing console initalization on attack_hand() ( line 189 )
- comments unreachable ( via normal means ) mech_bay_power_console/Topic ( line 225 )
- gets rid of relative paths, leaving procs unchanged
note : recharge-floors currently don't care about what direction the console is, unlike the charger-port which always has to be west of the floor.
this should be probably changed to console having to be east of the floor, as most mappers do that anyway and to reduce the chance of future bugs. awaiting feedback on that one.
 like the charger and floor.
2014-08-18 15:49:38 +02:00
MrStonedOne
873c15178c Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote() 2014-08-18 14:07:14 +01:00
MrStonedOne
f396b94068 SQL injection fix.
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
2014-08-18 14:07:04 +01:00
Chinsky
f9a07a16ef Merge pull request #6031 from Whitellama/master
Adds logs/fingerprints preventing welding fuel grief.
2014-08-18 15:35:14 +04:00
Zuhayr
df6723deb0 Merge pull request #6036 from mwerezak/power-net
Fixes laptop power draw, improves cell chargers
2014-08-18 21:04:02 +09:30
Graham Lloyd
75305a0ec4 Comfy chair update, makes armrests show up. 2014-08-17 22:48:38 -04:00
Whitellama
7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Zuhayr
472a458d47 Merge pull request #6033 from Walter0o/comp3_crew_comp
should fix #6030
2014-08-18 09:32:48 +09:30