From 9cd7df6f6ae46524bceb054995ac39b084caccac Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sat, 11 Jan 2020 01:50:59 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=A5=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/living/simple_animal/aliens/synx.dm | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index a90c096614..fdac0e432a 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -650,9 +650,7 @@ name = "This is synxes" /obj/random/mob/synx/item_to_spawn() - if(Holiday == "April Fool's Day") //WE WISH YOU A MERRY CLOWNMAS - return /mob/living/simple_mob/retaliate/synx/pet/clown - else return pick(prob(70);/mob/living/simple_mob/retaliate/synx/pet/greed, + pick(prob(70);/mob/living/simple_mob/retaliate/synx/pet/greed, prob(50);/mob/living/simple_mob/retaliate/synx/pet/asteri, prob(20);/mob/living/simple_mob/retaliate/synx/pet/holo,) @@ -661,3 +659,32 @@ //////////////////////////////////////////////////////////////////////////// //SCP-939 //sprites to be made. +/datum/ai_holder/simple_mob/scp + hostile = TRUE // The majority of simplemobs are hostile. + retaliate = TRUE // The majority of simplemobs will fight back. + cooperative = TRUE + returns_home = FALSE + can_flee = TRUE + speak_chance = 0 // If the mob's saylist is empty, nothing will happen. + wander = TRUE + base_wander_delay = 3 + autopilot = FALSE //As the ghost in this shell you only control the voices. + wander_when_pulled = TRUE + outmatched_threshold = 100 //pussy + flee_when_outmatched = TRUE + call_distance = 100 + mauling = FALSE + vision_range = 10 //no kiting, they have ears. + use_astar = TRUE //Clever boy! + threaten = TRUE + +/mob/living/simple_mob/retaliate/synx/scp + name = "Unknown" + desc = "It's a red canine looking creature." + tt_desc = "Unknown Alien Lifeform" + ai_holder_type = /datum/ai_holder/simple_mob/scp + say_list_type = /datum/say_list/malf_drone + + //icon_state = "scp_living" + //icon_living = "scp_living" + //icon_dead = "scp_dead" From 50f1c3845f5801ddee70571b77ceb7ff6028da5c Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sat, 11 Jan 2020 01:53:41 +0100 Subject: [PATCH 2/5] Update synx.dm --- code/modules/mob/living/simple_animal/aliens/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index fdac0e432a..e13f6ae971 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -668,7 +668,7 @@ speak_chance = 0 // If the mob's saylist is empty, nothing will happen. wander = TRUE base_wander_delay = 3 - autopilot = FALSE //As the ghost in this shell you only control the voices. + autopilot = TRUE //As the ghost in this shell you only control the voices. wander_when_pulled = TRUE outmatched_threshold = 100 //pussy flee_when_outmatched = TRUE From a9b863da1d540df14696a5f716a5b1438fb6c465 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sat, 11 Jan 2020 02:00:48 +0100 Subject: [PATCH 3/5] Update synx.dm --- code/modules/mob/living/simple_animal/aliens/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index e13f6ae971..a0bda6a2e3 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -650,7 +650,7 @@ name = "This is synxes" /obj/random/mob/synx/item_to_spawn() - pick(prob(70);/mob/living/simple_mob/retaliate/synx/pet/greed, + return pick(prob(70);/mob/living/simple_mob/retaliate/synx/pet/greed, prob(50);/mob/living/simple_mob/retaliate/synx/pet/asteri, prob(20);/mob/living/simple_mob/retaliate/synx/pet/holo,) From ce745212762b203c3ffd18d5c76165193ee69205 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sat, 11 Jan 2020 09:02:25 +0100 Subject: [PATCH 4/5] Removes aster from the Pet rotation --- code/modules/mob/living/simple_animal/aliens/synx.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index a0bda6a2e3..3ed844573b 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -650,9 +650,9 @@ name = "This is synxes" /obj/random/mob/synx/item_to_spawn() - return pick(prob(70);/mob/living/simple_mob/retaliate/synx/pet/greed, - prob(50);/mob/living/simple_mob/retaliate/synx/pet/asteri, - prob(20);/mob/living/simple_mob/retaliate/synx/pet/holo,) + return pick(prob(666);/mob/living/simple_mob/retaliate/synx/pet/greed, + //prob(50);/mob/living/simple_mob/retaliate/synx/pet/asteri,//He's crew so let's remove this + prob(333);/mob/living/simple_mob/retaliate/synx/pet/holo,) //////////////////////////////////////////////////////////////////////////// //////////////////////////NOT A SYNX///////but looks kinda like one///////// From 9e1210e1938a22b21153053c889107e0341d4ff9 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sun, 12 Jan 2020 00:02:39 +0100 Subject: [PATCH 5/5] lcs --- code/modules/mob/living/simple_animal/aliens/synx.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index 3ed844573b..bcceedc012 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -657,6 +657,11 @@ //////////////////////////////////////////////////////////////////////////// //////////////////////////NOT A SYNX///////but looks kinda like one///////// //////////////////////////////////////////////////////////////////////////// +/* +Content relating to the SCP Foundation, including the SCP Foundation logo, is licensed under +Creative Commons Sharealike 3.0 and all concepts originate from http://www.scp-wiki.net and its authors. +This includes the sprites of the below Mob which are based upon SCP 939 and sprited by Riviera (not added yet) +*/ //SCP-939 //sprites to be made. /datum/ai_holder/simple_mob/scp