cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,909 Commits 5 Branches 0 Tags
264aee843f1b82be32e059248ac9ed4fd5f04018
Commit Graph

14124 Commits

Author SHA1 Message Date
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
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Walter0o
f5ca79d003 fixes building more than 1 grille per turf 
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
 2014-08-16 22:48:13 +02:00
Hubblenaut
736741a5c2 Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists 2014-08-16 19:08:22 +02:00
Ccomp5950
9f57c1b16e Merge pull request #6012 from Walter0o/gear_fix 
fixes #6007 and future bugs with gear names
 2014-08-15 20:08:25 -05:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix 
fixes #5693
 2014-08-16 03:47:51 +04:00
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
mwerezak
7b4f439cdf Fixes #6002 2014-08-14 17:37:16 -04:00
Chinsky
7351767ef7 Merge pull request #5983 from atlantiscze/co2-breath-fix 
CO2 Breath fix
 2014-08-14 22:58:22 +04:00
Chinsky
e4847b729e Merge pull request #5994 from GinjaNinja32/shards 
Stepping in shrapnel fix and unification of shard code
 2014-08-14 22:55:39 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2 
More proximity fixes
 2014-08-14 22:55:29 +04:00
GinjaNinja32
b52450f053 Allows wheelchair occupants to drive if the driving mob is incapacitated 2014-08-14 19:24:00 +01:00
GinjaNinja32
9b9b69f547 Use absolute paths 2014-08-14 11:20:07 +01:00
GinjaNinja32
95528fb448 Remove inline comments 2014-08-14 11:17:33 +01:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +02:00
Chinsky
bcf0a57aa0 Merge pull request #5962 from mwerezak/wound-fixes 
Wound and infection fever fix
 2014-08-14 07:55:17 +04:00
Zuhayr
e1953c66cc Merge pull request #5995 from Hubblenaut/master 
More admin logs, Rejuvenation fix
 2014-08-14 12:16:42 +09:30
Zuhayr
8b3631e6d5 Merge pull request #5972 from Walter0o/psu_fix 
fixes #5964
 2014-08-14 12:03:59 +09:30
Zuhayr
04bf4c7d90 Merge pull request #5981 from Walter0o/sound_removal 
removes unused AI text2speech files and code
 2014-08-14 12:02:10 +09:30
Chinsky
7187a8effd Merge pull request #5976 from atlantiscze/laptop-opening-fix 
Fixes #5974
 2014-08-14 06:31:27 +04:00
Hubblenaut
330ce5d088 Fixes rejuvenation ignoring infections 2014-08-14 01:55:30 +02:00