master>dev

code/datums/supplypacks.dm

@@ -345,11 +345,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 
 /datum/supply_packs/weedcontrol
 	name = "Weed control crate"
-	contains = list(/obj/item/weapon/scythe,
+	contains = list(/obj/item/weapon/hatchet,
+					/obj/item/weapon/hatchet,
+					/obj/item/weapon/reagent_containers/spray/plantbgone,
+					/obj/item/weapon/reagent_containers/spray/plantbgone,
+					/obj/item/weapon/reagent_containers/spray/plantbgone,
+					/obj/item/weapon/reagent_containers/spray/plantbgone,
+					/obj/item/clothing/mask/gas,
 					/obj/item/clothing/mask/gas,
 					/obj/item/weapon/grenade/chem_grenade/antiweed,
 					/obj/item/weapon/grenade/chem_grenade/antiweed)
-	cost = 20
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure/hydrosec
 	containername = "Weed control crate"
 	access = access_hydroponics

code/modules/hydroponics/trays/tray_tools.dm

@@ -226,7 +226,7 @@
 	icon_state = "hatchet"
 	flags = CONDUCT
 	force = 12.0
-	w_class = 3.0
+	w_class = 2
 	throwforce = 15.0
 	throw_speed = 4
 	throw_range = 4
@@ -270,11 +270,3 @@
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
-
-/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity)
-	if(!proximity) return
-	if(istype(A, /obj/effect/plant))
-		for(var/obj/effect/plant/B in orange(A,1))
-			if(prob(80))
-				B.die_off(1)
-		qdel(A)

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

@@ -118,7 +118,7 @@
 	var/list/L = hearers(src, dist)
 
 	for (var/obj/mecha/M in mechas_list)
-		if (get_dist(src, M) <= dist)
+		if (M.z == src.z && get_dist(src, M) <= dist)
 			L += M
 
 	return L

nano/templates/alarm_monitor.tmpl

@@ -1,6 +1,7 @@
 <!--
 Title: Alarm Monitor Console (Main content)
 Used In File(s): \code\modules\nano\modules\alarm_monitor.dm
+"MD5 checks should be good enough"
  -->
 
 {{for data.categories}}
@@ -34,4 +35,4 @@ Used In File(s): \code\modules\nano\modules\alarm_monitor.dm
 	{{empty}}	
 		<span class="white">--All Systems Nominal</span>
 	{{/for}}
-{{/for}}
+{{/for}}

nano/templates/atmosphere_monitor.tmpl

@@ -1,37 +0,0 @@
-<!--
-Title: Alarm Monitor Console (Main content)
-Used In File(s): \code\modules\nano\modules\alarm_monitor.dm
- -->
-
-{{for data.categories}}
-	<H2><span class="itemLabelWidest">{{:value.category}}</span></H2>
-	{{for value.alarms :alarmValue:alarmIndex}}
-		{{if alarmValue.origin_lost}}
-			{{:alarmValue.name}} <span class='notice'>Alarm Origin Lost</span><br>
-		{{else}}
-			{{:alarmValue.name}}<br>
-		{{/if}}
-		{{if alarmValue.has_cameras || alarmValue.lost_sources != ""}}
-			<div class="item">
-				{{if alarmValue.has_cameras}}
-					<div class="itemContent" style="width: 100%;">	
-						{{for alarmValue.cameras :cameraValue:cameraIndex}}
-							{{if cameraValue.deact}}
-								{{:helper.link(cameraValue.name + " (deactivated)", '', {}, 'inactive')}}
-							{{else}}
-								{{:helper.link(cameraValue.name, '', {'switchTo' : cameraValue.camera})}}
-							{{/if}}
-						{{/for}}
-					</div>		
-				{{/if}}
-				{{if alarmValue.lost_sources != ""}}
-					<div class="itemContent" style="width: 100%;">
-							<H4><span class='notice'>Lost Alarm Sources: {{:alarmValue.lost_sources}}</span></H4>
-					</div>
-				{{/if}}
-			</div>
-		{{/if}}
-	{{empty}}	
-		<span class="white">--All Systems Nominal</span>
-	{{/for}}
-{{/for}}