From f06f24519e57ddb71422bec3f20d7e6912a981ef Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:01:03 +0100 Subject: [PATCH 1/6] Going Clown Mode Egg. --- .../mob/living/simple_animal/animals/synx.dm | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 721530913d..f2cc6bcc01 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -193,7 +193,18 @@ mob/living/simple_animal/synx/PunchTarget() M.adjustToxLoss(-0.2) //HELP ITS MAULING ME! M.adjustFireLoss(-0.2) //huh this mauling aint so bad M.adjustHalLoss(10) //OH MY GOD END MY PAIN NOW WHO MADE THIS SIMULATION - + +/datum/reagent/inaprovaline/synxchem/clown + name = "HONK" + description = "HONK" + id = "clownsynxchem" + metabolism = REM * 0.2 //ten times faster for convenience of testers. + color = "#FFFFFF" + overdose = REAGENTS_OVERDOSE * 200 + +/datum/reagent/inaprovaline/synxchem/clown/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + /datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) if(prob(5)) @@ -224,6 +235,9 @@ mob/living/simple_animal/synx/PunchTarget() /datum/reagent/inaprovaline/synxchem/holo/overdose(var/mob/living/carbon/M, var/alien, var/removed) return +/datum/reagent/inaprovaline/synxchem/clown/overdose(var/mob/living/carbon/M, var/alien, var/removed) + return + ////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////// PASSIVE POWERS!!!! ///////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////// @@ -367,7 +381,7 @@ mob/living/simple_animal/synx/PunchTarget() contents = list("/datum/seed/hardlightseed/typesx") //Dont read this. /mob/living/simple_animal/retaliate/synx/pet/holo/New() - set_light(2, 2, "#00FFFF") //hologram lighting + set_light() //hologram lighting /mob/living/simple_animal/retaliate/synx/pet/greed @@ -402,6 +416,27 @@ mob/living/simple_animal/synx/PunchTarget() //Vore Section vore_capacity = 2 +/mob/living/simple_animal/retaliate/synx/pet/clown + poison_chance = 100 + poison_type = "clownsynxchem" //unlike synxchem this one HONKS + name = "Hardlight synx" + desc = "Honk!, made this here with all the fun on in the booth. At the gate outside, when they pull up, they get me loose. Yeah, Jump Out Clowns, that's Clown gang, hoppin' out tiny cars. This shit way too funny, when we pull up give them the honk hard!" + icon_state = "synx_pet_rainbow" + icon_living = "synx_pet_rainbow" + //icon_dead = "synx_hardlight_dead" + icon_gib = null + faction = "Clown" + melee_damage_lower = 0 + melee_damage_upper = 0 + environment_smash = 0 + destroy_surroundings = 0 + //Vore Section + vore_default_mode = DM_HEAL + vore_capacity = 10 + vore_digest_chance = 0 + vore_pounce_chance = 1 //MAKE THEM HONK + vore_bump_chance = 0 //lowered bump chance + vore_escape_chance = 100 //Much higher escape chance.. it's a hologram. //////////////////////////////////////// ////////////////SYNX SPAWNER//////////// From c4aa03cc82b7390f528400a3596ac44d57e390e6 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:11:07 +0100 Subject: [PATCH 2/6] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index f2cc6bcc01..9b12b9c410 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -203,7 +203,7 @@ mob/living/simple_animal/synx/PunchTarget() overdose = REAGENTS_OVERDOSE * 200 /datum/reagent/inaprovaline/synxchem/clown/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + playsound(M.loc, 'sound/items/bikehorn.ogg', 50, 1) /datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) From 73496ad12bcbd3ba3d48fd0b8a3b744b46290837 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:22:00 +0100 Subject: [PATCH 3/6] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 9b12b9c410..78d34326b5 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -198,12 +198,16 @@ mob/living/simple_animal/synx/PunchTarget() name = "HONK" description = "HONK" id = "clownsynxchem" - metabolism = REM * 0.2 //ten times faster for convenience of testers. + metabolism = REM * 0.5 color = "#FFFFFF" overdose = REAGENTS_OVERDOSE * 200 /datum/reagent/inaprovaline/synxchem/clown/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.adjustToxLoss(0.01) playsound(M.loc, 'sound/items/bikehorn.ogg', 50, 1) + var/location = get_turf(M) + new /obj/item/weapon/bikehorn(location) + M.custom_pain("You suddenly cough up a bikehorn!",60) /datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) @@ -378,7 +382,6 @@ mob/living/simple_animal/synx/PunchTarget() vore_bump_chance = 0 //lowered bump chance vore_escape_chance = 30 //Much higher escape chance.. it's a hologram. swallowTime = 10 SECONDS //Much more time to run - contents = list("/datum/seed/hardlightseed/typesx") //Dont read this. /mob/living/simple_animal/retaliate/synx/pet/holo/New() set_light() //hologram lighting From 50c3e935f069dd16bb5a769086cd06c6b49616ee Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:30:40 +0100 Subject: [PATCH 4/6] Honk. --- code/modules/mob/living/simple_animal/animals/synx.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 78d34326b5..04cc68ae3f 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -420,6 +420,7 @@ mob/living/simple_animal/synx/PunchTarget() vore_capacity = 2 /mob/living/simple_animal/retaliate/synx/pet/clown + hostile = true poison_chance = 100 poison_type = "clownsynxchem" //unlike synxchem this one HONKS name = "Hardlight synx" From 7af3ac187417adc80fbfc9b4a4f9d3811ebd040d Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:31:53 +0100 Subject: [PATCH 5/6] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 04cc68ae3f..305d764742 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -423,7 +423,7 @@ mob/living/simple_animal/synx/PunchTarget() hostile = true poison_chance = 100 poison_type = "clownsynxchem" //unlike synxchem this one HONKS - name = "Hardlight synx" + name = "Inflatable Clown Synx" desc = "Honk!, made this here with all the fun on in the booth. At the gate outside, when they pull up, they get me loose. Yeah, Jump Out Clowns, that's Clown gang, hoppin' out tiny cars. This shit way too funny, when we pull up give them the honk hard!" icon_state = "synx_pet_rainbow" icon_living = "synx_pet_rainbow" From c77bba2a93fcdffcc1f419edde040764a48dfc08 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 15:49:36 +0100 Subject: [PATCH 6/6] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 305d764742..db0863b72e 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -420,7 +420,7 @@ mob/living/simple_animal/synx/PunchTarget() vore_capacity = 2 /mob/living/simple_animal/retaliate/synx/pet/clown - hostile = true + hostile = 1 poison_chance = 100 poison_type = "clownsynxchem" //unlike synxchem this one HONKS name = "Inflatable Clown Synx"