Commit Graph

9782 Commits

Author SHA1 Message Date
Ravensdale
5878d415ad Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mappin 2015-01-25 20:36:19 -08:00
PsiOmega
d70a3dcdc0 Downgrades AIs sight to that of borgs. 2015-01-24 17:59:19 +01:00
Zuhayr
22edc4bc90 Merge pull request #7920 from Baystation12/dev-freeze
Dev freeze into dev
2015-01-23 13:01:23 +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
Zuhayr
d1a4c54975 Merge pull request #7904 from GinjaNinja32/runtime2
Fixes a warning and some runtimes
2015-01-22 10:46:20 +10:30
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
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
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
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
0dc5e1d77f Merge pull request #7895 from atlantiscze/powernet-failure-fix
Fixes two powernet related issues
2015-01-20 22:30:27 +01: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
Kelenius
d5c1c8672d Conflict fix 2015-01-20 15:02:25 +03:00
Zuhayr
d466d740e4 Merge pull request #7886 from Baystation12/dev-freeze
Updating from dev freeze
2015-01-20 18:49:36 +10:30
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Loganbacca
492c5382e6 Fixes item anchoring on unload 2015-01-20 13:39:01 +13:00
Ccomp5950
d836103b22 Merge pull request #7860 from mwerezak/unarmed
Unarmed attack log message tweaks
2015-01-18 17:42:47 -05:00
Kelenius
5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
mwerezak
15c7ed92e4 Unarmed message tweaks 2015-01-17 03:26:19 -05:00
Zuhayr
bf1544c141 Merge pull request #7849 from PsiOmegaDelta/RenameAI
Fixes #7644.
2015-01-16 23:15:12 +10:30
Zuhayr
c467e99f15 Merge pull request #7848 from comma/master
Moar fix
2015-01-16 23:13:53 +10:30
Chinsky
9890bdc86d Merge pull request #7851 from Baystation12/dev-freeze
Dev freeze -> dev
2015-01-16 14:24:06 +03:00
Chinsky
6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
PsiOmega
02581042d7 Fixes #7644.
Makes it possible for admins to properly rename AIs, either by right-clicking the relevant AI or by using the verb in the Admin panel.
2015-01-16 11:23:08 +01:00
Chinsky
facfc0df56 Fixes #7560 2015-01-16 12:51:46 +03:00
Chinsky
b405fcd71f Fixes #7775 2015-01-16 12:26:05 +03:00
Chinsky
ac20d0b23b Fixes #7827 2015-01-16 12:19:53 +03:00
Chinsky
c2b5c53092 Merge pull request #7845 from Ravensdale/runtimeFixes
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Chinsky
46264e0194 Merge pull request #7838 from PsiOmegaDelta/EventFixes
Fixes  #7547.
2015-01-16 11:22:19 +03:00
Chinsky
badefe24d5 Merge pull request #7833 from PsiOmegaDelta/TrulyInvisible
Can no longer see the AI eye by right or alt-clicking turfs.
2015-01-16 11:22:09 +03:00
Ravensdale
fdf9886053 Fixes Cannot execute null.on removed() 2015-01-15 14:48:04 -08:00
Zuhayr
7a68bf0fc6 Merge pull request #7839 from comma/master
Hacky fixes
2015-01-16 08:53:04 +10:30
Chinsky
b4840aec54 Merge pull request #7616 from atlantiscze/boomfix
Wireless Wires Bugfix
2015-01-15 23:57:37 +03:00
Chinsky
0a7185c20a Fixes #7787
Made clean surgical amputation not cause huge wounds. Also moved code around a bit to prevent situations where missing limbs would get wounds (ie hands giving wounds to arms during recursive droplimb).
2015-01-15 18:59:39 +03:00
Chinsky
6f8618ded8 Fixes surgery steps never failing 2015-01-15 18:04:10 +03:00
Chinsky
47e5e51db3 Fix for the fix. 2015-01-15 17:51:45 +03:00
PsiOmega
2a9955c68b Fixes #7547.
The event manager now respects the "allow random event" config setting.
2015-01-15 15:01:38 +01:00
Chinsky
1c772e9914 Fixes #7821 2015-01-15 16:45:45 +03:00
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
PsiOmega
5c6c65e728 Can no longer see the AI eye by right or alt-clicking turfs. 2015-01-15 10:25:49 +01:00
Chinsky
d1480dc6d8 Merge pull request #7816 from Loganbacca/freezefix
SMES UI fix
2015-01-15 11:31:10 +03:00
Chinsky
34b99d02ef Merge pull request #7826 from mwerezak/jumpsuit
Fixes body_parts_covered not updating when rolling jumpsuits
2015-01-15 11:31:06 +03:00
Chinsky
f57f3147b4 Merge pull request #7829 from Loganbacca/hudfix
Fixes
2015-01-15 11:31:03 +03:00
Loganbacca
5fc035bffc Ghost labeller fix
No you cant stick labels on ghosts
2015-01-15 21:21:13 +13:00
mwerezak
812b9d3348 Fixes body_parts_covered not updating when rolling jumpsuits 2015-01-14 22:38:52 -05:00