Commit Graph

43 Commits

Author SHA1 Message Date
Jordan Brown
b188266478 Merge pull request #33709 from uraniummeltdown/linespacing
Adjustable Chat Line Height
2017-12-21 14:25:21 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)
* Adds abductor Mind Interface Devices, and a gland HUD

* .
2017-12-18 20:29:37 -06:00
AnturK
ea47d74997 Adds repeated message squashing to chat. (#33605)
* Adds repeated message squashing to chat.

* Forgot to actually use the pref

* Drops some unnecessary css

* No trimming same thing three times

* Increases size of repeats up to 24px, fixes scrolling
2017-12-17 20:45:37 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Kyle Spier-Swenson
73de2b7fe9 Changes the goonchat failed to load message since updating byond isn't needed anymore (#33474)
It was a 511 beta that caused this issue, anybody still on 511 beta is not supported, They can move up to stable
2017-12-12 22:51:21 -06:00
Dax Dupont
4b6660814a Makes sillicon chat more visible (#33222)
Made it green on black

Forgot to remove it at the bold thingy
2017-12-06 06:20:27 -06:00
deathride58
2f4c556ad8 reeeeEEEEEEEEEEEEEEE 2017-11-13 22:55:18 -05:00
Jordan Brown
de54b1cdd8 Merge pull request #32585 from Qbopper/turnitdown
adjusted default internet song volume to 25
2017-11-12 12:52:31 -06:00
Emmett Gaines
5118e6efe9 Makes isbanned have an arg for only checking real bans (#32248)
* makes isbanned have an arg for only checking real bans

* makes it return false if invalid data is passed in on a real bans check
2017-10-31 15:10:15 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
JJRcop
4ecc019353 Moved admin music volume slider to its own menu (#31277)
* Moved admin music volume slider to its own menu

* Minor fixes to goonchat
2017-10-05 02:59:52 -05:00
XDTM
9b5a2f7490 Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow 2017-09-28 16:02:31 -05:00
JJRcop
cd525c51d9 Fixes admin volume not updating datum var 2017-09-12 14:16:49 -05:00
JJRcop
00dd2f283b Adds Internet admin midi (#30457)
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
2017-09-08 09:32:29 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
7a4df41221 Remove some unused goonchat stuff (#2481) 2017-08-24 18:29:50 -07:00
Cactus
61d7ad4e82 Stylesheet and Wolves (#2389)
* organizes the mam_bodyparts file by species

* Revert "organizes the mam_bodyparts file by species"

This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.

* stylesheet fix

* wolf sprite edits

* conflict resolution

* wolf accessories readded
2017-08-18 15:35:08 -04:00
LetterJay
95cfe5baa0 Update browserOutput.dm 2017-08-15 19:48:26 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
1d4e15502a Update browserOutput.dm 2017-08-14 19:40:45 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
6ac8123117 Fixes goonchat on ie8 (#2259) 2017-08-04 08:41:33 -07:00
CitadelStationBot
365fe761a0 Makes bIcon scale to 16x16 like byond chat output did (#2238) 2017-08-03 05:59:38 -07:00
CitadelStationBot
b36b8475ff fixes goonchat css for some fonts not having proper sizes 2017-07-19 10:24:18 -05:00
CitadelStationBot
9c76e88952 [s] Fixes goonchat cookie false positives 2017-07-17 07:18:00 -05:00
ktccd
6d3123f63c Readds borers (#1999)
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot
5962b622f1 Doubles goonchat scroll snap tolerance 2017-07-06 19:20:36 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
f02411ad9e [s] Makes cookie alert private (#1865) 2017-07-03 15:14:38 -07:00
LetterJay
ec966f6814 Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750
[MIRROR] Makes goonchat robust.
2017-06-26 06:26:11 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot
0178323fe1 Makes goonchat robust. 2017-06-26 00:03:57 -05:00
LetterJay
eaa36299ae Create browserOutput.html 2017-06-22 22:24:34 -05:00
LetterJay
f81aff681b Update browserOutput.dm 2017-06-22 22:15:28 -05:00
CitadelStationBot
9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJay
9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00