Commit Graph

14416 Commits

Author SHA1 Message Date
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping
Fixes #6027
2014-08-19 12:01:14 -05:00
Zuhayr
677ac1f7bb Merge pull request #6051 from comma/detcomp
Initial commit of detective console rewrite.
2014-08-19 21:46:52 +09:30
Ccomp5950
8691d36ea1 Merge pull request #6062 from PsiOmegaDelta/Walls
Optimization - Walls deletion
2014-08-19 06:22:31 -05:00
Ccomp5950
3c19520df2 Merge pull request #6059 from mwerezak/power-net
Fixes APCs eating up all the power even when fully charged
2014-08-19 06:02:34 -05:00
Ccomp5950
cf2be93916 Merge pull request #6056 from mwerezak/dev-fixes
Fixes firedoors not opening
2014-08-19 06:02:08 -05:00
Ccomp5950
3c9fa8ba61 Merge pull request #6050 from mwerezak/breathing
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
PsiOmega
b3cd08068a Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos. 2014-08-19 10:50:17 +02:00
mwerezak
c42d9171d6 Makes power monitor a power machine again
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f Fixes APCs eating up all the power even when fully charged 2014-08-19 01:14:18 -04:00
mwerezak
f6f7c82e2a Fixes firedoors not opening 2014-08-18 22:53:43 -04:00
mwerezak
65bb47b7ec Setting computer vars on de/construction 2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0 Removes more unused vars from circuitboards 2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700 Makes power monitor computers actual computers
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
2014-08-18 18:27:51 -04:00
Chinsky
b43759fee9 Initial commit of detective console rewrite.
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
2014-08-19 00:50:14 +04:00
PsiOmega
11ce777d9c Fixes #6027
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
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
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
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
6679434713 Merge pull request #6024 from mwerezak/laser
Adjusts laser cannon damage
2014-08-18 09:29:27 +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
4e862ec9a7 Merge pull request #6014 from comma/spacearea
Replaces /area with /area/space
2014-08-18 09:21:44 +09:30
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
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
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
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
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
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
PsiOmega
30cb1a32fb No more auto-adjustment of cell status displays. 2014-08-15 08:55: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
PsiOmega
46a50dc7a2 Removes the loophole ion-law. Adds in some other ion law changes. 2014-08-14 11:20:45 +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
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
Chinsky
af9f56f164 Merge pull request #5969 from GinjaNinja32/floortiles
Adds floor painter.
2014-08-14 06:31:09 +04:00