diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 3e1f82f98f9..5f45dc41aaa 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -26,7 +26,7 @@ if(!target) return - if(target.type in compatible_mobs || ishuman(target)) + if((target.type in compatible_mobs) || ishuman(target)) user << "It'd be stupid to curse [target] with a horse's head!" return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 52bfd6b4680..e4ac28952b0 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -117,6 +117,7 @@ var/list/ai_list = list() add_language("Galactic Common", 1) add_language("Sol Common", 1) add_language("Tradeband", 1) + add_language("Gutter", 0) add_language("Sinta'unathi", 0) add_language("Siik'tajr", 0) add_language("Skrellian", 0) @@ -125,7 +126,7 @@ var/list/ai_list = list() add_language("Trinary", 1) add_language("Chittin", 0) add_language("Bubblish", 0) - add_language("Gutter", 0) + add_language("Clownish", 0) if(!safety)//Only used by AIize() to successfully spawn an AI. if (!B)//If there is no player/brain inside. diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index b6dd9e64ce8..a663ae6a738 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -704,6 +704,7 @@ remove_language("Trinary") remove_language("Chittin") remove_language("Bubblish") + remove_language("Clownish") src << "\blue Translator Module toggled OFF." @@ -718,5 +719,6 @@ add_language("Trinary") add_language("Chittin") add_language("Bubblish") + add_language("Clownish") src << "\blue Translator Module toggled ON." \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0ac77e3d739..223f09daaa0 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -62,6 +62,7 @@ R.add_language("Galactic Common", 1) R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) + R.add_language("Gutter", 0) R.add_language("Sinta'unathi", 0) R.add_language("Siik'tajr", 0) R.add_language("Skrellian", 0) @@ -70,7 +71,7 @@ R.add_language("Trinary", 1) R.add_language("Chittin", 0) R.add_language("Bubblish", 0) - R.add_language("Gutter", 0) + R.add_language("Clownish",0) /obj/item/weapon/robot_module/standard name = "standard robot module" @@ -270,6 +271,7 @@ R.add_language("Galactic Common", 1) R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) + R.add_language("Gutter", 1) R.add_language("Sinta'unathi", 1) R.add_language("Siik'tajr", 1) R.add_language("Skrellian", 1) @@ -278,7 +280,7 @@ R.add_language("Trinary", 1) R.add_language("Chittin", 1) R.add_language("Bubblish", 1) - R.add_language("Gutter", 1) + R.add_language("Clownish",1) /* /obj/item/weapon/robot_module/clerical //Whyyyyy? diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 3d2db2468af..17bbf565dfd 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -46,7 +46,8 @@ spray(A) playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) - + user.changeNext_move(CLICK_CD_RANGE*2) + if(reagents.has_reagent("sacid")) message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].") log_game("[key_name(user)] fired sulphuric acid from \a [src].") diff --git a/interface/skin.dmf b/interface/skin.dmf index 43b7d523b66..ba3bee45bc9 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -585,7 +585,7 @@ macro "macro" is-disabled = false elem name = "F4" - command = "me" + command = ".me" is-disabled = false elem name = "F5" @@ -843,7 +843,7 @@ macro "hotkeymode" is-disabled = false elem name = "F4" - command = "me" + command = ".me" is-disabled = false elem name = "F5" diff --git a/paradise.dme b/paradise.dme index 4dc32c86dca..a60078bd76c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -189,7 +189,7 @@ #include "code\controllers\Processes\obj.dm" #include "code\controllers\Processes\pipenet.dm" #include "code\controllers\Processes\powernet.dm" -#include "code\controllers\Processes\Shuttle.dm" +#include "code\controllers\Processes\shuttle.dm" #include "code\controllers\Processes\sun.dm" #include "code\controllers\Processes\supply.dm" #include "code\controllers\Processes\ticker.dm"