Chinsky
34d8298c53
Merge pull request #7143 from Amunak/paper-fix
...
The stars() proc doesn't break formatting, improved papers
2014-11-26 23:58:03 +03:00
Amunak
0ccf63bc2a
The stars() helper proc no longer breaks HTML tags
2014-11-26 16:09:48 +01:00
PsiOmegaDelta
eb679ea713
Merge pull request #7134 from Segrain/dev
...
Bugfix.
2014-11-26 14:10:03 +01:00
PsiOmegaDelta
8af4c93694
Merge pull request #7124 from mwerezak/whisper
...
Updates whispering messages
2014-11-25 10:42:31 +01:00
PsiOmega
7386a881d7
Merge remote-tracking branch 'upstream/master' into dev
2014-11-25 10:33:47 +01:00
Segrain
6e3afeac5f
Bugfix.
2014-11-25 10:29:39 +03:00
mwerezak
7174cca74a
Updates whispering messages
...
Certain languages can specify a certain verb for whispering and the
message seen when someone whispers outside of hearing range now hints at
the language.
2014-11-23 19:46:10 -05:00
mwerezak
feaa27fff1
Cleans up monkey initialization
2014-11-23 13:44:59 -05:00
PsiOmegaDelta
7dd5da6793
Merge pull request #6896 from Hubblenaut/dev
...
Context-based Combat Part 1
2014-11-23 19:13:52 +01:00
PsiOmegaDelta
8e50a32ba8
Merge pull request #7103 from Segrain/dev
...
Robotic appearances.
2014-11-23 12:05:51 +01:00
Zuhayr
f722d570fa
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-23 12:52:55 +10:30
PsiOmegaDelta
6db8680406
Merge pull request #7097 from GinjaNinja32/sensors
...
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmega
1784e62621
Merge remote-tracking branch 'upstream/dev' into Stripping
...
Conflicts:
code/modules/mob/living/carbon/human/whisper.dm
2014-11-22 11:27:19 +01:00
PsiOmegaDelta
d9aae79a32
Merge pull request #7008 from Zuhayr/spaceninjas
...
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
d0383883c2
Merge pull request #7094 from Neerti/borg_hud_port_2
...
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
2014-11-22 03:27:10 -05:00
Ccomp5950
93ac9115a5
Merge pull request #7093 from PsiOmegaDelta/Tracking
...
AI can now track people with max level sensors.
2014-11-22 03:25:59 -05:00
Ccomp5950
3ca02037ef
Merge pull request #7088 from mwerezak/skrell
...
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
Zuhayr
c8e8e663f9
Merge resolution.
2014-11-22 07:31:44 +10:30
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
Segrain
078d6f74a5
Robotic flavour texts.
2014-11-21 19:32:40 +03:00
Segrain
7f199874fb
Examining robomodules.
2014-11-21 19:28:46 +03:00
GinjaNinja32
116705b61b
Fixes wallets, makes CMC use alt-titles, actually remove dead block
2014-11-21 10:42:52 +00:00
Neerti
0379acad97
Fixes a runtime I made by improper conflict resolution.
2014-11-21 03:47:38 -05:00
Neerti
72c9b2eb15
Resolves conflicts, cherrypicks my code.
2014-11-21 03:32:00 -05:00
PsiOmega
84b36f6208
AI can now track people with max level sensors.
...
Crew members with tracking sensors enabled can now be tracked without the need of camera coverage.
2014-11-21 08:33:20 +01:00
PsiOmegaDelta
350273dea4
Merge pull request #7071 from Segrain/dev
...
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
mwerezak
d552839c0b
Fixes #7068
2014-11-20 14:23:40 -05:00
mwerezak
e6b5d4cf77
Skrell icon/appearance changes
...
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
2014-11-20 13:10:42 -05:00
Hubblenaut
aeda763e81
MedicalHUD takes hardcrit in account
2014-11-20 18:42:17 +01:00
Hubblenaut
70db4b52e8
Relocates combat log proc as a child of unarmed_attack, adds procs for
...
checking antagonists and close combat modifiers
2014-11-20 17:42:40 +01:00
Segrain
77ba15aea5
Slot_tie flags.
2014-11-19 18:29:51 +03:00
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
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
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
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
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
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
mwerezak
72c6de26a4
Adjusts damaged stance system
2014-11-16 22:12:20 -05: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
