cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,622 Commits 5 Branches 0 Tags
97a82cfd6da5db19e05ff37c89b0643f5d3ee59a
Commit Graph

14677 Commits

Author SHA1 Message Date
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
Zuhayr
65a31f2dc2 Merge pull request #6026 from mwerezak/internal-bleeding 
Implements IB changes discussed in forum thread
 2014-08-18 09:32:00 +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
6679434713 Merge pull request #6024 from mwerezak/laser 
Adjusts laser cannon damage
 2014-08-18 09:29:27 +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
2a6a312dbe Merge pull request #6019 from mwerezak/radio 
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
 2014-08-18 09:25:24 +09:30
Zuhayr
4740898b23 Merge pull request #6016 from comma/rads 
Rad damage changes
 2014-08-18 09:24:49 +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
Zuhayr
4e862ec9a7 Merge pull request #6014 from comma/spacearea 
Replaces /area with /area/space
 2014-08-18 09:21:44 +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
mwerezak
6d6413a59b Fixes laptop power draw, improves cell chargers 
Cell chargers no longer call use_power() in their process()
 2014-08-17 15:30:29 -04: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
Chinsky
c660734299 Added probability scaling for non-damage events. 
Fixed typo.
 2014-08-17 11:05:17 +04:00
mwerezak
bd397ff844 Adjusts laser cannon damage 
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
 2014-08-16 22:34:23 -04:00
mwerezak
5b341bd810 IB initial damage now depends on damage taken 
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
 2014-08-16 22:00:55 -04:00
mwerezak
add9ec3b65 Makes IB bleed with same rate as external bleeding 
Also updates drip() to remove the amount of blood actually passed into
it as argument.
 2014-08-16 21:45:21 -04: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
mwerezak
3c46e4c35b Fixes airlocks aborting when cycled 
Fixes airlocks aborting because the doors took too long to close.
 2014-08-16 14:39:37 -04:00
mwerezak
bcc07d3296 Fixes machines being able to put the radio controller to sleep 2014-08-16 14:37:44 -04:00
Hubblenaut
736741a5c2 Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists 2014-08-16 19:08:22 +02:00
Chinsky
72fed65b10 Merge pull request #6011 from PsiOmegaDelta/BrigTimers 
Unstationary cell status displays now fixed
 2014-08-16 10:44:59 +04:00
Chinsky
09561db2d0 Added coefficient to scale speed of rads. Currently it's 10x slower than it was. 
Added humans going bald on high rads levels.
Added a chance to get sick burn on highest rad level.
Replaced mutations (turning deaf/blind is unfun, and slowing rads would raise the chance of it happening) with a a chance of small genetic damage.
 2014-08-16 09:32:24 +04:00
Chinsky
1de0e2cb44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea 
Conflicts:
	maps/tgstation2.dmm
 2014-08-16 06:29:55 +04:00
Chinsky
03cdfaf896 Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area. 2014-08-16 05:28:45 +04: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
mwerezak
d4218e7cd7 Allows airlock access buttons to use ID in hand 2014-08-15 21:01:33 -04:00