Commit Graph

4571 Commits

Author SHA1 Message Date
Zuhayr
14cf4aa8e3 Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc 2014-12-01 00:37:13 +10:30
Chinsky
366badb706 Merge pull request #7165 from PsiOmegaDelta/Joining
Late-Join Name Addition.
2014-11-30 00:56:42 +03:00
Chinsky
99cf1ee8f5 Merge pull request #7166 from PsiOmegaDelta/TurfClick
Fixes AIs seeing runes in the Alt+Click panel
2014-11-30 00:56:25 +03:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
2014-11-29 16:07:35 +01:00
PsiOmegaDelta
2899bb31af Merge pull request #7157 from Neerti/11_27_04_borginventory_quickfix
Fixes potential problem of losing your module items if you get flashed. ...
2014-11-29 09:49:02 +01:00
PsiOmegaDelta
4c476e70ce Merge pull request #7149 from GinjaNinja32/ghostparam
Allow ghosts to type the parameters to Jump-to-Mob, Follow, and Teleport
2014-11-29 09:48:55 +01:00
Amunak
95032936ce Separated pAI and posibrain candidacy, fixed their jobbans.
You can now toggle special role candidacy for pAIs and Positronic Brains separately. A pAI jobban will now display correctly.  People will be banned from posibrain if they have a jobban on both AI and Cyborg (this is reflected in the character creation GUI as well). Using 'never for this round' on the pAI popup is no longer irreversible.
2014-11-29 00:31:27 +01:00
PsiOmega
2f739975db Late-Join Name Addition.
When late-joining the name of the currently loaded slot is shown at the top of the job selection screen.
2014-11-28 20:31:26 +01:00
PsiOmega
fe493c4282 Fixes AIs seeing runes in the Alt+Click panel
See https://github.com/tgstation/-tg-station/pull/6126.
2014-11-28 19:36:27 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it.
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
2014-11-28 13:05:26 +01:00
Amunak
93b195d78d Fixed a bug that prevented from joining as posibrain. 2014-11-28 13:04:23 +01:00
Amunak
3a5d89a47f Revert "Fixed a bug that prevented people joining as posibrain"
This reverts commit 643bac47cb.
2014-11-28 12:59:23 +01:00
Amunak
643bac47cb Fixed a bug that prevented people joining as posibrain 2014-11-28 12:50:52 +01:00
Amunak
44e67b3f53 Posibrain candidates will now be asked twice if they want to join the game 2014-11-28 12:41:31 +01:00
Amunak
2750092045 The analyze-air verb now shows temperature in Kelvins in addition to degrees Celsius. 2014-11-28 12:24:59 +01:00
Amunak
4da6eeb82b Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags 2014-11-28 12:23:59 +01:00
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
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
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