PsiOmega
1732d0c79a
Merge remote-tracking branch 'upstream/master' into TheGreatPurge
...
Conflicts:
code/WorkInProgress/computer3/computers/message.dm
code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
SkyMarshal
7c1b70af93
Removes jungle
2015-02-03 04:01:16 -07:00
SkyMarshal
8898689c5d
Cleared out my WIP folder.
2015-02-03 03:20:42 -07:00
SkyMarshal
15bf312f13
Fixes up some helpers.
2015-02-03 03:18:34 -07:00
Chinsky
649473e0ec
Restred medical side effects file since turns out it's used (need to look into why it doesn't appear to be later)
2015-02-03 12:19:09 +03:00
Chinsky
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
Chinsky
cbe030b56e
Compile fix
2015-02-03 08:39:39 +03:00
Chinsky
2a1f0849d8
Cleaned out my WIP folder.
2015-02-03 08:27:18 +03:00
volas
ea8e848463
copytext() check for some input
2015-02-01 23:16:04 +03:00
volas
8abd7d0735
correction of all copytext(sanitize(..)) to sanitize(copytext(..))
2015-02-01 22:54:56 +03:00
Zuhayr
20da84646b
Merge pull request #7964 from Baystation12/dev-freeze
...
Dev-Freezer -> Master v0.1.17 Botswan Punchout
2015-02-02 02:14:08 +10:30
Chinsky
19f288e22e
Merge pull request #8005 from Ccomp5950/fixes123
...
Misc Fixes: Removes ahelp categories / robotics maint door.
2015-02-01 18:13:08 +03:00
Zuhayr
d6b03ea768
Merge pull request #7974 from mwerezak/ert
...
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
ccomp5950
b23b5b5d41
Removes categorization of Ahelps.
2015-01-31 21:13:05 -05:00
Chinsky
a5219535f6
Merge pull request #7997 from mwerezak/fixes
...
Fixes voidsuit attachment deployment not checking mob_can_equip()
2015-01-31 09:25:16 +03:00
mwerezak
f8d79ef62a
Gives sec ERT hardsuits mounted eguns
...
Also relocates mounted gun code.
2015-01-31 01:00:36 -05:00
mwerezak
75e0458102
Fixes voidsuit attachment deployment not checking mob_can_equip()
2015-01-30 22:02:07 -05:00
Jamini
683963f1ec
Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.
...
Signed-off-by: Jamini <mobiousjami@gmail.com >
2015-01-30 18:22:58 -05:00
Chinsky
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr
21422ab8b5
Merge pull request #7993 from PsiOmegaDelta/PhotoCache
...
Minor photo cache improvement.
2015-01-30 23:46:56 +10:30
Chinsky
e3b02fc62f
Merge pull request #7975 from mwerezak/fixes
...
Fixes #7958
2015-01-30 16:14:16 +03:00
PsiOmega
fa931ae9a9
Photo cache improvements.
...
According to http://www.byond.com/docs/ref/info.html#/proc/browse_rsc browse_rsc() does not resend already cached data, however there is likely also a check to ensure that this data is up to date (using checksums or otherwise) or clients would only ever see the first photo they viewed in a given round.
This small change attempts to ensure that a given photo only has to be downloaded once by appending the photo id to the file name, reducing the risk of #7966 happening.
2015-01-30 10:37:42 +01:00
PsiOmegaDelta
80132bdd23
Merge pull request #7978 from Zuhayr/dev-freeze
...
Fixes
2015-01-30 09:25:23 +01:00
SkyMarshal
812f7553f1
Fixes a runtime in the artifact harvester.
2015-01-29 21:52:52 -07:00
unknown
0c82682578
Clothing that does not use species restrictions no longer gains species restrictions when refit.
2015-01-29 13:20:38 -05:00
Zuhayr
b280cb6d42
Fixes #7919
2015-01-29 11:27:56 +10:30
Zuhayr
d0f76833d9
Fixes #7976
2015-01-29 11:15:18 +10:30
Zuhayr
131fc38e42
Fixes #7861 (partial), #7957 , #7940
2015-01-29 10:53:32 +10:30
mwerezak
0ebe28dbea
Fixes #7958
2015-01-28 13:19:01 -05:00
mwerezak
849e968924
ERT adjustment and fixes
...
Removes the mounted laser cannon from the ERT hardsuits and instead
provides a single cannon for the team.
Moves the sidearms out to the other ert stations to make it more clear
that they may be used by other ERT roles.
Fixes rechargers now working in Centcom areas.
2015-01-28 13:11:04 -05:00
PsiOmegaDelta
d0f537180e
Merge pull request #7968 from comma/det_fixes
...
Detective quality of life fixes
2015-01-28 08:13:37 +01:00
GinjaNinja32
bc0f5762be
Camera sorting improvements
2015-01-28 04:33:31 +00:00
Zuhayr
4ef1c921fe
Merge pull request #7954 from Loganbacca/nukefix
...
Fixes issues with nuclear mode rename
2015-01-28 10:14:59 +10:30
Chinsky
b159bd389b
Added forensic scanner wipe verb
...
It clutters up scanner console very much after each update, and selective deletion sounds like too much effort (can do it on console anyway).
2015-01-28 00:53:40 +03:00
Chinsky
24f4ff2a32
Fixed partial fingerprints data
...
Now scanning console properly updates the partial fingerprints with new data and fingerprint cards.
Also fixed lack of newline in details screen.
2015-01-28 00:52:35 +03:00
Chinsky
ee7f71ab64
Added update_prints helper
...
It updates forensic data datum with fingerprints and returns 1 if there was a match.
2015-01-28 00:36:22 +03:00
Chinsky
ba0dbffbd0
Fixed fingerprint cards.
...
They didn't perform their sole function - getting fullprint on touch, so now they do. Still respecting gloves, mutations etc.
2015-01-28 00:32:21 +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
Loganbacca
fbabdce615
Finished renaming nuclear mode to mercenary
...
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13: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
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
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
PsiOmega