Commit Graph

4760 Commits

Author SHA1 Message Date
Amunak
b21067596c The say verb will try to detect some simple errors (say msay) and warn the sender.
The sender is allowed to just send, edit or cancel their message.
2014-11-28 10:22:40 +01:00
Amunak
3e6ebe5d4c Main menu should now be big enough to not display a scrollbar. 2014-11-28 10:12:52 +01:00
Amunak
9103b98982 Cosmetic changes to the menu ready button.
It works like a toggle switch now.
2014-11-28 10:11:32 +01:00
Neerti
a84b87a1a0 Fixes potential problem of losing your module items if you get flashed. Because copypasta. 2014-11-27 21:58:36 -05:00
PsiOmega
1364de3e22 pAIs can now hide.
See http://baystation12.net/forums/viewtopic.php?f=67&t=11684.
2014-11-27 09:29:17 +01:00
PsiOmega
7a57a2f8d4 Updates the posibrain path on map. 2014-11-27 09:12:42 +01:00
PsiOmega
5b8942543b Merge remote-tracking branch 'upstream/dev' into RoboCircuit 2014-11-27 08:58:34 +01:00
PsiOmega
c14411d979 Robots can now be rebuilt after destruction.
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00
GinjaNinja32
21768e4ef1 Allow ghosts to type the parameters to Jump-to-Mob, Follow, and Teleport verbs 2014-11-26 22:39:48 +00:00
Amunak
9eccf15d00 Ghosts can now follow other ghosts
and playing admins can JMP to ghosts. Also did some minor refactoring of the dead saycode.
2014-11-26 22:52:26 +01:00
PsiOmega
23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
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
mwerezak
3246a57875 Fixes #7095 2014-11-25 18:18:39 -05: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
Zuhayr
4722c9a864 WIP on refactoring the context-based combat PR 2014-11-24 12:05:18 +10:30
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