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
PsiOmega
b51acb1366
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-01-21 08:50:19 +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
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
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
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
Ccomp5950
583a1bc0c3
Merge pull request #7858 from SkyMarshal/patch-2
...
Fixes a null-usr edge case.
2015-01-18 17:34:04 -05:00
Zuhayr
3b23e6d707
Merge pull request #7859 from mwerezak/fixes
...
Fixes airlock removing electronics check
2015-01-18 04:02:46 +10:30
Zuhayr
597a55c2e3
Merge pull request #7855 from Mloc/bs12-fixo
...
walls fix + balance + tcomms optimization
2015-01-18 04:00:19 +10:30
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
mwerezak
39390a7324
Fixes airlock removing electronics check
...
Also stops emagged status from preventing certain door actions.
2015-01-17 02:13:17 -05:00
SkyMarshal
e5e149abd9
Fixes a null-usr edge case.
2015-01-16 23:29:48 -07:00
Mloc-Argent
87a51e27e4
optimize relay_information
...
useless del() call, new call deferred
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-16 23:59:39 +00:00
Mloc-Argent
4be653efec
fix wall burning runtime, balance rwalls
...
rwalls are half as strong again because they took way too long
to burn down
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-16 23:58:15 +00: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
Zuhayr
dd3c131463
Merge pull request #7843 from Loganbacca/freezefix
...
Closet fixes
2015-01-16 23:12:13 +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
SkyMarshal
12d056106e
Adjusts informative comments.
2015-01-15 17:57:52 -07:00
Loganbacca
fb945fa9ec
Fixes telekinetic tape placement on airlocks
2015-01-16 13:50:13 +13:00
Loganbacca
7435f7574e
Closet file reorganisation
...
- Moved walllocker.dm to
code/game/objects/structures/crate_lockers/closets
- Moved other unused closet files to the code/unused folder
2015-01-16 12:04:59 +13:00
Ravensdale
fdf9886053
Fixes Cannot execute null.on removed()
2015-01-15 14:48:04 -08:00
Loganbacca
780b1fb096
Fixed placing mounted modules in closets
...
- Fixes placing mounted modules in closets and crates
- Removed a couple of colons
2015-01-16 11:43:45 +13: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
