Commit Graph

8821 Commits

Author SHA1 Message Date
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
PsiOmegaDelta
cda262bbe4 Merge pull request #7863 from Kelenius/ofAlarmsAndScrubbers
Adds oxygen and nitrogen to air alarm scrubber list
2015-02-03 16:11:49 +01:00
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai
Adds AI latejoin
2015-02-03 16:10:46 +01:00
Chinsky
1c3b1087dd Merge pull request #7582 from Zuhayr/richard
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Chinsky
6546dc6a77 Merge pull request #7682 from SparklySheep/patch-11
Adds the visitor alt-title.
2015-02-03 18:09:50 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
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
GinjaNinja32
271fe31e64 Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction. 2015-02-02 18:34:26 +00:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00: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
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Zuhayr
d6b03ea768 Merge pull request #7974 from mwerezak/ert
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
Chinsky
02dc784332 Merge pull request #7981 from PsiOmegaDelta/MedicalSuccess
Medbots now report treatment on success instead of attempt.
2015-01-30 20:00:38 +03:00
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
PsiOmega
7ca1ca7d79 Medbots now report treatment on success instead of attempt.
Makes them work similar to security bots/Beepsky.
2015-01-29 09:44:18 +01:00
PsiOmega
ebf3d25cae Additional support for non-Exodus maps.
Teleport now also checks config for appropriate Z-levels instead of using hard-coded values.
2015-01-29 09:17:48 +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
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
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
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
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
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
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