Merge branch 'master' into placeholder

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

@@ -126,7 +126,7 @@ var/const/NO_EMAG_ACT = -50
 	var/assignment = null	//can be alt title or the actual job
 	var/rank = null			//actual job
 	var/dorm = 0			// determines if this ID has claimed a dorm already
-	var/chat_registered = FALSE // registration for NTNET chat
+	var/datum/ntnet_user/chat_user
 
 /obj/item/card/id/Destroy()
 	mob = null
@@ -151,6 +151,8 @@ var/const/NO_EMAG_ACT = -50
 
 /obj/item/card/id/proc/update_name()
 	name = "ID Card ([src.registered_name] ([src.assignment]))"
+	if(istype(chat_user))
+		chat_user.username = chat_user.generateUsernameIdCard(src)
 
 /obj/item/card/id/proc/set_id_photo(var/mob/M)
 	front = getFlatIcon(M, SOUTH)
@@ -334,6 +336,11 @@ var/const/NO_EMAG_ACT = -50
 	wear_over_suit = !wear_over_suit
 	mob_icon_update()
 
+/obj/item/card/id/proc/InitializeChatUser()
+	if(!istype(chat_user))
+		chat_user = new()
+		chat_user.username = chat_user.generateUsernameIdCard(src)
+
 /obj/item/card/id/silver
 	icon_state = "silver"
 	item_state = "silver_id"

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

@@ -415,11 +415,27 @@
 /obj/item/storage/belt/fannypack
 	name = "leather fannypack"
 	desc = "A dorky fannypack for keeping small items in."
+	icon = 'icons/clothing/belts/fannypacks.dmi'
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	max_w_class = ITEMSIZE_SMALL
+	contained_sprite = TRUE
 	storage_slots = null
 	max_storage_space = 8
+	var/flipped = FALSE
+
+/obj/item/storage/belt/fannypack/verb/ToggleFanny()
+    set name = "Adjust Fannypack"
+    set category = "Object"
+    set src in usr
+
+    if(use_check_and_message(usr))
+        return 0
+
+    flipped = !flipped
+    item_state = "[initial(icon_state)][flipped ? "_flipped" : ""]"
+    to_chat(usr, "You flip the belt [flipped ? "behind you" : "infront of you"].")
+    update_icon()
 
 /obj/item/storage/belt/fannypack/component
 	name = "component pouch"

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -165,6 +165,11 @@
 		if(!G.wrapped)
 			user_unbuckle_mob(user)
 
+	else if(istype(W, /obj/item/disk))
+		user.drop_from_inventory(W, get_turf(src))
+		W.pixel_x = 10 //make sure they reach the pillow
+		W.pixel_y = -6
+
 	else if(!istype(W, /obj/item/bedsheet))
 		..()