Commit Graph

146 Commits

Author SHA1 Message Date
Firecage d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
Shadowlight213 92103ac3f4 Defines 2016-01-18 20:08:27 -08:00
Shadowlight213 6e544beb82 Fixes the Reset player OOC color verb not working 2016-01-17 21:05:32 -08:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Incoming5643 091acb5b6e Removes the |~| string work around, as apparently the problem it was fixing doesn't actually exist. 2015-12-01 11:41:40 -05:00
Incoming5643 8df0899f57 I don't think this is actually needed for whatever reason, but lets be safe. 2015-12-01 03:12:55 -05:00
Incoming 716ed77501 Changes up how OOC checks to see that you agreed that a message isn't accidental IC.
It now passes a special string, "|~|", in front of your message and runs it through OOC again. The string saves the message from further scrutiny, and is then cut off.
2015-12-01 03:07:34 -05:00
Incoming5643 c261aa30e5 adds functionality to catch dsay and asay mistakes, moves the check below things like OOC muting 2015-11-27 17:03:40 -05:00
Incoming5643 b304e6bd9a Preserves shitposting
when you type something that looks like IC in OOC you'll get a pop up that will let you actually say it if that's what you meant to do. It defaults to no so real accidental IC OOC can mash out of the command in case what they said was ";help!"
2015-11-24 22:51:31 -05:00
Incoming5643 cf2e566a00 Hashtag obscure functionality 2015-11-24 22:03:26 -05:00
Incoming 5b86fd84b0 OOC will now scrub out messages that start with . ; or : (the say channel modifiers and let the player know that they almost goofed up.
(if you want to make a fake IC in OOC joke you still can by adding a space before the message)
2015-11-24 21:54:20 -05:00
Razharas 5ba4e04027 Merge pull request #12646 from Shadowlight213/OOCban
Adds the ability to ban someone from OOC
2015-11-01 15:43:55 +03:00
Jordie 34d4a7c15f fixes ignoring not working 2015-10-27 16:10:58 +11:00
Shadowlight213 f52bb39674 Adds OOC banning 2015-10-25 00:45:48 -07:00
Jordie0608 d8cef19a05 operator, savefile and list find update 2015-10-23 18:39:29 +11:00
Jordie0608 1f1880e3f9 selective ooc muting 2015-10-23 00:41:01 +11:00
Jordie0608 e2d3488f7f database notes 2015-08-15 22:24:24 +10:00
Fayrik 07c0b5ec08 Adds "In Lobby" status, and fixes weird whitespace error. 2015-07-27 06:57:55 +01:00
Fayrik 12759e2410 Lyk dis commit if u crai errytim Fayrik gets an if statement wrong! 2015-07-27 02:41:37 +01:00
Fayrik b67068b5c5 Who is cool again. Also, observers aren't ghosts. (And I hate pointless whitespace.) 2015-07-27 02:26:59 +01:00
Firecage 2641e1a684 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Procs 2015-07-15 23:52:55 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Cheridan 9af5b96809 Merge pull request #10619 from KorPhaeron/who
Removes extra admin info from Who
2015-07-15 14:26:36 -05:00
KorPhaeron c505249765 Update who.dm 2015-07-14 06:48:11 -05:00
Jordie0608 cec7bb9837 removes debug messages 2015-07-09 00:56:06 +10:00
Jordie0608 70ae3d2134 fixes ooc autotoggle and adds loc to sprayer log 2015-07-09 00:52:19 +10:00
Ikarrus 2718af19e6 Fixes admin OOC color not using the color set in the stylesheet 2015-07-06 21:46:14 -06:00
Jordie0608 84eaa17ec9 reset ooc color buttons, changes how default color for admins is handled 2015-05-17 22:10:46 +10:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01:00
Firecage c866cd5189 This adds the ability for simple animals to commit suicide. ;) 2015-01-18 10:52:27 +02:00
Ergovisavi ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges
Adds cfg option to let players see their own notes
2014-12-27 19:25:43 -08:00
tkdrg 9d7567f46d Adds cfg option to let players see their own notes
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
2014-12-19 22:42:18 -03:00
JJRcop fa18eaa164 Renames game_options.txt OOC_EMOJIS to EMOJIS
Moves config check into emoji_parse proc, so the config affects all emoji use
2014-12-17 12:48:41 -05:00
JJRcop 8f2fab79d3 Adds emoji to OOC chat. 2014-12-17 00:10:51 -05:00
phil235 dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-12-03 18:59:32 +01:00
phil235 22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
Intigracy e9b5f83de2 Update ooc.dm
shhhh
2014-11-27 13:25:16 -08:00
Intigracy aeb96a5f0f sanitizes OOC color editing
consistency in colour vs color
2014-11-27 13:09:09 -08:00
Aranclanos ead9b2a8bb Breathing won't check anymore if the person if committed suicide.
People will be able to perform several suicides if they survived previous ones.
The examine suicide text will only appear if the person is dead.
2014-11-06 13:48:41 -03:00
tkdrg b0db18234f Makes pull into a mob verb. 2014-10-27 12:28:06 -03:00
tkdrg b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Jordie0608 4761e02904 Maybe i should make sure the code complies before pushing it next time 2014-05-13 02:32:56 +10:00
Jordie0608 4078973a5c Unidentinization 2014-05-13 02:18:21 +10:00
Giacomand c67334c929 Added a configuration option that disables OOC during the round automatically. Defaults to allowing OOC during the round. 2014-04-05 19:41:47 +01:00