Unused/WorkInProgress folder cleanup

code/game/objects/effects/explosion_particles.dm

@@ -0,0 +1,71 @@
+/obj/effect/expl_particles
+	name = "explosive particles"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "explosion_particle"
+	opacity = 1
+	anchored = 1
+	mouse_opacity = 0
+
+/obj/effect/expl_particles/New()
+	..()
+	spawn (15)
+		src.loc = null
+	return
+
+/obj/effect/expl_particles/Move()
+	..()
+	return
+
+/datum/effect/system/expl_particles
+	var/number = 10
+	var/turf/location
+	var/total_particles = 0
+
+/datum/effect/system/expl_particles/proc/set_up(n = 10, loca)
+	number = n
+	if(istype(loca, /turf/)) location = loca
+	else location = get_turf(loca)
+
+/datum/effect/system/expl_particles/proc/start()
+	var/i = 0
+	for(i=0, i<src.number, i++)
+		spawn(0)
+			var/obj/effect/expl_particles/expl = new /obj/effect/expl_particles(src.location)
+			var/direct = pick(alldirs)
+			var/a = 0
+			for(a=0, a<pick(1;25,2;50,3,4;200), a++)
+				sleep(1)
+				step(expl,direct)
+
+/obj/effect/explosion
+	name = "explosive particles"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	opacity = 1
+	anchored = 1
+	mouse_opacity = 0
+	pixel_x = -32
+	pixel_y = -32
+
+/obj/effect/explosion/New()
+	..()
+	spawn (10)
+		src.loc = null
+	return
+
+/datum/effect/system/explosion
+	var/turf/location
+
+/datum/effect/system/explosion/proc/set_up(loca)
+	if(istype(loca, /turf/)) location = loca
+	else location = get_turf(loca)
+
+/datum/effect/system/explosion/proc/start()
+	new/obj/effect/explosion( location )
+	var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
+	P.set_up(10,location)
+	P.start()
+	spawn(5)
+		var/datum/effect/effect/system/harmless_smoke_spread/S = new/datum/effect/effect/system/harmless_smoke_spread()
+		S.set_up(5,0,location,null)
+		S.start()

code/game/objects/items/ashtray.dm

@@ -0,0 +1,135 @@
+/obj/item/ashtray
+	icon = 'icons/ashtray.dmi'
+	var/
+		max_butts 	= 0
+		empty_desc 	= ""
+		icon_empty 	= ""
+		icon_half  	= ""
+		icon_full  	= ""
+		icon_broken	= ""
+
+/obj/item/ashtray/New()
+	..()
+	src.pixel_y = rand(-5, 5)
+	src.pixel_x = rand(-6, 6)
+	return
+
+/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (health < 1)
+		return
+	if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
+		if (contents.len >= max_butts)
+			user << "This ashtray is full."
+			return
+		user.u_equip(W)
+		W.loc = src
+
+		if (istype(W,/obj/item/clothing/mask/cigarette))
+			var/obj/item/clothing/mask/cigarette/cig = W
+			if (cig.lit == 1)
+				src.visible_message("[user] crushes [cig] in [src], putting it out.")
+				processing_objects.Remove(cig)
+				var/obj/item/butt = new cig.type_butt(src)
+				cig.transfer_fingerprints_to(butt)
+				del(cig)
+			else if (cig.lit == 0)
+				user << "You place [cig] in [src] without even smoking it. Why would you do that?"
+
+		src.visible_message("[user] places [W] in [src].")
+		user.update_inv_l_hand()
+		user.update_inv_r_hand()
+		add_fingerprint(user)
+		if (contents.len == max_butts)
+			icon_state = icon_full
+			desc = empty_desc + " It's stuffed full."
+		else if (contents.len > max_butts/2)
+			icon_state = icon_half
+			desc = empty_desc + " It's half-filled."
+	else
+		health = max(0,health - W.force)
+		user << "You hit [src] with [W]."
+		if (health < 1)
+			die()
+	return
+
+/obj/item/ashtray/throw_impact(atom/hit_atom)
+	if (health > 0)
+		health = max(0,health - 3)
+		if (health < 1)
+			die()
+			return
+		if (contents.len)
+			src.visible_message("\red [src] slams into [hit_atom] spilling its contents!")
+		for (var/obj/item/clothing/mask/cigarette/O in contents)
+			O.loc = src.loc
+		icon_state = icon_empty
+	return ..()
+
+/obj/item/ashtray/proc/die()
+	src.visible_message("\red [src] shatters spilling its contents!")
+	for (var/obj/item/clothing/mask/cigarette/O in contents)
+		O.loc = src.loc
+	icon_state = icon_broken
+
+/obj/item/ashtray/plastic
+	name = "plastic ashtray"
+	desc = "Cheap plastic ashtray."
+	icon_state = "ashtray_bl"
+	icon_empty = "ashtray_bl"
+	icon_half  = "ashtray_half_bl"
+	icon_full  = "ashtray_full_bl"
+	icon_broken  = "ashtray_bork_bl"
+	max_butts = 14
+	health = 24.0
+	g_amt = 30
+	m_amt = 30
+	empty_desc = "Cheap plastic ashtray."
+	throwforce = 3.0
+	die()
+		..()
+		name = "pieces of plastic"
+		desc = "Pieces of plastic with ash on them."
+		return
+
+
+/obj/item/ashtray/bronze
+	name = "bronze ashtray"
+	desc = "Massive bronze ashtray."
+	icon_state = "ashtray_br"
+	icon_empty = "ashtray_br"
+	icon_half  = "ashtray_half_br"
+	icon_full  = "ashtray_full_br"
+	icon_broken  = "ashtray_bork_br"
+	max_butts = 10
+	health = 72.0
+	m_amt = 80
+	empty_desc = "Massive bronze ashtray."
+	throwforce = 10.0
+
+	die()
+		..()
+		name = "pieces of bronze"
+		desc = "Pieces of bronze with ash on them."
+		return
+
+
+/obj/item/ashtray/glass
+	name = "glass ashtray"
+	desc = "Glass ashtray. Looks fragile."
+	icon_state = "ashtray_gl"
+	icon_empty = "ashtray_gl"
+	icon_half  = "ashtray_half_gl"
+	icon_full  = "ashtray_full_gl"
+	icon_broken  = "ashtray_bork_gl"
+	max_butts = 12
+	health = 12.0
+	g_amt = 60
+	empty_desc = "Glass ashtray. Looks fragile."
+	throwforce = 6.0
+
+	die()
+		..()
+		name = "shards of glass"
+		desc = "Shards of glass with ash on them."
+		playsound(src, "shatter", 30, 1)
+		return

code/game/objects/items/changestone.dm

@@ -0,0 +1,23 @@
+/obj/item/changestone
+	name = "An uncut ruby"
+	desc = "The ruby shines and catches the light, despite being uncut"
+	icon = 'icons/obj/artifacts.dmi'
+	icon_state = "changerock"
+
+obj/item/changestone/attack_hand(var/mob/user as mob)
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		if(!H.gloves)
+			if (H.gender == FEMALE)
+				H.gender = MALE
+			else
+				H.gender = FEMALE
+			H.dna.ready_dna(H)
+			H.update_body()
+	..()
+
+
+
+
+
+

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

@@ -0,0 +1,204 @@
+
+//moved these here from code/defines/obj/weapon.dm
+//please preference put stuff where it's easy to find - C
+
+/obj/item/weapon/autopsy_scanner
+	name = "autopsy scanner"
+	desc = "Extracts information on wounds."
+	icon = 'icons/obj/autopsy_scanner.dmi'
+	icon_state = ""
+	flags = FPRINT | TABLEPASS | CONDUCT
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"
+	var/list/datum/autopsy_data_scanner/wdata = list()
+	var/list/datum/autopsy_data_scanner/chemtraces = list()
+	var/target_name = null
+	var/timeofdeath = null
+
+/datum/autopsy_data_scanner
+	var/weapon = null // this is the DEFINITE weapon type that was used
+	var/list/organs_scanned = list() // this maps a number of scanned organs to
+									 // the wounds to those organs with this data's weapon type
+	var/organ_names = ""
+
+/datum/autopsy_data
+	var/weapon = null
+	var/pretend_weapon = null
+	var/damage = 0
+	var/hits = 0
+	var/time_inflicted = 0
+
+	proc/copy()
+		var/datum/autopsy_data/W = new()
+		W.weapon = weapon
+		W.pretend_weapon = pretend_weapon
+		W.damage = damage
+		W.hits = hits
+		W.time_inflicted = time_inflicted
+		return W
+
+/obj/item/weapon/autopsy_scanner/proc/add_data(var/datum/organ/external/O)
+	if(!O.autopsy_data.len && !O.trace_chemicals.len) return
+
+	for(var/V in O.autopsy_data)
+		var/datum/autopsy_data/W = O.autopsy_data[V]
+
+		if(!W.pretend_weapon)
+			/*
+			// the more hits, the more likely it is that we get the right weapon type
+			if(prob(50 + W.hits * 10 + W.damage))
+			*/
+
+			// Buffing this stuff up for now!
+			if(1)
+				W.pretend_weapon = W.weapon
+			else
+				W.pretend_weapon = pick("mechanical toolbox", "wirecutters", "revolver", "crowbar", "fire extinguisher", "tomato soup", "oxygen tank", "emergency oxygen tank", "laser", "bullet")
+
+
+		var/datum/autopsy_data_scanner/D = wdata[V]
+		if(!D)
+			D = new()
+			D.weapon = W.weapon
+			wdata[V] = D
+
+		if(!D.organs_scanned[O.name])
+			if(D.organ_names == "")
+				D.organ_names = O.display_name
+			else
+				D.organ_names += ", [O.display_name]"
+
+		del D.organs_scanned[O.name]
+		D.organs_scanned[O.name] = W.copy()
+
+	for(var/V in O.trace_chemicals)
+		if(O.trace_chemicals[V] > 0 && !chemtraces.Find(V))
+			chemtraces += V
+
+/obj/item/weapon/autopsy_scanner/verb/print_data()
+	set src in view(usr, 1)
+	set name = "Print Data"
+	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+		usr << "No."
+		return
+
+	var/scan_data = ""
+
+	if(timeofdeath)
+		scan_data += "<b>Time of death:</b> [worldtime2text(timeofdeath)]<br><br>"
+
+	var/n = 1
+	for(var/wdata_idx in wdata)
+		var/datum/autopsy_data_scanner/D = wdata[wdata_idx]
+		var/total_hits = 0
+		var/total_score = 0
+		var/list/weapon_chances = list() // maps weapon names to a score
+		var/age = 0
+
+		for(var/wound_idx in D.organs_scanned)
+			var/datum/autopsy_data/W = D.organs_scanned[wound_idx]
+			total_hits += W.hits
+
+			var/wname = W.pretend_weapon
+
+			if(wname in weapon_chances) weapon_chances[wname] += W.damage
+			else weapon_chances[wname] = max(W.damage, 1)
+			total_score+=W.damage
+
+
+			var/wound_age = W.time_inflicted
+			age = max(age, wound_age)
+
+		var/damage_desc
+
+		var/damaging_weapon = (total_score != 0)
+
+		// total score happens to be the total damage
+		switch(total_score)
+			if(0)
+				damage_desc = "Unknown"
+			if(1 to 5)
+				damage_desc = "<font color='green'>negligible</font>"
+			if(5 to 15)
+				damage_desc = "<font color='green'>light</font>"
+			if(15 to 30)
+				damage_desc = "<font color='orange'>moderate</font>"
+			if(30 to 1000)
+				damage_desc = "<font color='red'>severe</font>"
+
+		if(!total_score) total_score = D.organs_scanned.len
+
+		scan_data += "<b>Weapon #[n]</b><br>"
+		if(damaging_weapon)
+			scan_data += "Severity: [damage_desc]<br>"
+			scan_data += "Hits by weapon: [total_hits]<br>"
+		scan_data += "Approximate time of wound infliction: [worldtime2text(age)]<br>"
+		scan_data += "Affected limbs: [D.organ_names]<br>"
+		scan_data += "Possible weapons:<br>"
+		for(var/weapon_name in weapon_chances)
+			scan_data += "\t[100*weapon_chances[weapon_name]/total_score]% [weapon_name]<br>"
+
+		scan_data += "<br>"
+
+		n++
+
+	if(chemtraces.len)
+		scan_data += "<b>Trace Chemicals: </b><br>"
+		for(var/chemID in chemtraces)
+			scan_data += chemID
+			scan_data += "<br>"
+
+	for(var/mob/O in viewers(usr))
+		O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1)
+
+	sleep(10)
+
+	var/obj/item/weapon/paper/P = new(usr.loc)
+	P.name = "Autopsy Data ([target_name])"
+	P.info = "<tt>[scan_data]</tt>"
+	P.overlays += "paper_words"
+
+	if(istype(usr,/mob/living/carbon))
+		// place the item in the usr's hand if possible
+		if(!usr.r_hand)
+			P.loc = usr
+			usr.r_hand = P
+			P.layer = 20
+		else if(!usr.l_hand)
+			P.loc = usr
+			usr.l_hand = P
+			P.layer = 20
+
+	if(istype(usr,/mob/living/carbon/human))
+		usr:update_inv_l_hand()
+		usr:update_inv_r_hand()
+
+/obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return
+
+	if(!can_operate(M))
+		return
+
+	if(target_name != M.name)
+		target_name = M.name
+		src.wdata = list()
+		src.chemtraces = list()
+		src.timeofdeath = null
+		user << "\red A new patient has been registered.. Purging data for previous patient."
+
+	src.timeofdeath = M.timeofdeath
+
+	var/datum/organ/external/S = M.get_organ(user.zone_sel.selecting)
+	if(!S)
+		usr << "<b>You can't scan this body part.</b>"
+		return
+	if(!S.open)
+		usr << "<b>You have to cut the limb open first!</b>"
+		return
+	for(var/mob/O in viewers(M))
+		O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.display_name] with \the [src.name]", 1)
+
+	src.add_data(S)
+
+	return 1

code/game/objects/items/policetape.dm

@@ -0,0 +1,170 @@
+//Define all tape types in policetape.dm
+/obj/item/taperoll
+	name = "tape roll"
+	icon = 'icons/policetape.dmi'
+	icon_state = "rollstart"
+	flags = FPRINT
+	w_class = 1.0
+	var/turf/start
+	var/turf/end
+	var/tape_type = /obj/item/tape
+	var/icon_base
+
+/obj/item/tape
+	name = "tape"
+	icon = 'icons/policetape.dmi'
+	anchored = 1
+	density = 1
+	var/icon_base
+
+/obj/item/taperoll/police
+	name = "police tape"
+	desc = "A roll of police tape used to block off crime scenes from the public."
+	icon_state = "police_start"
+	tape_type = /obj/item/tape/police
+	icon_base = "police"
+
+/obj/item/tape/police
+	name = "police tape"
+	desc = "A length of police tape.  Do not cross."
+	req_access = list(access_security)
+	icon_base = "police"
+
+/obj/item/taperoll/engineering
+	name = "engineering tape"
+	desc = "A roll of engineering tape used to block off working areas from the public."
+	icon_state = "engineering_start"
+	tape_type = /obj/item/tape/engineering
+	icon_base = "engineering"
+
+/obj/item/tape/engineering
+	name = "engineering tape"
+	desc = "A length of engineering tape. Better not cross it."
+	req_one_access = list(access_engine,access_atmospherics)
+	icon_base = "engineering"
+
+/obj/item/taperoll/attack_self(mob/user as mob)
+	if(icon_state == "[icon_base]_start")
+		start = get_turf(src)
+		usr << "\blue You place the first end of the [src]."
+		icon_state = "[icon_base]_stop"
+	else
+		icon_state = "[icon_base]_start"
+		end = get_turf(src)
+		if(start.y != end.y && start.x != end.x || start.z != end.z)
+			usr << "\blue [src] can only be laid horizontally or vertically."
+			return
+
+		var/turf/cur = start
+		var/dir
+		if (start.x == end.x)
+			var/d = end.y-start.y
+			if(d) d = d/abs(d)
+			end = get_turf(locate(end.x,end.y+d,end.z))
+			dir = "v"
+		else
+			var/d = end.x-start.x
+			if(d) d = d/abs(d)
+			end = get_turf(locate(end.x+d,end.y,end.z))
+			dir = "h"
+
+		var/can_place = 1
+		while (cur!=end && can_place)
+			if(cur.density == 1)
+				can_place = 0
+			else if (istype(cur, /turf/space))
+				can_place = 0
+			else
+				for(var/obj/O in cur)
+					if(!istype(O, /obj/item/tape) && O.density)
+						can_place = 0
+						break
+			cur = get_step_towards(cur,end)
+		if (!can_place)
+			usr << "\blue You can't run \the [src] through that!"
+			return
+
+		cur = start
+		var/tapetest = 0
+		while (cur!=end)
+			for(var/obj/item/tape/Ptest in cur)
+				if(Ptest.icon_state == "[Ptest.icon_base]_[dir]")
+					tapetest = 1
+			if(tapetest != 1)
+				var/obj/item/tape/P = new tape_type(cur)
+				P.icon_state = "[P.icon_base]_[dir]"
+			cur = get_step_towards(cur,end)
+	//is_blocked_turf(var/turf/T)
+		usr << "\blue You finish placing the [src]."	//Git Test
+
+/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
+	if (proximity && istype(A, /obj/machinery/door/airlock))
+		var/turf/T = get_turf(A)
+		var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)
+		P.loc = locate(T.x,T.y,T.z)
+		P.icon_state = "[src.icon_base]_door"
+		P.layer = 3.2
+		user << "\blue You finish placing the [src]."
+
+/obj/item/tape/Bumped(M as mob)
+	if(src.allowed(M))
+		var/turf/T = get_turf(src)
+		M:loc = T
+
+/obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(!density) return 1
+	if(air_group || (height==0)) return 1
+
+	if ((mover.flags & 2 || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
+		return 1
+	else
+		return 0
+
+/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	breaktape(W, user)
+
+/obj/item/tape/attack_hand(mob/user as mob)
+	if (user.a_intent == "help" && src.allowed(user))
+		user.show_viewers("\blue [user] lifts [src], allowing passage.")
+		src.density = 0
+		spawn(200)
+			src.density = 1
+	else
+		breaktape(/obj/item/weapon/soap, user)//cant be null, and can't be sharp.
+
+/obj/item/tape/attack_paw(mob/user as mob)
+	breaktape(/obj/item/weapon/wirecutters,user)
+	
+/obj/item/tape/attack_alien(mob/user as mob)
+	breaktape(/obj/item/weapon/wirecutters,user)	
+
+/obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
+	if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))
+		user << "You can't break the [src] with that!"
+		return
+	user.show_viewers("\blue [user] breaks the [src]!")
+
+	var/dir[2]
+	var/icon_dir = src.icon_state
+	if(icon_dir == "[src.icon_base]_h")
+		dir[1] = EAST
+		dir[2] = WEST
+	if(icon_dir == "[src.icon_base]_v")
+		dir[1] = NORTH
+		dir[2] = SOUTH
+
+	for(var/i=1;i<3;i++)
+		var/N = 0
+		var/turf/cur = get_step(src,dir[i])
+		while(N != 1)
+			N = 1
+			for (var/obj/item/tape/P in cur)
+				if(P.icon_state == icon_dir)
+					N = 0
+					del(P)
+			cur = get_step(cur,dir[i])
+
+	del(src)
+	return
+
+

code/game/objects/items/random_items.dm

@@ -0,0 +1,346 @@
+// -------------------------------------
+// Generates an innocuous toy
+// -------------------------------------
+/obj/item/toy/random
+	name = "Random Toy"
+	New()
+		..()
+		var/list/types = list(/obj/item/toy/crossbow,/obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/weapon/reagent_containers/spray/waterflower) + typesof(/obj/item/toy/prize) - /obj/item/toy/prize
+		var/T = pick(types)
+		new T(loc)
+		spawn(1)
+			del src
+
+// -------------------------------------
+//	Random cleanables, clearly this makes sense
+// -------------------------------------
+
+/obj/effect/decal/cleanable/random
+	name = "Random Mess"
+	New()
+		..()
+		var/list/list = typesof(/obj/effect/decal/cleanable) - list(/obj/effect/decal/cleanable,/obj/effect/decal/cleanable/random,/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/cobweb2)
+		var/T = pick(list)
+		new T(loc)
+		spawn(0)
+			del src
+
+
+/obj/item/stack/sheet/animalhide/random
+	name = "Random animal hide"
+	New()
+		..()
+		spawn(1)
+			var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
+			var/obj/item/stack/S = new htype(loc)
+			S.amount = amount
+			del src
+
+// -------------------------------------
+//    Not yet identified chemical.
+//        Could be anything!
+// -------------------------------------
+
+/obj/item/weapon/reagent_containers/glass/bottle/random_reagent
+	name = "unlabelled bottle"
+//	identify_probability = 0
+	New()
+		..()
+		var/datum/reagent/R = pick(chemical_reagents_list)
+		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
+		if(rare_chems.Find(R))
+			reagents.add_reagent(R,10)
+		else
+			reagents.add_reagent(R,rand(2,3)*10)
+		pixel_x = rand(-10,10)
+		pixel_y = rand(-10,10)
+
+//Cuts out the food and drink reagents
+/obj/item/weapon/reagent_containers/glass/bottle/random_chem
+	name = "unlabelled chemical bottle"
+//	identify_probability = 0
+	New()
+		..()
+		var/global/list/chems_only = list("slimejelly","blood","water","lube","anti_toxin","toxin","cyanide","stoxin","inaprovaline","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","pacid","glycerol","radium","ryetalyn","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","plantbgone","plasma","leporazine","cryptobiolin","lexorin","kelotane","dermaline","dexalin","dexalinp","tricordrazine","synaptizine","impedrezene","hyronalin","arithrazine","alkysine","imidazoline","bicaridine","hyperzine","cryoxadone","clonexadone","spaceacillin","carpotoxin","zombiepowder","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","ethylredoxrazine","chloralhydrate","lipozine","condensedcapsaicin","frostoil","amatoxin","psilocybin","enzyme","nothing","doctorsdelight","antifreeze","neurotoxin")
+		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
+
+		var/datum/reagent/R = pick(chems_only + rare_chems)
+		if(rare_chems.Find(R))
+			reagents.add_reagent(R,10)
+		else
+			reagents.add_reagent(R,rand(2,3)*10)
+		name = "unlabelled bottle"
+		pixel_x = rand(-10,10)
+		pixel_y = rand(-10,10)
+
+/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem
+	name = "unlabelled chemical bottle"
+//	identify_probability = 0
+	New()
+		..()
+		var/global/list/base_chems = list("water","oxygen","nitrogen","hydrogen","potassium","mercury","carbon","chlorine","fluorine","phosphorus","lithium","sulfur","sacid","radium","iron","aluminum","silicon","sugar","ethanol")
+		var/datum/reagent/R = pick(base_chems)
+		reagents.add_reagent(R,rand(2,6)*5)
+		name = "unlabelled bottle"
+		pixel_x = rand(-10,10)
+		pixel_y = rand(-10,10)
+/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink
+	name = "unlabelled drink"
+	icon = 'icons/obj/drinks.dmi'
+	New()
+		..()
+		var/list/drinks_only = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice","berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana","nothing","potato","milk","soymilk","cream","coffee","tea","icecoffee","icetea","cola","nuka_cola","spacemountainwind","thirteenloko","dr_gibb","space_up","lemon_lime","beer","whiskey","gin","rum","vodka","holywater","tequilla","vermouth","wine","tonic","kahlua","cognac","hooch","ale","sodawater","ice","bilk","atomicbomb","threemileisland","goldschlager","patron","gintonic","cubalibre","whiskeycola","martini","vodkamartini","whiterussian","screwdrivercocktail","booger","bloodymary","gargleblaster","bravebull","tequillasunrise","toxinsspecial","beepskysmash","doctorsdelight","irishcream","manlydorf","longislandicedtea","moonshine","b52","irishcoffee","margarita","blackrussian","manhattan","manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood","vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead","mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte","cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk","silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini")
+		if(prob(50))
+			drinks_only += list("chloralhydrate","adminordrazine","mindbreaker","tricordrazine","blood")
+
+		var/datum/reagent/R = pick(drinks_only)
+		reagents.add_reagent(R,volume)
+		name = "unlabelled bottle"
+		icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red")
+		pixel_x = rand(-5,5)
+		pixel_y = rand(-5,5)
+/obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent // Same as the chembottle code except the container
+	name = "unlabelled drink?"
+	icon = 'icons/obj/drinks.dmi'
+	New()
+		..()
+		var/datum/reagent/R = pick(chemical_reagents_list)
+		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
+		if(rare_chems.Find(R))
+			reagents.add_reagent(R,10)
+		else
+			reagents.add_reagent(R,rand(3,10)*10)
+		name = "unlabelled bottle"
+		icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red")
+		pixel_x = rand(-5,5)
+		pixel_y = rand(-5,5)
+		spawn(0)
+			del src
+
+/obj/item/weapon/storage/pill_bottle/random_meds
+	name = "unlabelled pillbottle"
+	desc = "The sheer recklessness of this bottle's existence astounds you."
+
+	New()
+		..()
+		var/global/list/meds_only = list("anti_toxin","toxin","cyanide","stoxin","inaprovaline","space_drugs","serotrotium","ryetalyn","mutagen","leporazine","cryptobiolin","lexorin","kelotane","dermaline","dexalin","dexalinp","tricordrazine","synaptizine","impedrezene","hyronalin","arithrazine","alkysine","imidazoline","bicaridine","hyperzine","spaceacillin","carpotoxin","zombiepowder","mindbreaker","ethanol","ammonia","diethylamine","ethylredoxrazine","chloralhydrate","lipozine","condensedcapsaicin","frostoil","amatoxin","psilocybin","nothing","doctorsdelight","neurotoxin")
+		var/global/list/rare_meds = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood")
+
+		var/i = 1
+		while(i < storage_slots)
+
+			var/datum/reagent/R
+			if(prob(50))
+				R = pick(meds_only + rare_meds)
+			else
+				R = pick(meds_only)
+			var/obj/item/weapon/reagent_containers/pill/P = new(src)
+
+			if(rare_meds.Find(R))
+				P.reagents.add_reagent(R,10)
+			else
+				P.reagents.add_reagent(R,rand(2,5)*10)
+			P.name = "Unlabelled Pill"
+			P.desc = "Something about this pill entices you to try it, against your better judgement."
+			i++
+		pixel_x = rand(-10,10)
+		pixel_y = rand(-10,10)
+		return
+
+// -------------------------------------
+//    Containers full of unknown crap
+// -------------------------------------
+
+/obj/structure/closet/crate/secure/unknownchemicals
+	name = "Grey-market Chemicals Grab Pack"
+	desc = "Crate full of chemicals of unknown type and value from a 'trusted' source."
+	req_one_access = list(access_chemistry,access_research,access_qm) // the qm knows a guy, you see.
+
+	New()
+		..()
+		sleep(2)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_base_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_chem(src)
+		new/obj/item/weapon/reagent_containers/glass/bottle/random_chem(src)
+		while(prob(50))
+			new/obj/item/weapon/reagent_containers/glass/bottle/random_reagent(src)
+
+		new/obj/item/weapon/storage/pill_bottle/random_meds(src)
+		while(prob(25))
+			new/obj/item/weapon/storage/pill_bottle/random_meds(src)
+		return
+
+/obj/structure/closet/crate/secure/chemicals
+	name		= "Chemical Supply Kit"
+	desc		= "Full of basic chemistry supplies."
+	req_one_access	= list(access_chemistry,access_research)
+
+	New()
+		..()
+		sleep(2)
+		var/global/list/base_chems = list("water","oxygen","nitrogen","hydrogen","potassium","mercury","carbon","chlorine","fluorine","phosphorus","lithium","sulfur","sacid","radium","iron","aluminum","silicon","sugar","ethanol")
+		for(var/chem in base_chems)
+			var/obj/item/weapon/reagent_containers/glass/bottle/B = new(src)
+			B.reagents.add_reagent(chem,B.volume)
+			if(prob(85))
+				var/datum/reagent/r = chemical_reagents_list[chem]
+				B.name	= "[r.name] bottle"
+//				B.identify_probability = 100
+			else
+				B.name	= "unlabelled bottle"
+				B.desc	= "Looks like the label fell off."
+//				B.identify_probability = 0
+
+
+/obj/structure/closet/crate/bin/flowers
+	name = "flower barrel"
+	desc = "A bin full of fresh flowers for the bereaved."
+	anchored = 0
+	New()
+		while(contents.len < 10)
+			var/flowertype = pick(/obj/item/weapon/grown/sunflower,/obj/item/weapon/grown/novaflower,/obj/item/weapon/reagent_containers/food/snacks/grown/poppy,
+				/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower)
+			var/atom/movable/AM = new flowertype(src)
+			AM.pixel_x = rand(-10,10)
+			AM.pixel_y = rand(-5,5)
+
+
+/obj/structure/closet/crate/bin/plants
+	name = "plant barrel"
+	desc = "Caution: Contents may contain vitamins and minerals.  It is recommended that you deep fry them before eating."
+	anchored = 0
+	New()
+		while(contents.len < 10)
+			var/ptype = pick(/obj/item/weapon/reagent_containers/food/snacks/grown/apple,/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/berries, /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/corn, /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/grapes, /obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper, /obj/item/weapon/reagent_containers/food/snacks/grown/lemon,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/lime, /obj/item/weapon/reagent_containers/food/snacks/grown/orange,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/potato, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans, /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/wheat, /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet,
+							 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet)
+			var/obj/O = new ptype(src)
+			O.pixel_x = rand(-10,10)
+			O.pixel_y = rand(-5,5)
+
+/obj/structure/closet/secure_closet/random_drinks
+	name = "Unlabelled Booze"
+	req_access = list(access_bar)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+	New()
+		..()
+		sleep(2)
+		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
+		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
+		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
+		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
+		new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink(src)
+		while(prob(25))
+			new/obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent(src)
+		return
+
+
+// -------------------------------------
+//          Do not order this.
+//  If you order this, do not open it.
+//        If you open this, run.
+//       If you didn't run, pray.
+// -------------------------------------
+
+/obj/structure/largecrate/evil
+	name = "\improper Mysterious Crate"
+	desc = "What could it be?"
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/crowbar))
+			var/list/menace = pick(	/mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate,
+									/mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged,
+									/mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate)
+
+			visible_message("\red Something falls out of the [src]!")
+			var/obj/item/weapon/grenade/flashbang/clusterbang/C = new(src.loc)
+			C.prime()
+			spawn(10)
+				new menace(src.loc)
+				while(prob(15))
+					new menace(get_step_rand(src.loc))
+				..()
+		else
+			..()
+
+
+//
+//
+//
+//                   ???
+//
+//
+//
+
+/obj/structure/largecrate/schrodinger
+	name = "Schrodinger's Crate"
+	desc = "What happens if you open it?"
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/crowbar))
+			var/mob/living/simple_animal/cat/Cat1 = new(loc)
+			Cat1.apply_damage(250)//,TOX)
+			Cat1.name = "Schrodinger's Cat"
+			Cat1.desc = "It seems it's been dead for a while."
+
+			var/mob/living/simple_animal/cat/Cat2 = new(loc)
+			Cat2.name = "Schrodinger's Cat"
+			Cat2.desc = "It's was alive the whole time!"
+			sleep(2)
+			if(prob(50))
+				del Cat1
+			else
+				del Cat2
+		..()
+
+// --------------------------------------
+//   Collen's box of wonder and mystery
+// --------------------------------------
+/obj/item/weapon/storage/box/grenades
+	name = "tactical grenades"
+	desc = "A box with 6 tactical grenades."
+	icon_state = "flashbang"
+	var/list/grenadelist = list(/obj/item/weapon/grenade/chem_grenade/metalfoam, /obj/item/weapon/grenade/chem_grenade/incendiary,
+	/obj/item/weapon/grenade/chem_grenade/antiweed, /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/teargas,
+	/obj/item/weapon/grenade/chem_grenade/holywater, /obj/item/weapon/grenade/chem_grenade/soap, /obj/item/weapon/grenade/chem_grenade/meat,
+	/obj/item/weapon/grenade/chem_grenade/dirt, /obj/item/weapon/grenade/chem_grenade/lube, /obj/item/weapon/grenade/smokebomb,
+	/obj/item/weapon/grenade/chem_grenade/drugs, /obj/item/weapon/grenade/chem_grenade/ethanol) // holy list batman
+
+	New()
+		..()
+		var/nade1 = pick(grenadelist)
+		var/nade2 = pick(grenadelist)
+		var/nade3 = pick(grenadelist)
+		var/nade4 = pick(grenadelist)
+		var/nade5 = pick(grenadelist)
+		var/nade6 = pick(grenadelist)
+
+		new nade1(src)
+		new nade2(src)
+		new nade3(src)
+		new nade4(src)
+		new nade5(src)
+		new nade6(src)

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

@@ -0,0 +1,66 @@
+obj/item/weapon/firework
+	name = "fireworks"
+	icon = 'icons/obj/fireworks.dmi'
+	icon_state = "rocket_0"
+	var/litzor = 0
+	var/datum/effects/system/sparkel_spread/S
+obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user)
+	if(litzor)
+		return
+	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
+		for(var/mob/M in viewers(user))
+			M << "[user] lits \the [src]"
+		litzor = 1
+		icon_state = "rocket_1"
+		S = new()
+		S.set_up(5,0,src.loc)
+		sleep(30)
+		if(ismob(src.loc) || isobj(src.loc))
+			S.attach(src.loc)
+		S.start()
+		del(src)
+
+obj/item/weapon/sparkler
+	name = "sparkler"
+	icon = 'icons/obj/fireworks.dmi'
+	icon_state = "sparkler_0"
+	var/litzor = 0
+	var/datum/effect/effect/system/spark_spread/S
+obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user)
+	if(litzor)
+		return
+	if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
+		for(var/mob/M in viewers(user))
+			M << "[user] lits \the [src]"
+		litzor = 1
+		icon_state = "sparkler_1"
+		var/b = rand(5,9)
+		for(var/xy, xy<=b, xy++)
+			S = new()
+			S.set_up(1,0,src.loc)
+			if(ismob(src.loc) || isobj(src.loc))
+				S.attach(src.loc)
+			S.start()
+			sleep(10)
+		del(src)
+/obj/crate/fireworks
+	name = "Fireworks!"
+/obj/crate/fireworks/New()
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/sparkler(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)
+	new /obj/item/weapon/firework(src)

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

@@ -0,0 +1,481 @@
+/obj/item/weapon/grenade/chem_grenade/dirt
+	payload_name = "dirt"
+	desc = "From the makers of BLAM! brand foaming space cleaner, this bomb guarantees steady work for any janitor."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/list/muck = list("blood","carbon","flour","radium")
+		var/filth = pick(muck - "radium") // not usually radioactive
+
+		B1.reagents.add_reagent(filth,25)
+		if(prob(25))
+			B1.reagents.add_reagent(pick(muck - filth,25)) // but sometimes...
+
+		beakers += B1
+
+
+/obj/item/weapon/grenade/chem_grenade/meat
+	payload_name = "meat"
+	desc = "Not always as messy as the name implies."
+	stage = 2
+
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+		B1.reagents.add_reagent("blood",60)
+		if(prob(5))
+			B1.reagents.add_reagent("blood",1) // Quality control problems, causes a mess
+		B2.reagents.add_reagent("clonexadone",30)
+
+		beakers += B1
+		beakers += B2
+
+/obj/item/weapon/grenade/chem_grenade/holywater
+	payload_name = "holy water"
+	desc = "Then shalt thou count to three, no more, no less."
+	stage = 2
+	det_time = 30
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new(src)
+		B.reagents.add_reagent("holywater",100)
+		beakers += B
+
+/obj/item/weapon/grenade/chem_grenade/soap
+	payload_name = "soap"
+	desc = "Not necessarily as clean as the name implies."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+
+		B1.reagents.add_reagent("cornoil",60)
+		B2.reagents.add_reagent("enzyme",5)
+		B2.reagents.add_reagent("ammonia",30)
+
+		beakers += B1
+		beakers += B2
+		update_icon()
+
+/obj/item/weapon/grenade/chem_grenade/drugs
+	payload_name = "miracle"
+	desc = "How does it work?"
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+		B1.reagents.add_reagent("space_drugs", 25)
+		B1.reagents.add_reagent("mindbreaker", 25)
+		B1.reagents.add_reagent("potassium", 25)
+		B2.reagents.add_reagent("phosphorus", 25)
+		B2.reagents.add_reagent("sugar", 25)
+
+		beakers += B1
+		beakers += B2
+		update_icon()
+
+/obj/item/weapon/grenade/chem_grenade/ethanol
+	payload_name = "ethanol"
+	desc = "Ach, that hits the spot."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+		B1.reagents.add_reagent("ethanol", 75)
+		B1.reagents.add_reagent("potassium", 25)
+		B2.reagents.add_reagent("phosphorus", 25)
+		B2.reagents.add_reagent("sugar", 25)
+		B2.reagents.add_reagent("ethanol", 25)
+
+		beakers += B1
+		beakers += B2
+		update_icon()
+
+// -------------------------------------
+// Grenades using new grenade assemblies
+// -------------------------------------
+/obj/item/weapon/grenade/chem_grenade/lube
+	payload_name = "lubricant"
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		B1.reagents.add_reagent("lube",50)
+		beakers += B1
+/obj/item/weapon/grenade/chem_grenade/lube/remote
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/signaler)
+/obj/item/weapon/grenade/chem_grenade/lube/prox
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
+/obj/item/weapon/grenade/chem_grenade/lube/tripwire
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/infra)
+
+
+// Basic explosion grenade
+/obj/item/weapon/grenade/chem_grenade/explosion
+	payload_name = "conventional"
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+		B1.reagents.add_reagent("glycerol",30) // todo: someone says NG is overpowered, test.
+		B1.reagents.add_reagent("sacid",15)
+		B2.reagents.add_reagent("sacid",15)
+		B2.reagents.add_reagent("pacid",30)
+		beakers += B1
+		beakers += B2
+
+// Assembly Variants
+/obj/item/weapon/grenade/chem_grenade/explosion/remote
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/signaler)
+
+/obj/item/weapon/grenade/chem_grenade/explosion/prox
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
+
+/obj/item/weapon/grenade/chem_grenade/explosion/mine
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
+
+// Basic EMP grenade
+/obj/item/weapon/grenade/chem_grenade/emp
+	payload_name = "EMP"
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+		B1.reagents.add_reagent("uranium",50)
+		B2.reagents.add_reagent("iron",50)
+		beakers += B1
+		beakers += B2
+
+// Assembly Variants
+/obj/item/weapon/grenade/chem_grenade/emp/remote
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/signaler)
+
+/obj/item/weapon/grenade/chem_grenade/emp/prox
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
+
+/obj/item/weapon/grenade/chem_grenade/emp/mine
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
+
+// --------------------------------------
+//  Dangerous slime core grenades
+// --------------------------------------
+/*
+/obj/item/weapon/grenade/chem_grenade/large/bluespace
+	payload_name = "bluespace slime"
+	desc = "A standard grenade casing containing weaponized slime extract."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/slime_extract/bluespace/B1 = new(src)
+		B1.Uses = rand(1,3)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+		B2.reagents.add_reagent("plasma",5 * B1.Uses)
+		beakers += B1
+		beakers += B2
+
+/obj/item/weapon/grenade/chem_grenade/large/bluespace/prox
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
+
+/obj/item/weapon/grenade/chem_grenade/large/bluespace/mine
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
+
+/obj/item/weapon/grenade/chem_grenade/large/bluespace/remote
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/signaler)
+*/
+
+/obj/item/weapon/grenade/chem_grenade/large/monster
+	payload_name = "gold slime"
+	desc = "A standard grenade containing weaponized slime extract."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/slime_extract/gold/B1 = new(src)
+		B1.Uses = rand(1,3)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+		B2.reagents.add_reagent("plasma",5 * B1.Uses)
+		beakers += B1
+		beakers += B2
+
+/obj/item/weapon/grenade/chem_grenade/large/monster/prox
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
+
+/obj/item/weapon/grenade/chem_grenade/large/monster/mine
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
+
+/obj/item/weapon/grenade/chem_grenade/large/monster/remote
+	New()
+		..()
+		CreateDefaultTrigger(/obj/item/device/assembly/signaler)
+
+/obj/item/weapon/grenade/chem_grenade/large/feast
+	payload_name = "silver slime"
+	desc = "A standard grenade containing weaponized slime extract."
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/slime_extract/silver/B1 = new(src)
+		B1.Uses = rand(1,3)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+		B2.reagents.add_reagent("plasma",5 * B1.Uses)
+		beakers += B1
+		beakers += B2
+
+// Slime Clusterbusters
+/*/obj/item/weapon/grenade/clusterbuster/bluespace
+	name = "Bluespace Megabomb"
+	desc = "Widely regarded as proof that while there is a God, He is Insane."
+	payload = /obj/item/weapon/grenade/chem_grenade/large/bluespace*/
+
+/obj/item/weapon/grenade/clusterbuster/monster
+	name = "Monster Megabomb"
+	desc = "Widely regarded as proof that there is no God."
+	payload = /obj/item/weapon/grenade/chem_grenade/large/monster
+
+// --------------------------------------
+//  Syndie Kits
+// --------------------------------------
+
+/obj/item/weapon/storage/box/syndie_kit/remotegrenade
+	name = "Remote Grenade Kit"
+	New()
+		..()
+		new /obj/item/weapon/grenade/chem_grenade/explosion/remote(src)
+		new /obj/item/device/multitool(src) // used to adjust the chemgrenade's signaller
+		new /obj/item/device/assembly/signaler(src)
+		return
+/obj/item/weapon/storage/box/syndie_kit/remoteemp
+	name = "Remote EMP Kit"
+	New()
+		..()
+		new /obj/item/weapon/grenade/chem_grenade/emp/remote(src)
+		new /obj/item/device/multitool(src) // used to adjust the chemgrenade's signaller
+		new /obj/item/device/assembly/signaler(src)
+		return
+/obj/item/weapon/storage/box/syndie_kit/remotelube
+	name = "Remote Lube Kit"
+	New()
+		..()
+		new /obj/item/weapon/grenade/chem_grenade/lube(src)
+		new /obj/item/device/multitool(src) // used to adjust the chemgrenade's signaller
+		new /obj/item/device/assembly/signaler(src)
+		return
+// --------------------------------------
+// Clusterbuster Variable Payload Grenade
+//   Adapted from flashbang/clusterbang
+// --------------------------------------
+
+/obj/item/weapon/grenade/clusterbuster
+	desc = "This highly intimidating bunch of hardware seems eager to be let loose."
+	name = "Clusterbang"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "clusterbang"
+	var/payload = /obj/item/weapon/grenade/flashbang
+
+
+// Subtypes
+
+// Serious grenades
+/obj/item/weapon/grenade/clusterbuster/explosion
+	name = "Cluster Grenade"
+	payload = /obj/item/weapon/grenade/chem_grenade/explosion
+/obj/item/weapon/grenade/clusterbuster/emp
+	name = "Electromagnetic Storm"
+	payload = /obj/item/weapon/grenade/chem_grenade/emp
+/obj/item/weapon/grenade/clusterbuster/smoke
+	name = "Ninja Vanish"
+	payload = /obj/item/weapon/grenade/smokebomb
+
+// Not serious grenades
+/obj/item/weapon/grenade/clusterbuster/meat
+	name = "Mega Meat Grenade"
+	payload = /obj/item/weapon/grenade/chem_grenade/meat
+/obj/item/weapon/grenade/clusterbuster/booze
+	name = "Booze Grenade"
+	payload = /obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink
+/obj/item/weapon/grenade/clusterbuster/honk
+	name = "Mega Honk Grenade"
+	payload = /obj/item/weapon/bananapeel
+/obj/item/weapon/grenade/clusterbuster/xmas
+	name = "Christmas Miracle"
+	payload = /obj/item/weapon/a_gift
+/obj/item/weapon/grenade/clusterbuster/soap
+	name = "Megamaid's Passive-Aggressive Soap-creation Grenade"
+	payload = /obj/item/weapon/grenade/chem_grenade/soap
+/obj/item/weapon/grenade/clusterbuster/dirt
+	name = "Megamaid's Job Security Grenade"
+	payload = /obj/effect/decal/cleanable/random
+/obj/item/weapon/grenade/clusterbuster/megadirt
+	name = "Megamaid's Revenge Grenade"
+	payload = /obj/item/weapon/grenade/chem_grenade/dirt
+/obj/item/weapon/grenade/clusterbuster/inferno
+	name = "Little Boy"
+	payload = /obj/item/weapon/grenade/chem_grenade/incendiary
+/obj/item/weapon/grenade/clusterbuster/apocalypsefake
+	name = "Fun Bomb"
+	desc = "Not like the other bomb."
+	payload = /obj/item/toy/spinningtoy
+
+// Grenades that should never see the light of day
+/obj/item/weapon/grenade/clusterbuster/apocalypse
+	name = "Apocalypse Bomb"
+	desc = "No matter what, do not EVER use this."
+	payload = /obj/machinery/singularity
+
+/obj/item/weapon/grenade/clusterbuster/ultima
+	name = "Earth Shattering Kaboom"
+	desc = "Contains one Aludium Q-36 explosive space modulator."
+	payload = /obj/item/weapon/grenade/chem_grenade/explosion
+
+/obj/item/weapon/grenade/clusterbuster/lube
+	name = "Newton's First Law"
+	desc = "An object in motion remains in motion."
+	payload = /obj/item/weapon/grenade/chem_grenade/lube
+
+
+/*/obj/item/weapon/grenade/clusterbuster/bluespace
+	name = "Maximum Warp"
+	desc = "Spacetime: Nice job breaking it, hero."
+	payload = /obj/item/weapon/grenade/chem_grenade/large/bluespace*/
+/obj/item/weapon/grenade/clusterbuster/monster
+	name = "The Monster Mash"
+	desc = "It's a graveyeard smash."
+	payload = /obj/item/weapon/grenade/chem_grenade/large/monster
+/obj/item/weapon/grenade/clusterbuster/banquet
+	name = "Bork Bork Bonanza"
+	desc = "Bork bork bork."
+	payload = /obj/item/weapon/grenade/clusterbuster/banquet/child
+	child
+		payload = /obj/item/weapon/grenade/chem_grenade/large/feast
+
+// Mob spawning grenades
+/obj/item/weapon/grenade/clusterbuster/aviary
+	name = "Poly-Poly Grenade"
+	desc = "That's an uncomfortable number of birds."
+	payload = /mob/living/simple_animal/parrot
+/obj/item/weapon/grenade/clusterbuster/monkey
+	name = "Barrel of Monkeys"
+	desc = "Not really that much fun."
+	payload = /mob/living/carbon/monkey
+/obj/item/weapon/grenade/clusterbuster/fluffy
+	name = "Fluffy Love Bomb"
+	desc = "Exactly as snuggly as it sounds."
+	payload = /mob/living/simple_animal/corgi/puppy
+
+/obj/item/weapon/grenade/clusterbuster/prime()
+	var/numspawned = rand(4,8)
+	var/again = 0
+	for(var/more = numspawned,more > 0,more--)
+		if(prob(35))
+			again++
+			numspawned --
+
+	for(,numspawned > 0, numspawned--)
+		spawn(0)
+			new /obj/item/weapon/grenade/clusterbuster/node(src.loc,payload,name)//Launches payload
+			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+
+	for(,again > 0, again--)
+		spawn(0)
+			new /obj/item/weapon/grenade/clusterbuster/segment(src.loc,payload,name)//Creates a 'segment' that launches more payloads
+			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+	spawn(0)
+		del(src)
+		return
+
+/obj/item/weapon/grenade/clusterbuster/segment
+	desc = "What's happening? Aaah!"
+	name = "clusterbuster segment"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "clusterbang_segment"
+
+/obj/item/weapon/grenade/clusterbuster/segment/New(var/turf/newloc,var/T,var/N)//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
+	icon_state = "clusterbang_segment_active"
+	active = 1
+	payload = T
+	name = N
+	var/stepdist = rand(1,5)		//How far to step
+	var/temploc = src.loc			//Saves the current location to know where to step away from
+	walk_away(src,temploc,stepdist)	//I must go, my people need me
+	var/dettime = rand(15,60)
+	spawn(dettime)
+		prime()
+
+/obj/item/weapon/grenade/clusterbuster/segment/prime()
+	var/numspawned = rand(4,8)
+	for(var/more = numspawned,more > 0,more--)
+		if(prob(35))
+			numspawned --
+
+	for(,numspawned > 0, numspawned--)
+		new /obj/item/weapon/grenade/clusterbuster/node(src.loc,payload)
+		spawn(0)
+			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+	del(src)
+	return
+
+/obj/item/weapon/grenade/clusterbuster/node/New(var/turf/newloc,var/T,var/N)
+	icon_state = "flashbang_active"
+	active = 1
+	payload = T
+	name = N
+	var/stepdist = rand(1,4)
+	var/temploc = src.loc
+	walk_away(src,temploc,stepdist)
+	var/dettime = rand(15,60)
+	spawn(dettime)
+		var/atom/A = new payload(loc)
+		if(istype(A,/obj/item/weapon/grenade))
+			A:prime()
+		if(istype(A,/obj/machinery/singularity)) // I can't emphasize enough how much you should never use this grenade
+			A:energy = 200
+		del src

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

@@ -290,4 +290,158 @@
 /obj/item/weapon/storage/belt/fannypack/yellow
 	name = "yellow fannypack"
 	icon_state = "fannypack_yellow"
-	item_state = "fannypack_yellow"
+	item_state = "fannypack_yellow"
+	
+// -------------------------------------
+//     Bluespace Belt
+// -------------------------------------
+
+
+/obj/item/weapon/storage/belt/bluespace
+	name = "Belt of Holding"
+	desc = "The greatest in pants-supporting technology."
+	icon_state = "medicalbelt"
+	item_state = "medical"
+	storage_slots = 14
+	w_class = 4
+	max_w_class = 2
+	max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2.  This is deliberate
+	origin_tech = "bluespace=4"
+	can_hold = list()
+	New()
+		if(prob(5))
+			//Sometimes people choose justice.
+			//Sometimes justice chooses you.
+			visible_message("That doesn't look like a normal Toolbelt of Holding...")
+			new /obj/item/weapon/storage/belt/bluespace/owlman(loc)
+			spawn(1)
+				del src
+			return
+		..()
+
+	proc/failcheck(mob/user as mob)
+		if (prob(src.reliability)) return 1 //No failure
+		if (prob(src.reliability))
+			user << "\red The Bluespace portal resists your attempt to add another item." //light failure
+		else
+			user << "\red The Bluespace generator malfunctions!"
+			for (var/obj/O in src.contents) //it broke, delete what was in it
+				del(O)
+			crit_fail = 1
+			return 0
+
+/obj/item/weapon/storage/belt/bluespace/owlman
+	name = "Owlman's utility belt"
+	desc = "Sometimes people choose justice.  Sometimes, justice chooses you..."
+	icon_state = "securitybelt"
+	item_state = "security"
+	storage_slots = 14
+	max_w_class = 3
+	max_combined_w_class = 28 // = 14 * 2
+	origin_tech = "bluespace=4;syndicate=2"
+	allow_quick_empty = 1
+	can_hold = list()
+	New()
+		..()
+		new /obj/item/clothing/mask/gas/owl_mask(src)
+		new /obj/item/clothing/under/owl(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/weapon/grenade/smokebomb(src)
+		new /obj/item/device/detective_scanner(src)
+
+
+
+ // As a last resort, the belt can be used as a plastic explosive with a fixed timer (15 seconds).  Naturally, you'll lose all your gear...
+ // Of course, it could be worse.  It could spawn a singularity!
+/obj/item/weapon/storage/belt/bluespace/owlman/afterattack(atom/target as obj|turf, mob/user as mob, flag)
+	if (!flag)
+		return
+	if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet))
+		return
+	user << "Planting explosives..."
+	user.visible_message("[user.name] is fiddling with their toolbelt.")
+	if(ismob(target))
+		user.attack_log += "\[[time_stamp()]\] <font color='red'> [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
+		log_attack("<font color='red'> [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])</font>")
+		user.visible_message("\red [user.name] is trying to strap a belt to [target.name]!")
+
+
+	if(do_after(user, 50) && in_range(user, target))
+		user.drop_item()
+		target = target
+		loc = null
+		var/location
+		if (isturf(target)) location = target
+		if (ismob(target))
+			target:attack_log += "\[[time_stamp()]\]<font color='orange'> Had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
+			user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
+		target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
+		user << "You sacrifice your belt for the sake of justice. Timer counting down from 15."
+		spawn(150)
+			if(target)
+				if(ismob(target) || isobj(target))
+					location = target.loc // These things can move
+				explosion(location, -1, -1, 2, 3)
+				if (istype(target, /turf/simulated/wall)) target:dismantle_wall(1)
+				else target.ex_act(1)
+				if (isobj(target))
+					if (target)
+						del(target)
+				if (src)
+					del(src)
+/obj/item/weapon/storage/belt/bluespace/attack(mob/M as mob, mob/user as mob, def_zone)
+	return
+
+/obj/item/weapon/storage/belt/bluespace/admin
+	name = "Admin's Tool-belt"
+	desc = "Holds everything for those that run everything."
+	icon_state = "soulstonebelt"
+	item_state = "soulstonebelt"
+	w_class = 10 // permit holding other storage items
+	storage_slots = 28
+	max_w_class = 10
+	max_combined_w_class = 280
+	can_hold = list()
+
+	New()
+		..()
+		new /obj/item/weapon/crowbar(src)
+		new /obj/item/weapon/screwdriver(src)
+		new /obj/item/weapon/weldingtool/hugetank(src)
+		new /obj/item/weapon/wirecutters(src)
+		new /obj/item/weapon/wrench(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/stack/cable_coil(src)
+
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/dnainjector/xraymut(src)
+		new /obj/item/weapon/dnainjector/firemut(src)
+		new /obj/item/weapon/dnainjector/telemut(src)
+		new /obj/item/weapon/dnainjector/hulkmut(src)
+//		new /obj/item/weapon/spellbook(src) // for smoke effects, door openings, etc
+//		new /obj/item/weapon/magic/spellbook(src)
+
+//		new/obj/item/weapon/reagent_containers/hypospray/admin(src)
+
+/obj/item/weapon/storage/belt/bluespace/sandbox
+	name = "Sandbox Mode Toolbelt"
+	desc = "Holds whatever, you can spawn your own damn stuff."
+	w_class = 10 // permit holding other storage items
+	storage_slots = 28
+	max_w_class = 10
+	max_combined_w_class = 280
+	can_hold = list()
+
+	New()
+		..()
+		new /obj/item/weapon/crowbar(src)
+		new /obj/item/weapon/screwdriver(src)
+		new /obj/item/weapon/weldingtool/hugetank(src)
+		new /obj/item/weapon/wirecutters(src)
+		new /obj/item/weapon/wrench(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/stack/cable_coil(src)
+
+		new /obj/item/device/analyzer(src)
+		new /obj/item/device/healthanalyzer(src)
+