Commit Graph

158 Commits

Author SHA1 Message Date
Xhuis
3db3acc10c Conflicts II 2016-05-17 07:13:01 -04:00
phil235
ab3e1eb32e [s] Suicides are now logged. (#17636)
* Suicides are now logged.

* Specifing job of the mob who committed suicide.
2016-05-16 22:11:23 -05:00
Xhuis
23073619a2 Conflicts III 2016-05-15 00:59:44 -04:00
Xhuis
45ef8a5e00 Ratvar, the Clockwork Justiciar 2016-05-15 00:59:28 -04:00
Leo
fd68ba31c7 Admins know 2016-04-14 15:17:10 -03:00
bawhoppen
ea3ac45f9d changes the text a little 2016-04-13 03:39:10 -05:00
Lularian
4301394703 message 2016-04-12 08:02:15 -05:00
Shadowlight213
0679db361d Fixes ooc ban 2016-03-27 23:01:19 -07:00
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -03:00
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
octareenroon91
f1c225c59f Update suicide.dm
Remove unneeded updatehealth() calls
Cleanup logic in an if statement
2016-02-11 12:47:08 -06:00
octareenroon91
ae21d76bf8 Refactor suicide
Buff the SORD: you can now do 200 damage. Of stamina damage. To yourself. By attempting suicide.
2016-02-10 15:01:08 -06:00
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