Commit Graph

22239 Commits

Author SHA1 Message Date
Zuhayr
3d0ec78be1 Merge pull request #7946 from Ravensdale/mappin
Replaces magic freezers in engine room with H/E pipes
2015-01-26 17:28:59 +10:30
Ravensdale
5878d415ad Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mappin 2015-01-25 20:36:19 -08:00
Ravensdale
ec49c8b305 Replaces magic freezers with H/E pipes 2015-01-25 02:03:12 -08:00
Zuhayr
9017fdd5a8 Merge pull request #7927 from PsiOmegaDelta/AIInvis
Downgrades AIs sight to that of borgs.
2015-01-25 09:17:56 +10:30
PsiOmega
d70a3dcdc0 Downgrades AIs sight to that of borgs. 2015-01-24 17:59:19 +01:00
Zuhayr
7164012faa Merge pull request #7906 from PsiOmegaDelta/Startup
Cleans up and corrects post-round summary.
2015-01-24 17:53:35 +10:30
Zuhayr
22edc4bc90 Merge pull request #7920 from Baystation12/dev-freeze
Dev freeze into dev
2015-01-23 13:01:23 +10:30
Zuhayr
a32c4d02e8 Merge pull request #7914 from PsiOmegaDelta/IAMap
Fixes #7913.
2015-01-23 07:03:22 +10:30
PsiOmegaDelta
c780437354 Merge pull request #7911 from mwerezak/virus
Virus Protection Fix
2015-01-22 18:40:19 +01:00
PsiOmegaDelta
4ebd54f0af Merge pull request #7916 from GinjaNinja32/runtime
Fixes power runtime
2015-01-22 17:47:05 +01:00
unknown
7590bbac99 Infection chance proc improvements
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
2015-01-22 11:10:57 -05:00
GinjaNinja32
c97b54fe56 Fixes power runtime 2015-01-22 15:03:54 +00:00
PsiOmega
d5b469e4c5 Fixes #7913.
Replaces disposal junction with a simple bent section.
2015-01-22 13:41:06 +01:00
Zuhayr
693c77745c Merge pull request #7896 from Kelenius/ofCargoAndShuttle
Replaces 'SUPPLY' with 'CARGO' on cargo screens
2015-01-22 10:47:37 +10:30
Zuhayr
d1a4c54975 Merge pull request #7904 from GinjaNinja32/runtime2
Fixes a warning and some runtimes
2015-01-22 10:46:20 +10:30
Zuhayr
b8dfaa09a9 Merge pull request #7893 from PsiOmegaDelta/ShutThatShutter
Emergency Shutter Assembly Consistency
2015-01-22 10:45:23 +10:30
Zuhayr
6894446352 Merge pull request #7903 from GinjaNinja32/runtime
Fixes a laptop vendor runtime
2015-01-22 10:19:56 +10:30
GinjaNinja32
41414e591d VV runtime fix 2015-01-21 21:16:43 +00:00
GinjaNinja32
166e7528fb Fixes monkeyize runtime due to ghostize trying to remove verbs from a non-existent client 2015-01-21 21:07:41 +00:00
PsiOmega
cb6b898d86 Cleans up post-round summary. 2015-01-21 22:05:45 +01:00
GinjaNinja32
0a3383c1c5 Fixes an announcement runtime after someone uses the transformation artifact to change their PDA to something else 2015-01-21 20:54:46 +00:00
GinjaNinja32
0b05816dd0 Radio runtime fix 2015-01-21 20:41:45 +00:00
GinjaNinja32
b43e0ed95b Fixes vine runtime 2015-01-21 20:39:55 +00:00
GinjaNinja32
0edcf0c349 Fixes a warning in reagent code caused by mistyped reagent ids 2015-01-21 20:34:04 +00:00
GinjaNinja32
e8aeb1b496 Fixes a laptop vendor runtime 2015-01-21 20:25:49 +00:00
PsiOmegaDelta
4dd709fa07 Merge pull request #7898 from PsiOmegaDelta/dev
Dev
2015-01-21 08:58:47 +01:00
PsiOmega
9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-01-21 08:53:27 +01:00
PsiOmegaDelta
1842dd1e5c Merge pull request #7897 from PsiOmegaDelta/dev-freeze
Dev freeze
2015-01-21 08:51:40 +01:00
PsiOmega
b51acb1366 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-01-21 08:50:19 +01:00
PsiOmega
5637fb0f11 Emergency shutter assemblies are now permanently dense. 2015-01-21 08:49:34 +01:00
PsiOmegaDelta
edb81e31d8 Merge pull request #7890 from Loganbacca/aistatusfix
Fixed AI status display not updating
2015-01-21 07:31:09 +01:00
Kelenius
d14750da86 Replaces 'SUPPLY' with 'CARGO' on cargo screens
So now it shows the line with the arrival time properly.
2015-01-21 03:41:02 +03:00
Loganbacca
3b7a3fba7a Removed process() dependency 2015-01-21 12:37:20 +13:00
PsiOmegaDelta
0dc5e1d77f Merge pull request #7895 from atlantiscze/powernet-failure-fix
Fixes two powernet related issues
2015-01-20 22:30:27 +01:00
Chinsky
444f9e9cd7 Merge pull request #7894 from PsiOmegaDelta/BorgName
Reduces the risk of unnecessary borg designation announcements.
2015-01-20 23:27:22 +03:00
Atlantiscze
8dbe6d2f35 Fixes two powernet related issues:
- First issue is power monitoring consoles showing slightly inaccurate values. The code calculated some sort of level average which resulted in stupid values being reported (like load 500kW available 300kW). This also fixes APC load partially showing as Other load on the console.
- Second fixed issue (Fixes #7869) resolved gamebreaking bug that caused total irreversible failure of all powernets if makepowernets() was called. This, for example, includes large enough explosions, via admin command, or few other cases.
2015-01-20 21:12:52 +01:00
PsiOmega
9452c11b56 Reduces the risk of unnecessary borg designation announcements. 2015-01-20 20:40:35 +01:00
Ccomp5950
a7835b4f3a Merge pull request #7892 from PsiOmegaDelta/Tracking
Fixes #7880.
2015-01-20 14:13:48 -05:00
Zuhayr
ba47824830 Merge pull request #7891 from Kelenius/ofSpraysAndWalls
Changes how sprays work and re-adds silicate
2015-01-20 23:54:50 +10:30
Zuhayr
95516edcee Merge pull request #7889 from PsiOmegaDelta/TakeMeToTheMoon
Fixes #7857.
2015-01-20 23:54:17 +10:30
Kelenius
cee3c3eeff Replaces icon proc with image 2015-01-20 16:11:05 +03:00
PsiOmega
5f5fc4b0a6 Fixes #7880.
Adds () around the "M.z in list" check, otherwise BYOND attempts to check "M.z in (list && hassensorlevel)".
Also attempts to properly acquire the current Z position.
2015-01-20 13:53:39 +01:00
Kelenius
d5c1c8672d Conflict fix 2015-01-20 15:02:25 +03:00
Kelenius
1949f105f1 Removes a debug world << 2015-01-20 14:55:26 +03:00
Zuhayr
c58b2860d4 Merge pull request #7888 from PsiOmegaDelta/MoreGun
Fixes  #7879.
2015-01-20 22:09:23 +10:30
Mloc
b1ba9a6d0e Merge pull request #7813 from SkyMarshal/patch-1
Adjusts HE pipe properties
2015-01-20 11:24:03 +00:00
PsiOmega
07cc7a156b Fixes #7857.
Must now remain adjacent to the teleporter computer if you wish to change target location.
2015-01-20 11:34:29 +01:00
PsiOmega
b3e367c778 Fixes #7879.
Can now enable/disable turrets through a turret controller again.
Adds missing checks to prevent abuse.
2015-01-20 11:24:24 +01:00
Loganbacca
00be769922 Fixed AI status display not updating 2015-01-20 23:19:34 +13:00
Zuhayr
d466d740e4 Merge pull request #7886 from Baystation12/dev-freeze
Updating from dev freeze
2015-01-20 18:49:36 +10:30