Merge resolution with master.

code/game/objects/effects/aliens.dm

@@ -184,6 +184,7 @@
 
 	anchored = 1
 	density = 0
+	layer = 2
 	var/health = 15
 	var/obj/effect/alien/weeds/node/linked_node = null
 
@@ -191,6 +192,7 @@
 	icon_state = "weednode"
 	name = "purple sac"
 	desc = "Weird purple octopus-like thing."
+	layer = 3
 	luminosity = NODERANGE
 	var/node_range = NODERANGE
 
@@ -200,10 +202,10 @@
 
 /obj/effect/alien/weeds/New(pos, node)
 	..()
-	linked_node = node
 	if(istype(loc, /turf/space))
 		del(src)
 		return
+	linked_node = node
 	if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2")
 	spawn(rand(150, 200))
 		if(src)
@@ -230,6 +232,9 @@ Alien plants should do something if theres a lot of poison
 		del(src)
 		return
 
+	if(!linked_node || (get_dist(linked_node, src) > linked_node.node_range) )
+		return
+	
 	direction_loop:
 		for(var/dirn in cardinal)
 			var/turf/T = get_step(src, dirn)
@@ -237,9 +242,6 @@ Alien plants should do something if theres a lot of poison
 			if (!istype(T) || T.density || locate(/obj/effect/alien/weeds) in T || istype(T.loc, /area/arrival) || istype(T, /turf/space))
 				continue
 
-			if(!linked_node || get_dist(linked_node, src) > linked_node.node_range)
-				return
-
 	//		if (locate(/obj/movable, T)) // don't propogate into movables
 	//			continue
 

code/game/objects/items/toys.dm

@@ -585,4 +585,14 @@
 	force = 5
 	w_class = 4.0
 	slot_flags = SLOT_BACK
-*/
+*/
+
+//This should really be somewhere else but I don't know where. w/e
+/obj/item/weapon/inflatable_duck
+	name = "inflatable duck"
+	desc = "No bother to sink or swim when you can just float!"
+	icon_state = "inflatable"
+	item_state = "inflatable"
+	flags = FPRINT | TABLEPASS
+	icon = 'icons/obj/clothing/belts.dmi'
+	slot_flags = SLOT_BELT

code/game/objects/items/weapons/storage/belt.dm

@@ -134,12 +134,6 @@
 		"/obj/item/clothing/mask/luchador"
 		)
 
-/obj/item/weapon/storage/belt/inflatable
-	name = "inflatable duck"
-	desc = "No bother to sink or swim when you can just float!"
-	icon_state = "inflatable"
-	item_state = "inflatable"
-
 /obj/item/weapon/storage/belt/security/tactical
 	name = "combat belt"
 	desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."

code/game/objects/items/weapons/tools.dm

@@ -458,36 +458,19 @@
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
 			return ..()
 
-		if(S.brute_dam)
-			S.heal_damage(15,0,0,1)
-			if(user != M)
-				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
-				"\red You patch some dents on \the [M]'s [S.display_name]",\
-				"You hear a welder.")
-			else
-				user.visible_message("\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
-				"\red You patch some dents on your [S.display_name]",\
-				"You hear a welder.")
-			return
-
 		if(istype(M,/mob/living/carbon/human))
-
 			var/mob/living/carbon/human/H = M
-
 			if(H.species.flags & IS_SYNTHETIC)
-
-				if(H.getBruteLoss() > 0)
-
-					if(M == user)
-						user << "\red You can't repair damage to your own body - it's against OH&S."
-						return
-
-					user.visible_message("\red \The [user] patches some dents on \the [M] with \the [src]",\
-						"\red You patch some of the dents on \the [M].",\
-						"You hear a welder.")
-					H.heal_overall_damage(5,0)
+				if(M == user)
+					user << "\red You can't repair damage to your own body - it's against OH&S."
 					return
 
-		user << "Nothing to fix!"
+		if(S.brute_dam)
+			S.heal_damage(15,0,0,1)
+			user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].")
+			return
+		else
+			user << "Nothing to fix!"
+
 	else
-		return ..()
+		return ..()

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -95,3 +95,25 @@
 	else
 		user << "\red Access Denied"
 	return
+
+/obj/structure/closet/secure_closet/personal/verb/reset()
+	set src in oview(1) // One square distance
+	set category = "Object"
+	set name = "Reset Lock"
+	if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+		return
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		if (src.locked || !src.registered_name)
+			usr << "\red You need to unlock it first."
+		else if (src.broken)
+			usr << "\red It appears to be broken."
+		else
+			if (src.opened)
+				if(!src.close())
+					return
+			src.locked = 1
+			src.icon_state = src.icon_locked
+			src.registered_name = null
+			src.desc = "It's a secure locker for personnel. The first card swiped gains control."
+	return