From b753c2a92fa48f0f06db7ca88d196152c29859ea Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Mon, 18 Feb 2019 12:25:42 +0100
Subject: [PATCH 1/3] Holosynx Gib override and additional death flavour text
---
.../mob/living/simple_animal/animals/synx.dm | 22 +++++++++++++++++--
1 file changed, 20 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 f06ef5f879..0c385b3556 100644
--- a/code/modules/mob/living/simple_animal/animals/synx.dm
+++ b/code/modules/mob/living/simple_animal/animals/synx.dm
@@ -346,7 +346,10 @@ mob/living/simple_animal/synx/PunchTarget()
speak -= (pick(speak))//making the list more dynamic
if(resting)
resting = !resting
+ if(message=="Honk!")
+ bikehorn()
+//HONKMOTHER Code.
/mob/living/simple_animal/retaliate/synx/proc/honk()
set name = "HONK"
set desc = "TAAA RAINBOW"
@@ -354,12 +357,24 @@ mob/living/simple_animal/synx/PunchTarget()
icon_state = "synx_pet_rainbow"
icon_living = "synx_pet_rainbow"
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
+
+/mob/living/simple_animal/retaliate/synx/proc/bikehorn()
+ src.say("Honk!")
+ playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
/mob/living/simple_animal/retaliate/synx/pet/holo/death()
..()
+ visible_message("\The [src] fades away!")
var/location = get_turf(src)
new /datum/seed/hardlightseed/typesx(location)
qdel(src)
+
+/mob/living/simple_animal/retaliate/synx/pet/holo/gib()
+ visible_message("\The [src] fades away!")
+ var/location = get_turf(src)
+ new /datum/seed/hardlightseed/typesx(location)
+ qdel(src)
+
////////////////////////////////////////
////////////////SYNX VARIATIONS/////////
////////////////////////////////////////
@@ -374,11 +389,13 @@ mob/living/simple_animal/synx/PunchTarget()
icon_gib = null
alpha = 127
speak = list("SX System Online")
- faction = "Station"//Can be safely bapped with newspaper.
+ faction = "station"//Can be safely bapped with newspaper.
melee_damage_lower = 0 //Holos do no damage
melee_damage_upper = 0
environment_smash = 0
destroy_surroundings = 0
+ meat_amount = 0
+ meat_type = null
//Vore Section
vore_default_mode = DM_HEAL
vore_capacity = 2
@@ -389,7 +406,8 @@ mob/living/simple_animal/synx/PunchTarget()
swallowTime = 10 SECONDS //Much more time to run
/mob/living/simple_animal/retaliate/synx/pet/holo/New()
- set_light(3, 3, "#CC00CC") //hologram lighting
+ ..()
+ set_light(2) //hologram lighting
/mob/living/simple_animal/retaliate/synx/pet/greed
From 6e70b550a6e68dcefb8b6f99c001961645aa67d8 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Mon, 18 Feb 2019 23:53:39 +0100
Subject: [PATCH 2/3] Update synx.dm
---
code/modules/mob/living/simple_animal/animals/synx.dm | 1 -
1 file changed, 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 0c385b3556..b6aced53fd 100644
--- a/code/modules/mob/living/simple_animal/animals/synx.dm
+++ b/code/modules/mob/living/simple_animal/animals/synx.dm
@@ -359,7 +359,6 @@ mob/living/simple_animal/synx/PunchTarget()
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
/mob/living/simple_animal/retaliate/synx/proc/bikehorn()
- src.say("Honk!")
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
/mob/living/simple_animal/retaliate/synx/pet/holo/death()
From 041eed434c4cd052c340644a9ae878cf0af063ee Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 19 Feb 2019 00:04:38 +0100
Subject: [PATCH 3/3] Update synx.dm
---
code/modules/mob/living/simple_animal/animals/synx.dm | 7 -------
1 file changed, 7 deletions(-)
diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm
index b6aced53fd..48796797c1 100644
--- a/code/modules/mob/living/simple_animal/animals/synx.dm
+++ b/code/modules/mob/living/simple_animal/animals/synx.dm
@@ -391,8 +391,6 @@ mob/living/simple_animal/synx/PunchTarget()
faction = "station"//Can be safely bapped with newspaper.
melee_damage_lower = 0 //Holos do no damage
melee_damage_upper = 0
- environment_smash = 0
- destroy_surroundings = 0
meat_amount = 0
meat_type = null
//Vore Section
@@ -404,11 +402,6 @@ mob/living/simple_animal/synx/PunchTarget()
vore_escape_chance = 30 //Much higher escape chance.. it's a hologram.
swallowTime = 10 SECONDS //Much more time to run
-/mob/living/simple_animal/retaliate/synx/pet/holo/New()
- ..()
- set_light(2) //hologram lighting
-
-
/mob/living/simple_animal/retaliate/synx/pet/greed
//var/GREED_LIVING = "synx_greed_living"
//var/GREED_DEAD = "synx_greed_dead"