cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,937 Commits 6 Branches 0 Tags
0090efb21026c84ce846e3b3df11c607c20e8e0a
Commit Graph

14145 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
JimTheCactus
e74d92370d Added a forced, immediate refresh of the icons after the character is made. 
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
 2014-08-17 12:34:02 -06:00
Walter0o
0c6dff3c7a should fix #6030 
basically the same as
569e8361dc
for the computer3 laptop.
 2014-08-17 18:18:07 +02:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code. 
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
 2014-08-17 18:06:30 +02:00
Whitellama
da93b893ce Fixed silly typo. 2014-08-17 03:03:17 -07:00
Whitellama
4bfd59c8d7 Renamed an argument to h ave clearer meaning. 2014-08-17 02:54:35 -07:00
Whitellama
f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
mwerezak
e1fb63f6e7 Fixes airlock icon state/animation weirdness 
door_spark and door_deny icon states are usually of a closed door, so it
looks glitchy if they are used when the door is open (such as by pulsing
the ID scan wire).
 2014-08-16 21:04:06 -04:00
mwerezak
d8b6aecc32 Fixes escape shuttle announcing a negative ETA 
Fixes the escape shuttle announcing a negative ETA when it leaves late.
 2014-08-16 21:02:05 -04:00
mwerezak
2bd96ab29e Fixes multi docking port undocking conditions 
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
 2014-08-16 20:50:34 -04:00
Hubblenaut
d122ec9979 Sleeping people on chairs can be woken up 2014-08-17 02:34:26 +02:00
Hubblenaut
1602cb883c Surgical tools that are nowhere near the patient don't cause a fail step 2014-08-17 02:34:25 +02:00
Hubblenaut
cbb0a3c0b7 Fixes a surgery oversight regarding text coloring 2014-08-17 02:21:32 +02:00
Hubblenaut
48655479b7 Hardcrit is entered immediately and lasts for 300 seconds instead of 250 (at max) 2014-08-17 02:21:31 +02:00