PsiOmegaDelta
921815df04
Merge pull request #6906 from mwerezak/faxmachine
...
Fax Machines
2014-11-21 08:02:21 +01:00
mwerezak
348c9d19f7
Merge remote-tracking branch 'upstream/dev' into faxmachine
...
Conflicts:
code/WorkInProgress/kilakk/fax.dm
code/modules/paperwork/faxmachine.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paper_bundle.dm
code/modules/paperwork/photocopier.dm
maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00
mwerezak
8a975fec06
Removes interdepartment fax cooldown
2014-11-20 14:36:05 -05:00
Atlantiscze
3003777b6a
Adds mwerezak's suggestions
...
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
2014-11-20 16:24:26 +01:00
Atlantiscze
b6c7454f52
Fixes possible runtime when sensor is destroyed while open in computer.
2014-11-20 14:45:12 +01:00
Atlantiscze
20571bf1ce
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 14:38:04 +01:00
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
Chinsky
3f80ee89d2
Merge pull request #6889 from PsiOmegaDelta/APC
...
BYOND akbar
2014-11-20 14:51:30 +03:00
Atlantiscze
78a4b424ae
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 10:55:33 +01: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
PsiOmega
c45f77f247
Merge remote-tracking branch 'upstream/dev' into APC
2014-11-19 14:40:18 +01:00
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
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
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
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
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
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
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
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
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
cad3c76986
Merge remote-tracking branch 'upstream/dev' into APC
2014-11-17 11:59:41 +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
mwerezak
3a83a31440
Merge remote-tracking branch 'upstream/dev' into sliceable
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
2014-11-16 22:25:50 -05:00
mwerezak
2e222523e1
Fixes inverted slicing check
2014-11-16 22:13:17 -05:00
mwerezak
72c6de26a4
Adjusts damaged stance system
2014-11-16 22:12:20 -05:00
Chinsky
ce3618a200
Merge pull request #6987 from MagmaRam/labcoat
...
Reworked labcoat buttoning
2014-11-17 04:17:16 +03:00
Chinsky
b3e2b20f91
Merge pull request #7023 from GinjaNinja32/borg_latejoin
...
Fix cyborg latejoining, allow mid-round joining, add robot cryo equivalent
2014-11-17 04:15:18 +03:00
MrSnapwalk
3efbebec14
Adds the new spacesuit sprites. Adds a less IMMULSION-BREAKING description for the syndicate spacesuit/helmet.
2014-11-16 19:05:09 -06:00
mwerezak
9eb6dfdef4
Fixes #7026
...
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
Amunak
07b050435f
fixes redundant information for a custom beaker description
2014-11-16 20:34:12 +01:00
Amunak
4a845beb7d
corrects volume shown in description of beakers
2014-11-16 20:33:25 +01:00
PsiOmega
f850b2616d
Fixes the light power consumption the new /tg/ style.
2014-11-16 11:13:27 +01:00
PsiOmega
ffbbf2b858
Merge remote-tracking branch 'upstream/dev' into APC
...
Conflicts:
code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
