From db02e873d5f7987661eb35cb0c8ba364d449e34e Mon Sep 17 00:00:00 2001 From: Markolie Date: Fri, 20 Feb 2015 20:38:57 +0100 Subject: [PATCH 1/3] Respawn as the new cargo mobs --- code/modules/mob/transform_procs.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 4910b47817c..ce0591f6bd9 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -435,6 +435,12 @@ return 1 // ZOMG PONIES WHEEE if(ispath(MP, /mob/living/simple_animal/fox)) return 1 + if(ispath(MP, /mob/living/simple_animal/chick)) + return 1 + if(ispath(MP, /mob/living/simple_animal/pug)) + return 1 + if(ispath(MP, /mob/living/simple_animal/butterfly)) + return 1 //Not in here? Must be untested! return 0 @@ -460,6 +466,12 @@ return 1 if(ispath(MP, /mob/living/simple_animal/fox)) return 1 + if(ispath(MP, /mob/living/simple_animal/chick)) + return 1 + if(ispath(MP, /mob/living/simple_animal/pug)) + return 1 + if(ispath(MP, /mob/living/simple_animal/butterfly)) + return 1 //Antag Creatures! /* if(ispath(MP, /mob/living/simple_animal/hostile/carp) && !jobban_isbanned(src, "Syndicate")) From 8e265002db382de5b18ef5e2dccac48b3837fb0d Mon Sep 17 00:00:00 2001 From: Markolie Date: Fri, 20 Feb 2015 21:07:44 +0100 Subject: [PATCH 2/3] Ensure silicons have galactic common --- code/modules/mob/living/silicon/ai/ai.dm | 1 + code/modules/mob/living/silicon/pai/pai.dm | 1 + code/modules/mob/living/silicon/robot/robot_modules.dm | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index a7fb2ada618..e343cdf4f18 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -114,6 +114,7 @@ var/list/ai_list = list() //Languages add_language("Robot Talk", 1) + add_language("Galactic Common", 1) add_language("Sol Common", 1) add_language("Tradeband", 1) add_language("Sinta'unathi", 0) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 85c15c7989a..9edeb1ed082 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -84,6 +84,7 @@ radio = card.radio //Default languages without universal translator software + add_language("Galactic Common", 1) add_language("Sol Common", 1) add_language("Tradeband", 1) add_language("Gutter", 1) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index a6b9d46f19a..78fa731e685 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -59,6 +59,7 @@ /obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R) //full set of languages + R.add_language("Galactic Common", 1) R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) R.add_language("Sinta'unathi", 0) @@ -266,6 +267,7 @@ /obj/item/weapon/robot_module/butler/add_languages(var/mob/living/silicon/robot/R) //full set of languages + R.add_language("Galactic Common", 1) R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) R.add_language("Sinta'unathi", 1) @@ -371,7 +373,7 @@ src.emag.reagents.add_reagent("pacid", 125) src.emag.reagents.add_reagent("sacid", 125) -/obj/item/weapon/robot_module/butler/add_languages(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/alien/hunter/add_languages(var/mob/living/silicon/robot/R) ..() R.add_language("xenocommon", 1) From f17c266919716368a83cb5f48657b8e9d243f17b Mon Sep 17 00:00:00 2001 From: Markolie Date: Fri, 20 Feb 2015 21:13:51 +0100 Subject: [PATCH 3/3] Fix lobby chatter --- code/modules/mob/living/say.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 51988feaf22..b5ec333f1fa 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -107,7 +107,11 @@ proc/get_radio_key_from_channel(var/channel) listening_obj |= O for(var/mob/M in player_list) - if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) + if (!M.client) + continue //skip monkeys and leavers + if (istype(M, /mob/new_player)) + continue + if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS) && src.client) // src.client is so that ghosts don't have to listen to mice listening |= M continue if(M.loc && M.locs[1] in hearturfs)