PsiOmega
2fddc6a832
Less copy-pastah
...
Reduces copy-pasted code in the atmospheric monitor computer code.
2014-11-20 13:18:07 +01:00
Chinsky
614bb589c2
Merge pull request #7064 from PsiOmegaDelta/CanisterLogs
...
Canister Logs
2014-11-20 14:55:19 +03:00
Chinsky
3f80ee89d2
Merge pull request #6889 from PsiOmegaDelta/APC
...
BYOND akbar
2014-11-20 14:51:30 +03:00
MagmaRam
587f29e5d3
Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter.
2014-11-20 05:08:38 -05:00
Atlantiscze
78a4b424ae
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 10:55:33 +01:00
MagmaRam
72b0000f6a
Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of.
2014-11-20 00:41:43 -05:00
MagmaRam
0eed2c2fa6
Fixes the xenoarch eguns.
...
This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm
2014-11-19 22:42:58 -05:00
MagmaRam
77c883cc6d
Fixes missing icons for xenoarchaeology items EXCEPT for the energy guns.
2014-11-19 21:35:34 -05:00
Chinsky
af6a262a2c
Merge pull request #7059 from PsiOmegaDelta/Headsets
...
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
Chinsky
8015bb55f8
Merge pull request #7070 from Amunak/airalarm-fix2
...
fixed a bug that made it impossible for AIs to change air alarm sensor settings
2014-11-20 02:40:04 +03: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
Segrain
bec483aa1b
Alphabetical sorting.
2014-11-19 19:05:06 +03:00
Segrain
c4d95c39f1
Folders, fixes.
2014-11-19 18:42:34 +03:00
Segrain
a475247f11
Proper slot equipment.
2014-11-19 18:35:44 +03:00
Segrain
77ba15aea5
Slot_tie flags.
2014-11-19 18:29:51 +03:00
Amunak
05357f3850
Fixed a bug that made it impossible for AIs to change air alarm sensor settings
2014-11-19 15:56:42 +01:00
Zuhayr
ffc37dc151
Compile fix.
2014-11-20 00:41:45 +10:30
Zuhayr
b083cdf266
Additional interface work.
2014-11-20 00:31:12 +10:30
Zuhayr
b6ee53a4c3
Added integrated AI hardsuit interface verb, tweaked Topic() a bit so the AI can use it.
2014-11-20 00:22:07 +10:30
Hubblenaut
67d9af1d50
Manual Merge
2014-11-19 14:42:48 +01:00
PsiOmega
c45f77f247
Merge remote-tracking branch 'upstream/dev' into APC
2014-11-19 14:40:18 +01:00
Ccomp5950
088c86f692
Merge pull request #7065 from Zuhayr/combitool
...
Added combi-tool.
2014-11-19 08:37:15 -05:00
Zuhayr
2b4cd94650
Merge resolution.
2014-11-19 23:28:09 +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
PsiOmega
3155f3070f
Canister Logs
...
Opening a non-empty canister now produces an admin message, not only a log note on the canister itself.
2014-11-19 12:34:50 +01:00
Hubblenaut
b52aef132e
Harm Intent Unarmed Melee Changes: More diverse logs, effects
2014-11-19 11:25:15 +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
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
Atlantiscze
16685f0698
Fixes renwick shield generators incorrectly using power
...
- Shield generators now correctly use power according to actual field strength.
- Minimal shield dissipation rate now corresponds with 1 renwick field (changed from 10, which technically caused shields to always use max upkeep power ignoring field strength completely)
2014-11-18 07:34:56 +01:00
