Commit Graph

16446 Commits

Author SHA1 Message Date
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
Chinsky
f71e43d06c Moved ambiance sounds out of horrendous ifchain to area definitions.
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
mwerezak
200741d611 Refactored copypasta in post_signal() 2014-08-15 20:36:45 -04:00
mwerezak
9d7c5dc197 Gives filters proper names, updates airlocks to use filters
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix
fixes #5693
2014-08-16 03:47:51 +04:00
Chinsky
68fc5d91c6 Merge pull request #6009 from mwerezak/laser
Renames "laser gun" to "laser carbine"
2014-08-16 03:47:05 +04:00
mwerezak
3bc5cde223 Updates radio controller pathnames to be absolute 2014-08-15 17:09:38 -04:00
mwerezak
edd7a718b2 Moves the radio controller to the controllers dir 2014-08-15 17:05:51 -04:00
Raptor1628
75e63e55a4 More Fixes
Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
2014-08-15 12:25:56 -04:00
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
PsiOmega
30cb1a32fb No more auto-adjustment of cell status displays. 2014-08-15 08:55:55 +02:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
Raptor1628
f1c44601e5 Brig Fixes
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04: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
PsiOmega
46a50dc7a2 Removes the loophole ion-law. Adds in some other ion law changes. 2014-08-14 11:20:45 +02:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +02:00
PsiOmega
6fffe8e077 Merge remote-tracking branch 'upstream/dev' into Brig2 2014-08-14 08:58:59 +02:00
Chinsky
658941a0f9 Merge pull request #5978 from Zuhayr/journalism
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04: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
43a7757252 Merge pull request #5982 from Jarcolr/customs
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +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
Chinsky
af9f56f164 Merge pull request #5969 from GinjaNinja32/floortiles
Adds floor painter.
2014-08-14 06:31:09 +04:00