Kelenius
0e7ed6aef4
Merge branch 'dev' into ofDryingAndRacks
2015-02-03 20:51:27 +03:00
Chinsky
34a7549460
Merge pull request #7963 from Baystation12/dev-freeze
...
freeze->warlock
2015-01-27 21:56:07 +03:00
Chinsky
c7aff28ffe
Merge pull request #7962 from Baystation12/master
...
master->freeze
2015-01-27 21:55:46 +03:00
Chinsky
b27c9c0a22
Merge pull request #7947 from mwerezak/port-gen
...
Fixes portable generator balance
2015-01-27 17:51:40 +03:00
PsiOmegaDelta
1af6db847d
Merge pull request #7945 from Loganbacca/tapefixes
...
Tape fixes
2015-01-26 08:12:47 +01:00
Loganbacca
8c53e30cfa
Fixes telekinetic cat stealing
2015-01-26 19:53:42 +13:00
Loganbacca
37ceccf5a4
Fixed removed items being put inside borgs
2015-01-26 18:24:12 +13:00
mwerezak
9bfa6093a2
Fixes portable generator balance
...
Adjusts values so that the portable generators aren't so useless.
2015-01-25 23:59:07 -05:00
Ravensdale
5878d415ad
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mappin
2015-01-25 20:36:19 -08:00
Loganbacca
34d44f8732
Tape fixes
...
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
PsiOmegaDelta
ab1c229e85
Merge pull request #7937 from Ccomp5950/cached_json
...
Cached json (Improvements for camera monitor and PDA - Manifest)
2015-01-25 20:37:24 +01:00
ccomp5950
89652ae5e3
JSON caching for nanoui
...
You get to cache data, make the best of it.
NanoUI for PDA now won't shove the manifest through list2json every tick, it will cache the json for manifest and shove it into the cache_data so list2json tacks it onto the end.
2015-01-25 06:22:30 -05:00
GinjaNinja32
7e43812408
Virology fixes; nerfs viruses significantly (~33% power), but reactivates broken effects that were multiplying their effects by null
2015-01-25 09:34:53 +00: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
Kelenius
6f7a7177f2
Adds drying racks and updates pipes
...
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +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
