some suggested fixes

Author: CrazyAmphibian

__DEFINES/atmos.dm

@@ -99,11 +99,3 @@
 #define MOLES_O2STANDARD_ARCTIC MOLES_ARCTICSTANDARD*O2STANDARD	//O2 standard value (21%)
 #define MOLES_N2STANDARD_ARCTIC MOLES_ARCTICSTANDARD*N2STANDARD	//N2 standard value (79%)
 
-
-//jungle map.
-#define T_JUNGLE 323 // 121.8 f / 49.85 c. it's hot out there.
-#define JUNGLE_PRESSURE 3.25*ONE_ATMOSPHERE
-#define MOLES_JUNGLE_STD (JUNGLE_PRESSURE*CELL_VOLUME/(T_JUNGLE*R_IDEAL_GAS_EQUATION)) // pressure is 3.25 atm. enough to be noticable, but not enough to be dangerous.
-#define MOLES_JUNGLE_O2_STD (MOLES_JUNGLE_STD*0.5/JUNGLE_PRESSURE/ONE_ATMOSPHERE) // 0.5 atm PP. this is to remove the possability of oxygen toxicity. not that it matters, since spessmen has magic lungs.
-#define MOLES_JUNGLE_CO2_STD 5.0 // nevermind. we are capped at 5 moles, because simplemobs base deadly co2 levels on the raw co2 mole number rather than percentage or pressure. fun.. (0.02*MOLES_JUNGLE_STD) //2% co2. this would be survivable, but you'd notice a bit of dizziness and shortness of breath. again, magic spaceman lungs. this doesn't do any gameplay effects, but is for flavor.
-#define MOLES_JUNGLE_N2_STD (MOLES_JUNGLE_STD-MOLES_JUNGLE_O2_STD-MOLES_JUNGLE_CO2_STD) // backfill the rest with N2, because there's no other inert gas.

code/controllers/subsystem/lighting.dm

@@ -33,7 +33,6 @@ var/list/lighting_update_lights_lowpriority = list() // List of lighting sources
 	CURRENT_TICKLIMIT = (real_tick_limit - world.tick_usage)/3
 	var/i = 0
 
-	//world.log << "lul: [lighting_update_lights.len] luc: [lighting_update_corners.len] luo: [lighting_update_overlays.len]  lplul: [lighting_update_lights_lowpriority.len]"
 
 	for (i in 1 to lighting_update_lights.len)
 		var/datum/light_source/L = lighting_update_lights[i]

code/datums/helper_datums/butchering.dm

@@ -288,7 +288,7 @@
 	butcher_time = 10
 
 /datum/butchering_product/frog_leg/poison
-	result = /obj/item/weapon/reagent_containers/food/snacks/frog_leg/poison
+	result = /obj/item/weapon/reagent_containers/food/snacks/meat/frog_leg_poison
 
 /datum/butchering_product/frog_leg/desc_modifier()
 	if(amount < 2)

code/datums/next_map.dm

@@ -181,7 +181,7 @@
 	min_players = 30
 
 /datum/next_map/junglestation
-	name = "NT Colony Gamma-8"
+	name = "Jungle Station" //NT Colony Gamma-8 - the trve name.
 	path = "junglestation"
 	min_players=0 //placeholders - adjust later.
 	max_players=999

code/game/turfs/unsimulated/jungle.dm

@@ -1,3 +1,14 @@
+//jungle map.
+#define T_JUNGLE 323 // 121.8 f / 49.85 c. it's hot out there.
+#define JUNGLE_PRESSURE 3.25*ONE_ATMOSPHERE
+#define MOLES_JUNGLE_STD (JUNGLE_PRESSURE*CELL_VOLUME/(T_JUNGLE*R_IDEAL_GAS_EQUATION)) // pressure is 3.25 atm. enough to be noticable, but not enough to be dangerous.
+#define MOLES_JUNGLE_O2_STD (MOLES_JUNGLE_STD*0.5/JUNGLE_PRESSURE/ONE_ATMOSPHERE) // 0.5 atm PP. this is to remove the possability of oxygen toxicity. not that it matters, since spessmen has magic lungs.
+#define MOLES_JUNGLE_CO2_STD 5.0 // nevermind. we are capped at 5 moles, because simplemobs base deadly co2 levels on the raw co2 mole number rather than percentage or pressure. fun.. (0.02*MOLES_JUNGLE_STD) //2% co2. this would be survivable, but you'd notice a bit of dizziness and shortness of breath. again, magic spaceman lungs. this doesn't do any gameplay effects, but is for flavor.
+#define MOLES_JUNGLE_N2_STD (MOLES_JUNGLE_STD-MOLES_JUNGLE_O2_STD-MOLES_JUNGLE_CO2_STD) // backfill the rest with N2, because there's no other inert gas.
+
+
+
+
 
 //floors
 
@@ -488,4 +499,11 @@ var/list/foliage_replacments=list(
 
 /turf/unsimulated/floor/jungle/bedrock/ex_act(severity)	
 	return
-	
+
+
+#undef T_JUNGLE
+#undef JUNGLE_PRESSURE
+#undef MOLES_JUNGLE_STD
+#undef MOLES_JUNGLE_O2_STD
+#undef MOLES_JUNGLE_CO2_STD
+#undef MOLES_JUNGLE_N2_STD

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -126,6 +126,7 @@
 	icon_state = "poison_dart_frog"
 	icon_living = "poison_dart_frog"
 	icon_dead = "poison_dart_frog_dead"
+	is_poisonous=TRUE
 
 /mob/living/simple_animal/hostile/lizard/frog/poison/react_to_touch(mob/M)	
 	..()

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -45,13 +45,8 @@
 	var/stance_step = 0
 
 	faction = "russian"
+	avoids_poisonous=TRUE
 
-/mob/living/simple_animal/hostile/bear/ListTargets()
-	var/list/l=..()
-	for (var/i in l) //avoid the poison frogs.
-		if(istype(i,/mob/living/simple_animal/hostile/lizard/frog/poison))
-			l-=i
-	return l
 
 /mob/living/simple_animal/hostile/bear/Destroy()
 	if(burger)

code/modules/mob/living/simple_animal/hostile/giant_spider/base_spider.dm

@@ -64,6 +64,8 @@
 	minbodytemp = 0
 	held_items = list()
 
+	avoids_poisonous=TRUE
+	
 	//keeping this here for later color matrix testing
 	var/a_matrix_testing_override = FALSE
 	var/a_11 = 1
@@ -132,14 +134,6 @@
 	return list(/datum/butchering_product/spider_legs)
 
 
-/mob/living/simple_animal/hostile/giant_spider/ListTargets()
-	var/list/l=..()
-	for (var/i in l) //avoid the poison frogs.
-		if(istype(i,/mob/living/simple_animal/hostile/lizard/frog/poison))
-			l-=i
-	return l
-
-
 //Can we actually attack a possible target?
 /mob/living/simple_animal/hostile/giant_spider/CanAttack(var/atom/the_target)
 	if(istype(the_target,/obj/machinery/light))

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -36,6 +36,7 @@
 	var/list/target_rules = list()
 
 	var/can_ventcrawl = FALSE // If the mob can ventcrawl
+	var/avoids_poisonous = FALSE
 	var/mob/living/simple_animal/hostile/asteroid/hivelord/hivelord = null
 
 /mob/living/simple_animal/hostile/New()
@@ -168,6 +169,12 @@
 	return
 
 /mob/living/simple_animal/hostile/proc/isValidTarget(var/atom/A)//we should have made that proc long ago instead of expanding CanAttack()
+	if(istype(A,/mob/living/simple_animal))
+		var/mob/living/simple_animal/SA=A
+		if(SA.is_poisonous && avoids_poisonous )
+			return FALSE
+		if(SA.pacify_aura)
+			return FALSE
 	return TRUE
 
 /mob/living/simple_animal/hostile/proc/PickTarget(var/list/Targets)//Step 3, pick amongst the possible, attackable targets

code/modules/mob/living/simple_animal/hostile/panther.dm

@@ -14,9 +14,7 @@
 	failed_geometry_class=TRUE
 	hates_fast_food=TRUE // likes fish.
 
-/mob/living/simple_animal/hostile/bear/panther/ListTargets()
-	var/list/l=..()
-	for (var/i in l) //won't attack fellow cats.
-		if(istype(i,/mob/living/simple_animal/cat) && !istype(i,/mob/living/simple_animal/cat/snek))
-			l-=i
-	return l
+
+/mob/living/simple_animal/hostile/bear/panther/isValidTarget(var/atom/A)
+	if(istype(A,/mob/living/simple_animal/cat) && !istype(A,/mob/living/simple_animal/cat/snek)) //won't attack fellow cats (like salem or runtime).
+		return FALSE

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

@@ -110,6 +110,7 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t
 	var/is_pet = FALSE //We're somebody's precious, precious pet.
 
 	var/pacify_aura = FALSE
+	var/is_poisonous = FALSE //whether certian hostile mobs will avoid this.
 
 	var/blooded = TRUE	//Until we give them proper vessels, this lets us know which animals should bleed and stuff
 	var/acidimmune = 0 //A check for whether the mob doesn't take damage from acid reagents. Set to 0 by default

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -6407,13 +6407,29 @@
 	..()
 	reagents.add_reagent(NUTRIMENT, 6)
 
-/obj/item/weapon/reagent_containers/food/snacks/frog_leg/poison
+/obj/item/weapon/reagent_containers/food/snacks/meat/frog_leg_poison
+	name = "frog leg"
+	desc = "A thick, delicious legionnaire frog leg, its taste and texture resemble chicken."
+	icon_state = "frog_leg"
+	poisonsacs=/obj/item/weapon/reagent_containers/food/snacks/frog_poison_gland
 	bitesize=6 //bigger so you still eat it in 3 bites.
 
-/obj/item/weapon/reagent_containers/food/snacks/frog_leg/poison/New()
+/obj/item/weapon/reagent_containers/food/snacks/meat/frog_leg_poison/New()
+	..()
+	reagents.add_reagent(CARPOTOXIN, 6)
+	reagents.add_reagent(TOXIN, 6)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/frog_poison_gland
+	name = "poison glands"
+	desc = "The toxin-producing glands of a poison dart frog"
+	icon_state = "toxicspine"
+/obj/item/weapon/reagent_containers/food/snacks/carppoisongland/New()
 	..()
 	reagents.add_reagent(CARPOTOXIN, 6)
 	reagents.add_reagent(TOXIN, 6)
+	bitesize = 12
+
 
 /obj/item/weapon/reagent_containers/food/snacks/pie/welcomepie
 	name = "friendship pie"