Merge polaris sync 01 17 2018

Planes, layers, human/update_icon()

code/game/objects/items/devices/communicator/UI.dm

@@ -108,6 +108,7 @@
 	data["note"] = note					// current notes
 	data["weather"] = weather
 	data["aircontents"] = src.analyze_air()
+	data["flashlight"] = fon
 	data["injection"] = injection
 
 	// update the ui if it exists, returns null if no ui is passed/found
@@ -245,5 +246,9 @@
 			note = ""
 			notehtml = note
 
+	if(href_list["Light"])
+		fon = !fon
+		set_light(fon * flum)
+
 	nanomanager.update_uis(src)
 	add_fingerprint(usr)

code/game/objects/items/devices/communicator/communicator.dm

@@ -32,6 +32,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	var/notehtml = ""
 
 	var/obj/item/weapon/cartridge/cartridge = null //current cartridge
+	var/fon = 0 // Internal light
+	var/flum = 2 // Brightness
+
 	var/list/modules = list(
 							list("module" = "Phone", "icon" = "phone64", "number" = 2),
 							list("module" = "Contacts", "icon" = "person64", "number" = 3),

code/game/objects/items/devices/flashlight.dm

@@ -321,7 +321,7 @@
 	w_class = ITEMSIZE_SMALL
 	brightness_on = 8 // Pretty bright.
 	light_power = 3
-	light_color = "#e58775"
+	light_color = LIGHT_COLOR_FLARE
 	icon_state = "flare"
 	item_state = "flare"
 	action_button_name = null //just pull it manually, neckbeard.

code/game/objects/items/devices/gps.dm

@@ -195,7 +195,7 @@ var/list/GPS_list = list()
 	tracking = TRUE // On by default.
 
 /obj/item/device/gps/internal // Base type for immobile/internal GPS units.
-	icon_state = null
+	icon_state = "internal"
 	gps_tag = "Eerie Signal"
 	desc = "Report to a coder immediately."
 	invisibility = INVISIBILITY_MAXIMUM

code/game/objects/items/devices/multitool.dm

@@ -44,4 +44,4 @@
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "multitool"
 	toolspeed = 0.1
-	origin_tech = list(TECH_MAGNETS = 5, TECH_ENGINEERING = 5)
+	origin_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 5)

code/game/objects/items/devices/uplink.dm

@@ -19,13 +19,15 @@
 /obj/item/device/uplink/nano_host()
 	return loc
 
-/obj/item/device/uplink/New(var/location, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
+/obj/item/device/uplink/New(var/location, var/datum/mind/owner = null, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
 	..()
-	if(owner) //VOREStation Edit - Owner optional
-		src.uplink_owner = owner
-		uses = owner.tcrystals
+	src.uplink_owner = owner
 	purchase_log = list()
 	world_uplinks += src
+	if(owner)
+		uses = owner.tcrystals
+	else
+		uses = telecrystals
 	processing_objects += src
 
 /obj/item/device/uplink/Destroy()

code/game/objects/items/stacks/marker_beacons.dm

@@ -0,0 +1,138 @@
+/*****************Marker Beacons**************************/
+var/list/marker_beacon_colors = list(
+"Random" = FALSE, //not a true color, will pick a random color
+"Burgundy" = LIGHT_COLOR_FLARE,
+"Bronze" = LIGHT_COLOR_ORANGE,
+"Yellow" = LIGHT_COLOR_YELLOW,
+"Lime" = LIGHT_COLOR_SLIME_LAMP,
+"Olive" = LIGHT_COLOR_GREEN,
+"Jade" = LIGHT_COLOR_BLUEGREEN,
+"Teal" = LIGHT_COLOR_LIGHT_CYAN,
+"Cerulean" = LIGHT_COLOR_BLUE,
+"Indigo" = LIGHT_COLOR_DARK_BLUE,
+"Purple" = LIGHT_COLOR_PURPLE,
+"Violet" = LIGHT_COLOR_LAVENDER,
+"Fuchsia" = LIGHT_COLOR_PINK
+)
+
+/obj/item/stack/marker_beacon
+	name = "marker beacons"
+	singular_name = "marker beacon"
+	desc = "Prismatic path illumination devices. Used by explorers and miners to mark paths and warn of danger."
+	description_info = "Use inhand to drop one marker beacon. You can pick them up again with an empty hand or \
+	hitting them with this marker stack. Alt-click to select a specific color."
+	icon = 'icons/obj/lighting.dmi'
+	icon_state = "marker"
+	max_amount = 100
+	no_variants = TRUE
+	var/picked_color = "random"
+
+/obj/item/stack/marker_beacon/ten
+	amount = 10
+
+/obj/item/stack/marker_beacon/thirty
+	amount = 30
+
+/obj/item/stack/marker_beacon/hundred
+	amount = 100
+
+/obj/item/stack/marker_beacon/initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/stack/marker_beacon/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Use in-hand to place a [singular_name].</span>")
+	to_chat(user, "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>")
+
+/obj/item/stack/marker_beacon/update_icon()
+	icon_state = "[initial(icon_state)][lowertext(picked_color)]"
+
+/obj/item/stack/marker_beacon/attack_self(mob/user)
+	if(!isturf(user.loc))
+		to_chat(user, "<span class='warning'>You need more space to place a [singular_name] here.</span>")
+		return
+	if(locate(/obj/structure/marker_beacon) in user.loc)
+		to_chat(user, "<span class='warning'>There is already a [singular_name] here.</span>")
+		return
+	if(use(1))
+		to_chat(user, "<span class='notice'>You activate and anchor [amount ? "a":"the"] [singular_name] in place.</span>")
+		playsound(user, 'sound/machines/click.ogg', 50, 1)
+		var/obj/structure/marker_beacon/M = new(user.loc, picked_color)
+		transfer_fingerprints_to(M)
+
+/obj/item/stack/marker_beacon/AltClick(mob/living/user)
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(!in_range(src, user))
+		return
+	var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in marker_beacon_colors
+	if(user.incapacitated() || !istype(user) || !in_range(src, user))
+		return
+	if(input_color)
+		picked_color = input_color
+		update_icon()
+
+/obj/structure/marker_beacon
+	name = "marker beacon"
+	desc = "A prismatic path illumination device. It is anchored in place and glowing steadily."
+	icon = 'icons/obj/lighting.dmi'
+	icon_state = "marker"
+//	layer = BELOW_OPEN_DOOR_LAYER
+	anchored = TRUE
+	light_range = 2
+	light_power = 3
+	var/remove_speed = 15
+	var/picked_color
+
+/obj/structure/marker_beacon/New(newloc, set_color)
+	. = ..()
+	picked_color = set_color
+	update_icon()
+
+/obj/structure/marker_beacon/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>")
+
+/obj/structure/marker_beacon/update_icon()
+	while(!picked_color || !marker_beacon_colors[picked_color])
+		picked_color = pick(marker_beacon_colors)
+	icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
+	set_light(light_range, light_power, marker_beacon_colors[picked_color])
+
+/obj/structure/marker_beacon/attack_hand(mob/living/user)
+	to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
+	if(do_after(user, remove_speed, target = src))
+		var/obj/item/stack/marker_beacon/M = new(loc)
+		M.picked_color = picked_color
+		M.update_icon()
+		transfer_fingerprints_to(M)
+		if(user.put_in_hands(M, TRUE)) //delete the beacon if it fails
+			playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
+			qdel(src) //otherwise delete us
+
+/obj/structure/marker_beacon/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/stack/marker_beacon))
+		var/obj/item/stack/marker_beacon/M = I
+		to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
+		if(do_after(user, remove_speed, target = src) && M.amount + 1 <= M.max_amount)
+			M.add(1)
+			playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
+			qdel(src)
+	else
+		return ..()
+
+/obj/structure/marker_beacon/AltClick(mob/living/user)
+	..()
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(!in_range(src, user))
+		return
+	var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in marker_beacon_colors
+	if(user.incapacitated() || !istype(user) || !in_range(src, user))
+		return
+	if(input_color)
+		picked_color = input_color
+		update_icon()

code/game/objects/items/stacks/sheets/leather.dm

@@ -101,9 +101,8 @@
 //Step one - dehairing.
 /obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(	istype(W, /obj/item/weapon/material/knife) || \
-		istype(W, /obj/item/weapon/material/kitchen/utensil/knife) || \
 		istype(W, /obj/item/weapon/material/twohanded/fireaxe) || \
-		istype(W, /obj/item/weapon/material/hatchet) )
+		istype(W, /obj/item/weapon/material/knife/machete/hatchet) )
 
 		//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
 		usr.visible_message("<span class='notice'>\The [usr] starts cutting hair off \the [src]</span>", "<span class='notice'>You start cutting the hair off \the [src]</span>", "You hear the sound of a knife rubbing against flesh")

code/game/objects/items/weapons/material/chainsaw.dm

@@ -1,19 +1,29 @@
 obj/item/weapon/chainsaw
-	name = "Chainsaw"
+	name = "chainsaw"
 	desc = "Vroom vroom."
 	icon_state = "chainsaw0"
+	item_state = "chainsaw0"
 	var/on = 0
 	var/max_fuel = 20
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
+	var/active_force = 55
+	var/inactive_force = 10
 
 obj/item/weapon/chainsaw/New()
 	var/datum/reagents/R = new/datum/reagents(max_fuel)
 	reagents = R
 	R.my_atom = src
 	R.add_reagent("fuel", max_fuel)
+	processing_objects |= src
+	..()
+
+obj/item/weapon/chainsaw/Destroy()
+	processing_objects -= src
+	if(reagents)
+		qdel(reagents)
 	..()
 
 obj/item/weapon/chainsaw/proc/turnOn()
@@ -31,7 +41,7 @@ obj/item/weapon/chainsaw/proc/turnOn()
 			visible_message("You start \the [src] up with a loud grinding!", "[usr] starts \the [src] up with a loud grinding!")
 			attack_verb = list("shreds", "rips", "tears")
 			playsound(src, 'sound/weapons/chainsaw_startup.ogg',40,1)
-			force = 55
+			force = active_force
 			edge = 1
 			sharp = 1
 			on = 1
@@ -44,7 +54,7 @@ obj/item/weapon/chainsaw/proc/turnOff()
 	to_chat(usr, "You switch the gas nozzle on the chainsaw, turning it off.")
 	attack_verb = list("bluntly hit", "beat", "knocked")
 	playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1)
-	force = 10
+	force = inactive_force
 	edge = 0
 	sharp = 0
 	on = 0
@@ -87,12 +97,13 @@ obj/item/weapon/chainsaw/process()
 	if(on)
 		if(get_fuel() > 0)
 			reagents.remove_reagent("fuel", 1)
+			playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1)
 		if(get_fuel() <= 0)
 			to_chat(usr, "\The [src] sputters to a stop!")
-			on = !on
+			turnOff()
 
 obj/item/weapon/chainsaw/proc/get_fuel()
-	reagents.get_reagent_amount("fuel")
+	return reagents.get_reagent_amount("fuel")
 
 obj/item/weapon/chainsaw/examine(mob/user)
 	if(..(user,0))
@@ -109,4 +120,4 @@ obj/item/weapon/chainsaw/update_icon()
 		item_state = "chainsaw1"
 	else
 		icon_state = "chainsaw0"
-		icon_state = "chainsaw0"
+		item_state = "chainsaw0"

code/game/objects/items/weapons/material/kitchen.dm

@@ -78,16 +78,10 @@
 /*
  * Knives
  */
-/obj/item/weapon/material/kitchen/utensil/knife
-	name = "knife"
-	desc = "A knife for eating with. Can cut through any food."
-	icon_state = "knife"
-	force_divisor = 0.1 // 6 when wielded with hardness 60 (steel)
-	scoop_food = 0
 
 // Identical to the tactical knife but nowhere near as stabby.
 // Kind of like the toy esword compared to the real thing.
-/obj/item/weapon/material/kitchen/utensil/knife/boot
+/obj/item/weapon/material/knife/boot
 	name = "boot knife"
 	desc = "A small fixed-blade knife for putting inside a boot."
 	icon = 'icons/obj/weapons.dmi'
@@ -95,14 +89,15 @@
 	item_state = "knife"
 	applies_material_colour = 0
 
-/obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
+/* From the time of Clowns. Commented out for posterity, and sanity.
+/obj/item/weapon/material/knife/attack(target as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << "<span class='warning'>You accidentally cut yourself with \the [src].</span>"
 		user.take_organ_damage(20)
 		return
 	return ..()
-
-/obj/item/weapon/material/kitchen/utensil/knife/plastic
+*/
+/obj/item/weapon/material/knife/plastic
 	default_material = "plastic"
 
 /*

code/game/objects/items/weapons/material/knives.dm

@@ -87,17 +87,30 @@
 
 /obj/item/weapon/material/knife/butch
 	name = "butcher's cleaver"
-	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "butch"
 	desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
 	force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
-/obj/item/weapon/material/hatchet/tacknife/survival
+/obj/item/weapon/material/knife/machete
+	name = "machete"
+	desc = "A sharp machete often found in survival kits."
+	icon_state = "machete"
+	force_divisor = 0.3 // 20 when hardness 60 (steel)
+	attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
+	var/should_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
+
+// This cannot go into afterattack since some mobs delete themselves upon dying.
+/obj/item/weapon/material/knife/machete/pre_attack(var/mob/living/target, var/mob/living/user)
+	if(should_cleave && istype(target))
+		cleave(user, target)
+	..()
+
+/obj/item/weapon/material/knife/tacknife/survival
 	name = "survival knife"
 	desc = "A hunting grade survival knife."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "survivalknife"
 	item_state = "knife"
 	applies_material_colour = FALSE
-	should_cleave = FALSE
+	toolspeed = 2 // Use a real axe if you want to chop logs.

code/game/objects/items/weapons/material/misc.dm

@@ -19,7 +19,7 @@
 	attack_verb = list("punched", "beaten", "struck")
 	applies_material_colour = 0
 
-/obj/item/weapon/material/hatchet
+/obj/item/weapon/material/knife/machete/hatchet
 	name = "hatchet"
 	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
 	icon = 'icons/obj/weapons.dmi'
@@ -32,15 +32,8 @@
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
 	attack_verb = list("chopped", "torn", "cut")
 	applies_material_colour = 0
-	var/should_cleave = TRUE // Because knives inherit from hatchets. For some reason.
 
-// This cannot go into afterattack since some mobs delete themselves upon dying.
-/obj/item/weapon/material/hatchet/pre_attack(var/mob/living/target, var/mob/living/user)
-	if(should_cleave && istype(target))
-		cleave(user, target)
-	..()
-
-/obj/item/weapon/material/hatchet/unathiknife
+/obj/item/weapon/material/knife/machete/hatchet/unathiknife
 	name = "duelling knife"
 	desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude."
 	icon = 'icons/obj/weapons.dmi'
@@ -49,23 +42,23 @@
 	should_cleave = FALSE
 	var hits = 0
 
-/obj/item/weapon/material/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob)
 	if(hits > 0)
 		return
 	var/obj/item/I = user.get_inactive_hand()
-	if(istype(I, /obj/item/weapon/material/hatchet/unathiknife))
+	if(istype(I, /obj/item/weapon/material/knife/machete/hatchet/unathiknife))
 		hits ++
 		var/obj/item/weapon/W = I
 		W.attack(M, user)
 		W.afterattack(M, user)
 	..()
 
-/obj/item/weapon/material/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/material/knife/machete/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob)
 	hits = initial(hits)
 	..()
 
 // These probably shouldn't inherit from hatchets.
-/obj/item/weapon/material/hatchet/tacknife
+/obj/item/weapon/material/knife/tacknife
 	name = "tactical knife"
 	desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Space."
 	icon = 'icons/obj/weapons.dmi'
@@ -73,9 +66,8 @@
 	item_state = "knife"
 	attack_verb = list("stabbed", "chopped", "cut")
 	applies_material_colour = 1
-	should_cleave = FALSE
 
-/obj/item/weapon/material/hatchet/tacknife/combatknife
+/obj/item/weapon/material/knife/tacknife/combatknife
 	name = "combat knife"
 	desc = "If only you had a boot to put it in."
 	icon = 'icons/obj/weapons.dmi'
@@ -85,7 +77,6 @@
 	thrown_force_divisor = 1.75 // 20 with weight 20 (steel)
 	attack_verb = list("sliced", "stabbed", "chopped", "cut")
 	applies_material_colour = 1
-	should_cleave = FALSE
 
 /obj/item/weapon/material/minihoe // -- Numbers
 	name = "mini hoe"

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

@@ -52,7 +52,7 @@
 		/obj/item/device/radio/headset,
 		/obj/item/device/robotanalyzer,
 		/obj/item/weapon/material/minihoe,
-		/obj/item/weapon/material/hatchet,
+		/obj/item/weapon/material/knife/machete/hatchet,
 		/obj/item/device/analyzer/plant_analyzer,
 		/obj/item/weapon/extinguisher/mini,
 		/obj/item/weapon/tape_roll,
@@ -160,6 +160,7 @@
 		/obj/item/weapon/melee,
 		/obj/item/clothing/accessory/badge,
 		/obj/item/weapon/gun/projectile/sec,
+		/obj/item/weapon/gun/projectile/p92x,
 		/obj/item/taperoll,
 		/obj/item/weapon/gun/projectile/colt/detective
 		)

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

@@ -169,7 +169,7 @@
 
 /obj/item/weapon/storage/box/syndie_kit/g9mm
 	name = "\improper Smooth operator"
-	desc = "9mm with silencer kit."
+	desc = "Compact 9mm with silencer kit."
 
 /obj/item/weapon/storage/box/syndie_kit/g9mm/New()
 	..()

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

@@ -7,6 +7,9 @@ var/list/global/tank_gauge_cache = list()
 /obj/item/weapon/tank
 	name = "tank"
 	icon = 'icons/obj/tank.dmi'
+	sprite_sheets = list(
+		"Teshari" = 'icons/mob/species/seromi/back.dmi'
+		)
 
 	var/gauge_icon = "indicator_tank"
 	var/last_gauge_pressure

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

@@ -45,7 +45,7 @@
 	icon_state = "wrench"
 	usesound = 'sound/effects/empulse.ogg'
 	toolspeed = 0.1
-	origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEER = 5)
+	origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5)
 
 /obj/item/weapon/wrench/power
 	name = "hand drill"
@@ -989,9 +989,9 @@
 		/obj/item/weapon/screwdriver,
 		/obj/item/weapon/wrench,
 		/obj/item/weapon/wirecutters,
-		/obj/item/weapon/material/kitchen/utensil/knife,
+		/obj/item/weapon/material/knife,
 		/obj/item/weapon/material/kitchen/utensil/fork,
-		/obj/item/weapon/material/hatchet
+		/obj/item/weapon/material/knife/machete/hatchet
 		)
 	var/list/tools = list()
 	var/current_tool = 1
@@ -1036,4 +1036,4 @@
 	if(tool)
 		tool.loc = src*/
 
-#undef WELDER_FUEL_BURN_INTERVAL
+#undef WELDER_FUEL_BURN_INTERVAL

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

@@ -42,14 +42,16 @@
 			anchored = 1
 
 /obj/item/weapon/beartrap/attack_hand(mob/user as mob)
-	if(buckled_mob && can_use(user))
+	if(has_buckled_mobs() && can_use(user))
+		var/victim = english_list(buckled_mobs)
 		user.visible_message(
-			"<span class='notice'>[user] begins freeing [buckled_mob] from \the [src].</span>",
-			"<span class='notice'>You carefully begin to free [buckled_mob] from \the [src].</span>",
+			"<span class='notice'>[user] begins freeing [victim] from \the [src].</span>",
+			"<span class='notice'>You carefully begin to free [victim] from \the [src].</span>",
 			)
 		if(do_after(user, 60))
-			user.visible_message("<span class='notice'>[buckled_mob] has been freed from \the [src] by [user].</span>")
-			unbuckle_mob()
+			user.visible_message("<span class='notice'>[victim] has been freed from \the [src] by [user].</span>")
+			for(var/A in buckled_mobs)
+				unbuckle_mob(A)
 			anchored = 0
 	else if(deployed && can_use(user))
 		user.visible_message(
@@ -109,7 +111,7 @@
 				"<b>You hear a loud metallic snap!</b>"
 				)
 			attack_mob(L)
-			if(!buckled_mob)
+			if(!has_buckled_mobs())
 				anchored = 0
 			deployed = 0
 			update_icon()

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

@@ -111,39 +111,41 @@
 	processing_objects |= src
 
 /obj/effect/energy_net/Destroy()
-	if(buckled_mob)
-		to_chat(buckled_mob,"<span class='notice'>You are free of the net!</span>")
-		unbuckle_mob()
+	if(has_buckled_mobs())
+		for(var/A in buckled_mobs)
+			to_chat(A,"<span class='notice'>You are free of the net!</span>")
+			unbuckle_mob(A)
 
 	processing_objects -= src
 	return ..()
 
 /obj/effect/energy_net/process()
-	if(isnull(buckled_mob) || buckled_mob.loc != loc)
+	if(!has_buckled_mobs())
 		qdel(src)
 
 /obj/effect/energy_net/Move()
 	..()
-	if(buckled_mob)
-		var/mob/living/occupant = buckled_mob
-		occupant.buckled = null
-		occupant.forceMove(src.loc)
-		occupant.buckled = src
-		if (occupant && (src.loc != occupant.loc))
-			unbuckle_mob()
-			qdel(src)
+	if(has_buckled_mobs())
+		for(var/A in buckled_mobs)
+			var/mob/living/occupant = A
+			occupant.buckled = null
+			occupant.forceMove(src.loc)
+			occupant.buckled = src
+			if (occupant && (src.loc != occupant.loc))
+				unbuckle_mob(occupant)
+				qdel(src)
 
-/obj/effect/energy_net/user_unbuckle_mob(mob/user)
+/obj/effect/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
 	user.setClickCooldown(user.get_attack_speed())
 	visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
 	if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
-		if(!buckled_mob)
+		if(!has_buckled_mobs())
 			return
 		visible_message("<span class='danger'>[user] manages to tear \the [src] apart!</span>")
-		unbuckle_mob()
+		unbuckle_mob(buckled_mob)
 
 /obj/effect/energy_net/post_buckle_mob(mob/living/M)
-	if(buckled_mob) //Just buckled someone
+	if(M.buckled == src) //Just buckled someone
 		..()
 		layer = M.layer+1
 		M.can_pull_size = 0