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
Chinsky
95eacd2185
Merge pull request #8008 from volas/sanitize_procs
...
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8
Cleaned out my WIP folder.
2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01
Make borg radio window tell if loudspeaker is on
2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc
Fix borg radio weirdness
...
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
volas
949ac26804
a few more copytext(sanitize()) fixes
2015-02-01 23:42:43 +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
d6b03ea768
Merge pull request #7974 from mwerezak/ert
...
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
Chinsky
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
PsiOmega
7a72d654bd
(Likely) fixes #7987 .
...
Camera consoles again confirm that a given camera is accessible.
2015-01-30 09:38:37 +01:00
PsiOmegaDelta
80132bdd23
Merge pull request #7978 from Zuhayr/dev-freeze
...
Fixes
2015-01-30 09:25:23 +01:00
PsiOmega
9e9324f010
Fixes #7961 .
...
No longer have to stand on top of turrets to interact with them.
2015-01-29 10:31:20 +01:00
Zuhayr
b280cb6d42
Fixes #7919
2015-01-29 11:27:56 +10:30
Zuhayr
01bd0875fe
Fixes #7973
2015-01-29 11:08:22 +10:30
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
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
c7aff28ffe
Merge pull request #7962 from Baystation12/master
...
master->freeze
2015-01-27 21:55:46 +03:00
PsiOmegaDelta
2a516ed80a
Merge pull request #7959 from mwerezak/hoverpod
...
Returns hoverpod step drain to 10
2015-01-27 16:34:13 +01:00
mwerezak
f80f8f3057
Returns hoverpod step drain to 10
2015-01-27 01:05:10 -05: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
47157a20be
Fixed mercenary game mode announcement
2015-01-26 17:57:34 +13: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
ccomp5950
052ed36f7b
Sanitized camera names removes the y infront of certain cameras names.
2015-01-25 07:47:55 -05:00
ccomp5950
44a9a722d0
Removed unused code that was intended for a different implenetation.
2015-01-25 07:21:14 -05:00
ccomp5950
c0469fc9b6
Security camera console now also caches it' list of cameras.
...
FUCKING HUGE.
2015-01-25 07:15:58 -05: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
Zuhayr
7164012faa
Merge pull request #7906 from PsiOmegaDelta/Startup
...
Cleans up and corrects post-round summary.
2015-01-24 17:53:35 +10:30
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
PsiOmegaDelta
c780437354
Merge pull request #7911 from mwerezak/virus
...
Virus Protection Fix
2015-01-22 18:40:19 +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
PsiOmega
dadc677a34
Adds a second teleporter check because I r dumb.
2015-01-22 09:25:10 +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
b8dfaa09a9
Merge pull request #7893 from PsiOmegaDelta/ShutThatShutter
...
Emergency Shutter Assembly Consistency
2015-01-22 10:45:23 +10:30
PsiOmega
cb6b898d86
Cleans up post-round summary.
2015-01-21 22:05:45 +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
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
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
aa5013fa08
Merge pull request #7885 from Baystation12/master
...
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
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
