From 1999ffcdcdae4cfa9d8b6ed8aa0ccf8b14651fb3 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 01:46:11 +0100
Subject: [PATCH 1/9] Fixing power transmission

---
 code/modules/mob/living/silicon/robot/drone/drone.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index de3fc7278d..cbdc07d7ad 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -431,10 +431,11 @@ var/list/mob_hat_cache = list()
 	verbs |= /mob/living/proc/hide
 
 //POWER Transmission code
-/mob/living/silicon/robot/drone/proc/transmitpower(var/power=250)
+/mob/living/silicon/robot/drone/proc/transmitpower(var/power=0)
 	set category ="Robot Commands"
 	set name = "Transmit Power"
-	power = input(usr, "How much would you like to transmit? Keep in mind this is multiplied for each cell near you.", "Power Transmission", null)
+	if(!power)
+		power=250
 	if(power<=0 || power>=cell.maxcharge || power>=cell.charge) return //Safeties to not kill ourselves, also safeties to not use this to drain.
 	for(var/obj/item/weapon/cell/remotecell in range(1, src)) //assuming 1 = 1 tile next to us, if this works will lower to 0
 		if(power>=cell.charge) return //rechecking our initial safety so if we mass charge we dont die.

From d6d87caa1d0a1a217cec26477f1396e4dc519b04 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 03:30:43 +0100
Subject: [PATCH 2/9] Update tarrasque.dm

---
 .../modules/mob/living/simple_animal/animals/tarrasque.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
index e88346e4b1..44aeb48d25 100644
--- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm
+++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
@@ -104,7 +104,7 @@
 	melee_attack_minDelay = 0
 	melee_attack_maxDelay = 1
 	view_range = 420
-	size_multiplier = 1.5
+	size_multiplier = 1.2
 	icon_state = "arachnid"
 	icon_living = "arachnid"
 	//icon_dead = "arachnid_dead"
@@ -114,7 +114,7 @@
 	attacktext = list("whacks","slashes","smashes")
 	melee_damage_lower = 0 //huh not so bad
 	melee_damage_upper = 50 //oh, oh no
-	universal_speak = 1
+	universal_speak = 0
 	var/alang = LANGUAGE_GALCOM
 	armor = list(
 				"melee" = 99,
@@ -149,7 +149,8 @@
 
 /mob/living/simple_animal/hostile/tarrasque/mrx/Life()
 	..()
-	
+	if(!pixel_x)
+		pixel_x = -15
 	if(resting && !client)
 		resting = !resting
 		update_icon()
@@ -177,6 +178,7 @@
 			var/turf/simulated/wall/wall = A
 			wall.dismantle_wall(null,null,1)
 		if(isliving(A))
+			LoseTarget()
 			src.say("Run tasty treat, run~", alang,"chitters") //may hiss may not, balanced
 			var/mob/living/L = A
 			L.Weaken(5)

From 32c7b3ec9ebe5d6168eeeae6140e35c0c387b56c Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 03:32:22 +0100
Subject: [PATCH 3/9] Update tarrasque.dm

---
 code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
index 44aeb48d25..7caf08c2d8 100644
--- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm
+++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
@@ -104,7 +104,7 @@
 	melee_attack_minDelay = 0
 	melee_attack_maxDelay = 1
 	view_range = 420
-	size_multiplier = 1.2
+	size_multiplier = 1
 	icon_state = "arachnid"
 	icon_living = "arachnid"
 	//icon_dead = "arachnid_dead"

From 020f504da1dcb93af4a6360660a3b255bfed4837 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 06:16:22 +0100
Subject: [PATCH 4/9] Pitcher plants

---
 .../living/simple_animal/animals/tomato.dm    | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index d6e1373078..640d08d382 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -32,11 +32,6 @@
 	desc = "It's a plant, that eats people!"
 	tt_desc = "Packun Flower"
 
-	//remove this thing once we got our own sprites to use.
-	icon_state = "tomato"
-	icon_living = "tomato"
-	icon_dead = "tomato_dead"
-
 	faction = "plants"
 	intelligence_level = SA_PLANT
 
@@ -132,7 +127,7 @@
 	ranged = 1		// Do I attack at range?
 	shoot_range = 5		// How far away do I start shooting from?
 	view_range = 5		//More range, more hurt, more... plant?
-	rapid = 0		// Three-round-burst fire mode
+	rapid = 1		// Three-round-burst fire mode
 	firing_lines = 0	// Avoids shooting allies
 	projectiletype	= /obj/item/projectile/energy/piranhaspit	// The projectiles I shoot
 	projectilesound = 'sound/weapons/thudswoosh.ogg' // The sound I make when I do it
@@ -142,7 +137,7 @@
 /obj/item/projectile/energy/piranhaspit
 	name = "piranhaspit"
 	icon_state = "neurotoxin"
-	damage = 10
+	damage = 4 //Reduced damage to 4 from 10, 3 fired projectiles mean might do 12 total if all 3 hit
 	damage_type = TOX
 	check_armour = "bio" //yup biohazard protection works here
 	flash_strength = 0
@@ -156,6 +151,14 @@
 	filling_color = "#B8E6B5"
 	center_of_mass = list("x"=15, "y"=11)
 
+/obj/item/projectile/energy/piranhaspit/on_hit(var/atom/soyled)
+	soyl(soyled)
+	..()
+
+/obj/item/projectile/energy/piranhaspit/proc/soyl(var/mob/M)
+	var/location = get_turf(M)
+	new /obj/item/weapon/reagent_containers/food/snacks/soylentgreen/piranha(location)
+
 //VORE FLUFF section and extended gut settings
 /mob/living/simple_animal/hostile/piranhaplant/init_vore()
 	..()
@@ -166,3 +169,26 @@
 	B.digest_burn = 3
 	B.digest_brute = 3
 
+/mob/living/simple_animal/hostile/piranhaplant/pitcher
+	name = "Pitcher Plant"
+	desc = "It's a plant! How pretty"
+	tt_desc = "Brig Flower"
+	maxHealth = 500 //starts with 100
+	
+/mob/living/simple_animal/hostile/piranhaplant/pitcher/Life()
+	..()
+	if(!anchored)
+		anchored=1
+	if(vore_fullness)
+		health++
+	if(size_multiplier!=1*health/100)
+		size_multiplier=1*health/100
+		update_icon()
+
+/mob/living/simple_animal/hostile/piranhaplant/pitcher/init_vore()
+	..()
+	var/obj/belly/B = vore_selected
+	B.digest_burn = 0.5
+	B.digest_brute = 0
+	B.vore_verb = "slurped up"
+	B.name = "pitcher"

From 77900727c0248913690b9273a3be1a664b6a7af4 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 07:45:02 +0100
Subject: [PATCH 5/9] piranha nerf

Reduced armor pen, Raised flat damage, raised projectile amount, lowered projectile flat damage.
lowered Vore pounce Change, lowered health, Lowered speed.
Lowered brute digest damage, Tripled brute burn damage
---
 .../living/simple_animal/animals/tomato.dm    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index 640d08d382..665eef7b7d 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -35,8 +35,8 @@
 	faction = "plants"
 	intelligence_level = SA_PLANT
 
-	maxHealth = 100
-	health = 100
+	maxHealth = 50
+	health = 50
 	meat_type = null
 
 	//Mob icon/appearance settings
@@ -52,7 +52,7 @@
 	//Vore stuff
 	vore_active = 1
 	vore_capacity = 1
-	vore_pounce_chance = 80
+	vore_pounce_chance = 30
 	vore_standing_too = 1
 	vore_ignores_undigestable = 0
 	vore_default_mode = DM_DIGEST
@@ -66,9 +66,9 @@
 	wander = 0		// Does the mob wander around when idle?
 	wander_distance = 0	// How far the mob will wander before going home (assuming they are allowed to do that)
 	returns_home = 1	// Mob knows how to return to wherever it started
-	turns_per_move = 1	// How many life() cycles to wait between each wander mov?
+	turns_per_move = 4	// How many life() cycles to wait between each wander mov?
 	stop_when_pulled = 0 	// When set to 1 this stops the animal from moving when someone is pulling it.
-	follow_dist = 2		// Distance the mob tries to follow a friend
+	follow_dist = 0		// Distance the mob tries to follow a friend
 	speed = 4		// Higher speed is slower, negative speed is faster.
 
 	//Talk/Emote stuff
@@ -94,7 +94,7 @@
 
 	//Melee behaviour
 	melee_damage_lower = 1		// Lower bound of randomized melee damage
-	melee_damage_upper = 5		// Upper bound of randomized melee damage
+	melee_damage_upper = 10		// Upper bound of randomized melee damage
 	attacktext = list("chomped","bit","hompfed","crunched","cronched") // "You are [attacktext] by the mob!"
 	friendly = list("nuzzles")	// "The mob [friendly] the person."
 	//attack_sound = null		// Sound to play when I attack
@@ -103,7 +103,7 @@
 	melee_attack_minDelay = 5	// How long between attacks at least
 	melee_attack_maxDelay = 20	// How long between attacks at most
 	attack_armor_type = "melee"	// What armor does this check?
-	attack_armor_pen = 100		// How much armor pen this attack has.
+	attack_armor_pen = 50		// How much armor pen this attack has.
 	attack_sharp = 1		// Is the attack sharp?
 	attack_edge = 0			// Does the attack have an edge?
 
@@ -111,7 +111,7 @@
 	show_stat_health = 1	// Does the percentage health show in the stat panel for the mob
 	ai_inactive = 0 	// Set to 1 to turn off most AI actions
 	has_hands = 1		// Set to 1 to enable the use of hands and the hands hud
-	humanoid_hands = 0	// Can a player in this mob use things like guns or AI cards?
+	humanoid_hands = 1	// Can a player in this mob use things like guns or AI cards?
 	//hand_form = "hands"	// Used in IsHumanoidToolUser. 'Your X are not fit-'.
 	//hud_gears		// Slots to show on the hud (typically none)
 	//ui_icons		// Icon file path to use for the HUD, otherwise generic icons are used
@@ -125,7 +125,7 @@
 	name = "Piranha Spitter"
 	//Attack ranged settings.
 	ranged = 1		// Do I attack at range?
-	shoot_range = 5		// How far away do I start shooting from?
+	shoot_range = 6		// How far away do I start shooting from?
 	view_range = 5		//More range, more hurt, more... plant?
 	rapid = 1		// Three-round-burst fire mode
 	firing_lines = 0	// Avoids shooting allies
@@ -166,14 +166,14 @@
 	B.vore_verb = "chomp up"
 	B.name = "stomach"
 	B.desc	= "You're pulled into the tight stomach of the plant. The walls knead weakly around you, coating you in thick, viscous fluids that cling to your body, that soon starts to tingle and burn..."
-	B.digest_burn = 3
-	B.digest_brute = 3
+	B.digest_burn = 0
+	B.digest_brute = 12
 
 /mob/living/simple_animal/hostile/piranhaplant/pitcher
 	name = "Pitcher Plant"
 	desc = "It's a plant! How pretty"
 	tt_desc = "Brig Flower"
-	maxHealth = 500 //starts with 100
+	maxHealth = 500 //starts with 50
 	
 /mob/living/simple_animal/hostile/piranhaplant/pitcher/Life()
 	..()

From 9cfe0ff022e15cee093fbcb6924cf7c233b04e6e Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 07:55:45 +0100
Subject: [PATCH 6/9] Update tomato.dm

---
 code/modules/mob/living/simple_animal/animals/tomato.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index 665eef7b7d..e5e1d3de1c 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -94,7 +94,7 @@
 
 	//Melee behaviour
 	melee_damage_lower = 1		// Lower bound of randomized melee damage
-	melee_damage_upper = 10		// Upper bound of randomized melee damage
+	melee_damage_upper = 25		// Upper bound of randomized melee damage
 	attacktext = list("chomped","bit","hompfed","crunched","cronched") // "You are [attacktext] by the mob!"
 	friendly = list("nuzzles")	// "The mob [friendly] the person."
 	//attack_sound = null		// Sound to play when I attack

From 48b007578f313a139e810effe89fa6ec06b93b70 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 08:33:19 +0100
Subject: [PATCH 7/9] Update tomato.dm

---
 code/modules/mob/living/simple_animal/animals/tomato.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index e5e1d3de1c..18a8fb8345 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -52,7 +52,7 @@
 	//Vore stuff
 	vore_active = 1
 	vore_capacity = 1
-	vore_pounce_chance = 30
+	vore_pounce_chance = 10
 	vore_standing_too = 1
 	vore_ignores_undigestable = 0
 	vore_default_mode = DM_DIGEST

From 94ab5fe9590a5aa26d755f666c3db9ab125ce901 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 09:06:50 +0100
Subject: [PATCH 8/9] Update tomato.dm

---
 code/modules/mob/living/simple_animal/animals/tomato.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index 18a8fb8345..60be11702e 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -102,7 +102,7 @@
 	melee_miss_chance = 1		// percent chance to miss a melee attack.
 	melee_attack_minDelay = 5	// How long between attacks at least
 	melee_attack_maxDelay = 20	// How long between attacks at most
-	attack_armor_type = "melee"	// What armor does this check?
+	attack_armor_type = "bio"	// What armor does this check?
 	attack_armor_pen = 50		// How much armor pen this attack has.
 	attack_sharp = 1		// Is the attack sharp?
 	attack_edge = 0			// Does the attack have an edge?

From 22c3f8e651acfd806a7510b60dffefe97080a441 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Wed, 20 Mar 2019 09:11:33 +0100
Subject: [PATCH 9/9] Update tomato.dm

---
 code/modules/mob/living/simple_animal/animals/tomato.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm
index 60be11702e..1e1f9007f1 100644
--- a/code/modules/mob/living/simple_animal/animals/tomato.dm
+++ b/code/modules/mob/living/simple_animal/animals/tomato.dm
@@ -123,6 +123,7 @@
 /mob/living/simple_animal/hostile/piranhaplant/spitter
 		//might snatch the code for that uranium ray for this since it should poison
 	name = "Piranha Spitter"
+	attack_armor_pen = 0	
 	//Attack ranged settings.
 	ranged = 1		// Do I attack at range?
 	shoot_range = 6		// How far away do I start shooting from?