mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/objects/items/devices/radio/intercom.dm
code/modules/mob/living/silicon/pai/pai.dm
This commit is contained in:
@@ -124,7 +124,7 @@ Admin:
|
||||
//adv. hotkey mode verbs, vars located in /code/modules/client/client defines.dm
|
||||
|
||||
/client/verb/hotkey_toggle()//toggles hotkey mode between on and off, respects selected type
|
||||
set name = ".Toggle hotkey mode"
|
||||
set name = ".Toggle Hotkey Mode"
|
||||
|
||||
hotkeyon = !hotkeyon//toggle the var
|
||||
|
||||
|
||||
+9
-5
@@ -149,11 +149,11 @@ macro "AZERTYoff"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F3"
|
||||
command = "say"
|
||||
command = ".say"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F4"
|
||||
command = "me"
|
||||
command = ".me"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F5"
|
||||
@@ -347,7 +347,7 @@ macro "AZERTYon"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "T"
|
||||
command = "say"
|
||||
command = ".say"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "W"
|
||||
@@ -403,11 +403,11 @@ macro "AZERTYon"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F3"
|
||||
command = "say"
|
||||
command = ".say"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F4"
|
||||
command = "me"
|
||||
command = ".me"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F5"
|
||||
@@ -705,6 +705,10 @@ macro "hotkeymode"
|
||||
name = "CTRL+4"
|
||||
command = "a-intent harm"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "5"
|
||||
command = ".me"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "A+REP"
|
||||
command = ".west"
|
||||
|
||||
Reference in New Issue
Block a user