Atlantiscze
cd187ae046
Nicer monitor GUI
...
- Instead of showing all sensor readings in one ugly ultra-long screen, selection menu for sensors is used.
2014-11-20 14:21:55 +01:00
Atlantiscze
e335013937
Fixes few minor mapbugs caused by previous commit
...
- Removes one accidentally placed sensor from Atmospherics
- Sensors in Security substation is now properly connected
- Sensors on the Asteroid and TCommsat are now correctly set to long_range = 1 (visible across Z levels)
2014-11-20 14:16:30 +01:00
Atlantiscze
77ca0b78a1
Remaps the powernet sensors
2014-11-20 11:38:09 +01:00
Atlantiscze
78a4b424ae
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 10:55:33 +01:00
Chinsky
af6a262a2c
Merge pull request #7059 from PsiOmegaDelta/Headsets
...
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
PsiOmegaDelta
d25d969550
Merge pull request #7043 from MrSnapwalk/onespacesuittwospacesuitredspacesuitbluespacesuit
...
Adds the new spacesuit sprites.
2014-11-19 21:10:03 +01:00
MrSnapwalk
74b0e7ecec
Reverts baystation12.int.
2014-11-19 13:59:12 -06:00
MrSnapwalk
07441e1e61
Attempting to fix conflicts with the following files:
...
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-19 13:54:28 -06:00
Ccomp5950
088c86f692
Merge pull request #7065 from Zuhayr/combitool
...
Added combi-tool.
2014-11-19 08:37:15 -05:00
Zuhayr
43dca48e99
Merge pull request #7066 from Zuhayr/dev
...
Dev
2014-11-19 23:22:04 +10:30
Zuhayr
660b32629e
Merge resolution.
2014-11-19 23:19:33 +10:30
Zuhayr
f14c1e4402
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-11-19 23:17:48 +10:30
Zuhayr
cec617a414
Merge resolution, compile fixes with outdated glass paths/map.
2014-11-19 23:17:25 +10:30
Zuhayr
41f372e532
Merge pull request #7056 from PsiOmegaDelta/laws
...
Multiple Law Statements
2014-11-19 23:16:35 +10:30
Zuhayr
0f6811608e
Merge pull request #7054 from mwerezak/cat
...
Fixes simple_animal emotes, implements custom item for for Foxler
2014-11-19 23:15:39 +10:30
Zuhayr
98df09d400
Merge pull request #7052 from RavingManiac/master
...
Fix for dual-vent-pumps being broken.
2014-11-19 23:14:33 +10:30
Zuhayr
e81b94fa92
Merge pull request #7050 from PsiOmegaDelta/Pipes
...
Fixes #7040
2014-11-19 23:13:46 +10:30
Zuhayr
425aaf1cba
Merge pull request #7047 from mwerezak/sliceable
...
Fixes inverted slicing check
2014-11-19 23:13:16 +10:30
Zuhayr
1dd02be27d
Merge pull request #7046 from mwerezak/stance
...
Adjusts damaged stance system
2014-11-19 23:12:43 +10:30
Zuhayr
25dde76639
Merge pull request #7045 from mwerezak/no-sound-in-space
...
Fixes being able to hear people through a vacuum
2014-11-19 23:12:11 +10:30
Zuhayr
0f0bca6889
Merge pull request #7038 from mwerezak/diona-scream
...
Fixes #7026
2014-11-19 23:11:50 +10:30
Zuhayr
f3b4dfced1
Merge pull request #7034 from PsiOmegaDelta/ERT-Records
...
Security Records Check
2014-11-19 23:10:48 +10:30
Zuhayr
cbc9895979
Merge pull request #7057 from atlantiscze/robofix
...
Cyborgs can now modify airlock electronics accesses.
2014-11-19 23:09:36 +10:30
Zuhayr
c11cb65e19
Added combi-tool.
2014-11-19 23:04:09 +10:30
Atlantiscze
61990872d8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-19 13:15:40 +01:00
mwerezak
4377ada588
Implements custom item for Foxler, fixes simple_animal emotes.
2014-11-18 16:19:59 -05:00
PsiOmegaDelta
76aa84ee6e
Merge pull request #7058 from PsiOmegaDelta/BinaryTracking
...
Binary Tracking
2014-11-18 18:55:20 +01:00
PsiOmega
45c5f01363
Dynamic Headset Description
...
Headsets now generate a description of available radio channels based on the installed encryption key(s).
Currently only updates on creation, not when changing encryption keys, to ensure that less than legal keys are not detected by a mere casual glance.
2014-11-18 18:43:12 +01:00
Ccomp5950
61745c68c2
Merge pull request #7053 from DJSnapshot/adminfeatures
...
I forgot a thing
2014-11-18 09:30:33 -05:00
PsiOmega
f7bc35f333
Binary Tracking
...
The AI can again finally track entities using the binary channel.
2014-11-18 12:24:54 +01:00
Atlantiscze
89e3167ab7
Cyborgs can now modify airlock electronics accesses.
...
- Fixes #6997
2014-11-18 11:40:08 +01:00
PsiOmega
6918b0bca6
Multiple Law Statements
...
Synths can now report laws on multiple channels at the same time.
2014-11-18 10:19:21 +01:00
PsiOmegaDelta
31e6c4a207
Merge pull request #7036 from Raptor1628/dev
...
ERT Fixes
2014-11-18 08:16:57 +01:00
PsiOmegaDelta
9b98d08d60
Merge pull request #7003 from mwerezak/window-fix
...
Fixes #6702 and cleanup
2014-11-18 08:15:47 +01:00
PsiOmega
080f568df2
Merge remote-tracking branch 'upstream/dev' into Pipes
2014-11-18 07:57:50 +01:00
DJSnapshot
b078365f66
vote powers r 4 admons only
2014-11-17 15:18:22 -08:00
DJSnapshot
9d5ba587ac
Mentors don't need faxes, communications, or prayers.
2014-11-17 15:08:36 -08:00
Chinsky
ff665a2cb3
Merge pull request #7039 from Amunak/beaker-fix
...
Beaker fix
2014-11-18 01:58:56 +03:00
Snapshot
92416a5a9b
Merge pull request #7029 from PsiOmegaDelta/Service
...
Dedicated Service Server
2014-11-17 14:54:15 -08:00
Mloc
aa4bbbb6de
Merge pull request #7049 from DJSnapshot/adminfeatures
...
Features requested by Headmins
2014-11-17 22:49:42 +00:00
DJSnapshot
8c5639c720
sanity checks and other cleanliness things.
2014-11-17 14:35:24 -08:00
mwerezak
438b750062
Fixes being able to hear people through space when the speaker is inside a pressurized room.
...
Moves the pressure check to the hearer's side.
2014-11-17 16:47:28 -05:00
RavingManiac
594ac35ce1
Fix for dual-vent-pumps being broken.
2014-11-17 21:33:02 +08:00
PsiOmega
5bd25f8b85
Relevant pipe fixes.
2014-11-17 12:36:00 +01:00
PsiOmega
df63c63a41
Fixes #7040 .
...
Pipes should now only be considered overlapping if they share connection types.
2014-11-17 12:27:29 +01:00
PsiOmega
e78a9c3efe
Merge remote-tracking branch 'upstream/dev' into Service
2014-11-17 12:00:01 +01:00
DJSnapshot
9c0ee5ad8a
speshul snoflake color for anyone with +everything in their admin_rank because it was requested by headmins.
2014-11-17 02:40:56 -08:00
DJSnapshot
0c84b32847
small sanity check.
2014-11-17 02:28:20 -08:00
DJSnapshot
e212b4170b
R_HOST is now a thing. Also allows gives headmins a global note remove.
2014-11-17 02:23:04 -08:00
DJSnapshot
abd3551754
headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help.
2014-11-17 01:30:21 -08:00
