Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm

@@ -26,7 +26,7 @@
 /obj/item/weapon/circuitboard/security/mining
 	name = T_BOARD("mining camera monitor")
 	build_path = /obj/machinery/computer/security/mining
-	network = list("MINE")
+	network = list("Mining Outpost")
 	req_access = list()
 
 /obj/item/weapon/circuitboard/security/telescreen/entertainment

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

@@ -285,4 +285,59 @@
 		/obj/item/weapon/anobattery,
 		/obj/item/device/ano_scanner,
 		/obj/item/weapon/pickaxe/hand
-		)
+		)
+
+/obj/item/weapon/storage/belt/fannypack
+	name = "leather fannypack"
+	desc = "A dorky fannypack for keeping small items in."
+	icon_state = "fannypack_leather"
+	item_state = "fannypack_leather"
+	max_w_class = ITEMSIZE_SMALL
+	storage_slots = null
+	max_storage_space = ITEMSIZE_COST_NORMAL * 2
+
+/obj/item/weapon/storage/belt/fannypack/black
+ 	name = "black fannypack"
+ 	icon_state = "fannypack_black"
+ 	item_state = "fannypack_black"
+
+/obj/item/weapon/storage/belt/fannypack/blue
+ 	name = "blue fannypack"
+ 	icon_state = "fannypack_blue"
+ 	item_state = "fannypack_blue"
+
+/obj/item/weapon/storage/belt/fannypack/cyan
+ 	name = "cyan fannypack"
+ 	icon_state = "fannypack_cyan"
+ 	item_state = "fannypack_cyan"
+
+/obj/item/weapon/storage/belt/fannypack/green
+ 	name = "green fannypack"
+ 	icon_state = "fannypack_green"
+ 	item_state = "fannypack_green"
+
+/obj/item/weapon/storage/belt/fannypack/orange
+ 	name = "orange fannypack"
+ 	icon_state = "fannypack_orange"
+ 	item_state = "fannypack_orange"
+
+/obj/item/weapon/storage/belt/fannypack/purple
+ 	name = "purple fannypack"
+ 	icon_state = "fannypack_purple"
+ 	item_state = "fannypack_purple"
+
+/obj/item/weapon/storage/belt/fannypack/red
+ 	name = "red fannypack"
+ 	icon_state = "fannypack_red"
+ 	item_state = "fannypack_red"
+
+/obj/item/weapon/storage/belt/fannypack/white
+ 	name = "white fannypack"
+ 	icon_state = "fannypack_white"
+ 	item_state = "fannypack_white"
+
+/obj/item/weapon/storage/belt/fannypack/yellow
+ 	name = "yellow fannypack"
+ 	icon_state = "fannypack_yellow"
+ 	item_state = "fannypack_yellow"
+

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

@@ -50,10 +50,10 @@
 		if (!( user.restrained() ) && !( user.stat ))
 			switch(over_object.name)
 				if("r_hand")
-					user.u_equip(master_item)
+					user.unEquip(master_item)
 					user.put_in_r_hand(master_item)
 				if("l_hand")
-					user.u_equip(master_item)
+					user.unEquip(master_item)
 					user.put_in_l_hand(master_item)
 			master_item.add_fingerprint(user)
 			return 0

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

@@ -77,10 +77,10 @@
 
 		switch(over_object.name)
 			if("r_hand")
-				usr.u_equip(src)
+				usr.unEquip(src)
 				usr.put_in_r_hand(src)
 			if("l_hand")
-				usr.u_equip(src)
+				usr.unEquip(src)
 				usr.put_in_l_hand(src)
 		src.add_fingerprint(usr)