Merge pull request #7 from CHOMPstation/master

MERGE MASTER

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.

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
 	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)

code/modules/mob/living/simple_animal/animals/tomato.dm

@@ -32,16 +32,11 @@
 	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
 
-	maxHealth = 100
-	health = 100
+	maxHealth = 50
+	health = 50
 	meat_type = null
 
 	//Mob icon/appearance settings
@@ -57,7 +52,7 @@
 	//Vore stuff
 	vore_active = 1
 	vore_capacity = 1
-	vore_pounce_chance = 80
+	vore_pounce_chance = 10
 	vore_standing_too = 1
 	vore_ignores_undigestable = 0
 	vore_default_mode = DM_DIGEST
@@ -71,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
@@ -99,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 = 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
@@ -107,8 +102,8 @@
 	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_pen = 100		// How much armor pen this attack has.
+	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?
 
@@ -116,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
@@ -128,11 +123,12 @@
 /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 = 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 = 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 +138,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 +152,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()
 	..()
@@ -163,6 +167,29 @@
 	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 50
+	
+/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"