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
cbf3d79ea1
Merge pull request #6173 from GinjaNinja32/nodebug
...
Removed debug statements for ioned SMESes
2014-08-26 15:28:12 +04:00
GinjaNinja32
778a0fc608
Removed debug statements
2014-08-26 01:43:54 +01: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
8f3acf4de6
Merge pull request #6162 from GinjaNinja32/ions
...
Various grammar and spelling fixes in ion laws
2014-08-25 22:15:15 +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
5b8b2c8fa6
Merge pull request #6147 from PsiOmegaDelta/Holo
...
Fixes #6143
2014-08-24 21:45:44 +04:00
Ccomp5950
490b529fcd
Merge pull request #6127 from Hubblenaut/master
...
Space Carp tweaks/changes
2014-08-24 12:32:10 -05:00
LightningIron
89c160dfd6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-08-23 13:21:06 -05:00
LightningIron
39182f0c8f
Fix for #6131 .
2014-08-23 11:19:15 -05:00
PsiOmega
99625af142
Fixes #6143 . What is this area even supposed to be used for..?
2014-08-23 17:36:51 +02: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
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
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
Walter0o
1d9d9f7650
should fix #6099
2014-08-22 00:52:19 +02:00
Zuhayr
cbbf3bea71
Merge pull request #6085 from faerindel/chemdispenser_cleanup
...
Little cleanup on Chemistry-Machinery
2014-08-21 22:43:19 +09:30
Chinsky
e803c90aec
Optimized pulse reagent checking a little.
2014-08-21 13:40:59 +04:00
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
ec791bd81c
Merge pull request #6068 from faerindel/vending_exploit_fix
...
Fixes #6054
2014-08-21 01:36:21 +04:00
Chinsky
12f9501631
Merge pull request #6066 from Walter0o/patch-1
...
should fix #6065
2014-08-20 00:17:44 +04: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
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
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
Whitellama
26721cf0d5
Fixed eggs not going back into egg boxes
2014-08-19 02:44:58 -07:00
Zuhayr
b24976a67e
Merge pull request #6045 from Walter0o/patch-1
...
fixes #6023 and cleans up mech_bay.dm
2014-08-19 00:19:09 +09:30
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
Zuhayr
14b1eabf85
Merge pull request #6044 from Mloc/bs12
...
security
2014-08-18 22:37:11 +09:30
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
5baecb8ffe
Merge pull request #6043 from Glloyd/comfychairs
...
Comfychairs Update + Armrests
2014-08-18 21:02:33 +09:30
Graham Lloyd
fa17683742
Missed a couple more.
2014-08-17 22:57:04 -04:00
Graham Lloyd
e42f107548
Whoever put those specific chairs in, not cool.
2014-08-17 22:52:09 -04:00
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
Zuhayr
8ec28551ba
Merge pull request #6022 from mwerezak/docking
...
Fixes for docking controllers, emergency shuttle and airlock animations
2014-08-18 09:30:17 +09:30
Zuhayr
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
Zuhayr
b99525dc07
Merge pull request #5999 from GinjaNinja32/LetMeDrive
...
Allows wheelchair occupants to drive if the driving mob is incapacitated
2014-08-18 09:22:32 +09:30
Whitellama
7539a6a5bb
Added a JMP button to logs when someone adds something to a transfer valve.
2014-08-17 16:06:07 -07:00
Whitellama
09907858f3
Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks.
2014-08-17 15:51:01 -07:00
Mloc
03203ea2e0
Merge pull request #6021 from Walter0o/rods_fix
...
fixes building more than 1 grille per turf
2014-08-17 22:37:55 +01:00
Mloc
fa575196f6
Merge pull request #6034 from JimTheCactus/uncached_icon_fix
...
Added a forced, immediate refresh of the icons after the character is made
2014-08-17 22:34:22 +01:00
