Merge https://github.com/Baystation12/Baystation12

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

@@ -1,14 +0,0 @@
-/obj/item/weapon/bedsheet/ex_act(severity)
-	if (severity <= 2)
-		del(src)
-		return
-	return
-
-/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
-	user.drop_item()
-	if(layer == initial(layer))
-		layer = 5
-	else
-		layer = initial(layer)
-	add_fingerprint(user)
-	return

code/game/objects/items/weapons/grenades/spawnergrenade.dm

@@ -47,6 +47,6 @@
 
 /obj/item/weapon/grenade/spawnergrenade/spesscarp
 	name = "carp delivery grenade"
-	spawner_type = /mob/living/simple_animal/carp
+	spawner_type = /mob/living/simple_animal/hostile/carp
 	deliveryamt = 5
 	origin_tech = "materials=3;magnets=4;syndicate=4"

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

@@ -4,6 +4,8 @@
 	new /obj/item/weapon/extinguisher/mini(src)
 	if(prob(50))
 		new /obj/item/device/flashlight(src)
+	else
+		new /obj/item/device/flashlight/flare(src)
 	new /obj/item/device/radio(src)
 
 /obj/item/weapon/storage/toolbox/mechanical/New()

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

@@ -1,14 +1,14 @@
 /obj/item/weapon/trashbag
+	name = "trash bag"
+	desc = "A heavy-duty, no fun allowed trash bag."
 	icon = 'icons/obj/trash.dmi'
 	icon_state = "trashbag0"
 	item_state = "trashbag"
-	name = "Trash bag"
-	desc = "A heavy-duty, no fun allowed trash bag."
-	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 25; //the number of trash it can carry.
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	w_class = 2.0
+	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
+	var/capacity = 25; //the number of trash it can carry.
 
 /obj/item/weapon/trashbag/update_icon()
 	if(contents.len == 0)
@@ -21,21 +21,20 @@
 
 /obj/item/weapon/trashbag/attackby(obj/item/W as obj, mob/living/user as mob)
 	..()
-	if (contents.len < capacity)
-		if (istype(W, /obj/item))
-			if (W.w_class <= 2)
+	if(contents.len < capacity)
+		if(istype(W, /obj/item))
+			if(W.w_class <= 2)
 				var/obj/item/O = W
-				src.contents += O
+				contents += O
 	else
-		user << "\blue The bag is full!"
+		user << "<span class='notice'>[src] is full!</span>"
 
 /obj/item/weapon/trashbag/attack_self(mob/living/user as mob)
-
 	if(contents.len > 0)
-		for(var/obj/item/I in src.contents)
+		for(var/obj/item/I in contents)
 			I.loc = user.loc
 		update_icon()
-		user << "\blue You drop all the trash onto the floor."
+		user << "<span class='notice'>You empty [src] onto [user.loc].</span>"
 
 /obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	if(istype(target, /obj/item))
@@ -43,23 +42,23 @@
 		if(W.w_class <= 2)
 			if(mode == 1)
 				if(contents.len < capacity)	//slightly redundant, but it makes it prettier in the chatbox. -Pete
-					user << "\blue You pick up all the trash."
+					user << "<span class='notice'>You pick up all the trash.</span>"
 					for(var/obj/item/O in get_turf(W))
 						if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
 						if(contents.len < capacity)
 							if(O.w_class <= 2)
 								contents += O;
 						else
-							user << "\blue The bag is full!"
+							user << "<span class='notice'>[src] is full!</span>"
 							break
 				else
-					user << "\blue The bag is full!"
+					user << "<span class='notice'>[src] is full!</span>"
 			else
 				if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
 				if(contents.len < capacity)
 					contents += W;
 				else
-					user << "\blue The bag is full!"
+					user << "<span class='notice'>[src] is full!</span>"
 			update_icon()
 		return
 
@@ -68,8 +67,7 @@
 	set category = "Object"
 
 	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The bag now picks up all trash in a tile at once."
-		else
-			usr << "The bag now picks up one piece of trash at a time."
+	if(mode == 1)
+		usr << "<span class='notice'>[src] now picks up all trash in a tile at once.</span>"
+	else
+		usr << "<span class='notice'>[src] now picks up one piece of trash at a time.</span>"