PsiOmega
7182ff9c3f
/tg/ input stripping.
...
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
2014-11-21 18:32:51 +01:00
PsiOmega
2a796f2ddd
Merge remote-tracking branch 'upstream/master' into dev
2014-11-21 10:27:56 +01:00
PsiOmegaDelta
350273dea4
Merge pull request #7071 from Segrain/dev
...
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
PsiOmegaDelta
34e0019dad
Merge pull request #7085 from Hubblenaut/hud
...
MedicalHUD takes hardcrit in account
2014-11-21 08:02:31 +01:00
PsiOmegaDelta
921815df04
Merge pull request #6906 from mwerezak/faxmachine
...
Fax Machines
2014-11-21 08:02:21 +01:00
PsiOmegaDelta
e3ef3b7347
Merge pull request #7081 from MagmaRam/bugfix
...
Fixes paper bundles not burning properly with a match
2014-11-21 08:02:13 +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
Hubblenaut
aeda763e81
MedicalHUD takes hardcrit in account
2014-11-20 18:42:17 +01: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
PsiOmegaDelta
1e6028b49e
Merge pull request #7055 from atlantiscze/dem-shields
...
Fixes renwick shield generators incorrectly using power
2014-11-20 15:11:33 +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
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
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
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
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
