conflict resolution

code/game/objects/buckling.dm

@@ -35,11 +35,11 @@
 	return FALSE
 
 //procs that handle the actual buckling and unbuckling
-/atom/movable/proc/buckle_mob(mob/living/M)
-	if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
+/atom/movable/proc/buckle_mob(mob/living/M, force = 0)
+	if((!can_buckle && !force)|| !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
 		return 0
 
-	if(isslime(M) || isAI(M))
+	if((isslime(M) || isAI(M)) && !force)
 		if(M == usr)
 			to_chat(M, "<span class='warning'>You are unable to buckle yourself to the [src]!</span>")
 		else
@@ -54,7 +54,7 @@
 	M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src)
 	return 1
 
-/obj/buckle_mob(mob/living/M)
+/obj/buckle_mob(mob/living/M, force = 0)
 	. = ..()
 	if(.)
 		if(burn_state == ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect

code/game/objects/effects/anomalies.dm

@@ -18,6 +18,11 @@
 
 	var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
 	aSignal.set_frequency(new_frequency)
+	poi_list |= src
+	
+/obj/effect/anomaly/Destroy()
+	poi_list.Remove(src)
+	return ..()
 
 /obj/effect/anomaly/proc/anomalyEffect()
 	if(prob(50))

code/game/objects/effects/decals/Cleanable/fuel.dm

@@ -1,4 +1,4 @@
-obj/effect/decal/cleanable/liquid_fuel
+/obj/effect/decal/cleanable/liquid_fuel
 	//Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles.
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "fuel"
@@ -6,52 +6,53 @@ obj/effect/decal/cleanable/liquid_fuel
 	anchored = 1
 	var/amount = 1 //Basically moles.
 
-	New(newLoc,amt=1)
-		src.amount = amt
+/obj/effect/decal/cleanable/liquid_fuel/New(newLoc,amt=1)
+	amount = amt
 
-		//Be absorbed by any other liquid fuel in the tile.
-		for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
-			if(other != src)
-				other.amount += src.amount
-				spawn other.Spread()
-				qdel(src)
+	//Be absorbed by any other liquid fuel in the tile.
+	for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
+		if(other != src)
+			other.amount += amount
+			spawn other.Spread()
+			qdel(src)
 
-		Spread()
-		. = ..()
+	Spread()
+	. = ..()
 
-	proc/Spread()
-		//Allows liquid fuels to sometimes flow into other tiles.
-		if(amount < 0.5) return
-		var/turf/simulated/S = loc
-		if(!istype(S)) return
-		for(var/d in cardinal)
-			if(rand(25))
-				var/turf/simulated/target = get_step(src,d)
-				var/turf/simulated/origin = get_turf(src)
-				if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
-					if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
-						new/obj/effect/decal/cleanable/liquid_fuel(target, amount*0.25)
-						amount *= 0.75
+/obj/effect/decal/cleanable/liquid_fuel/proc/Spread()
+	//Allows liquid fuels to sometimes flow into other tiles.
+	if(amount < 0.5) return
+	var/turf/simulated/S = loc
+	if(!istype(S)) return
+	for(var/d in cardinal)
+		if(rand(25))
+			var/turf/simulated/target = get_step(src, d)
+			var/turf/simulated/origin = get_turf(src)
+			if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
+				if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
+					new/obj/effect/decal/cleanable/liquid_fuel(target, amount*0.25)
+					amount *= 0.75
 
-	flamethrower_fuel
-		icon_state = "mustard"
-		anchored = 0
-		New(newLoc, amt = 1, d = 0)
-			dir = d //Setting this direction means you won't get torched by your own flamethrower.
-			. = ..()
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel
+	icon_state = "mustard"
+	anchored = 0
 
-		Spread()
-			//The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
-			if(amount < 0.1) return
-			var/turf/simulated/S = loc
-			if(!istype(S)) return
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
+	dir = d //Setting this direction means you won't get torched by your own flamethrower.
+	. = ..()
 
-			for(var/d in list(turn(dir,90),turn(dir,-90), dir))
-				var/turf/simulated/O = get_step(S,d)
-				if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O)
-					continue
-				if(O.CanPass(null, S, 0, 0) && S.CanPass(null, O, 0, 0))
-					new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d)
-					O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately.
+/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Spread()
+	//The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
+	if(amount < 0.1) return
+	var/turf/simulated/S = loc
+	if(!istype(S)) return
 
-			amount *= 0.25
+	for(var/d in list(turn(dir,90),turn(dir,-90), dir))
+		var/turf/simulated/O = get_step(S,d)
+		if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O)
+			continue
+		if(O.CanPass(null, S, 0, 0) && S.CanPass(null, O, 0, 0))
+			new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d)
+			O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately.
+
+	amount *= 0.25

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -117,10 +117,13 @@ var/global/list/image/splatter_cache=list()
 		user.hand_blood_color = basecolor
 		user.update_inv_gloves(1)
 		user.verbs += /mob/living/carbon/human/proc/bloody_doodle
+		
+/obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
+	return amount
 
 /obj/effect/decal/cleanable/blood/splatter
-        random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
-        amount = 2
+	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
+	amount = 2
 
 /obj/effect/decal/cleanable/blood/drip
 	name = "drips of blood"

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -89,15 +89,20 @@
 /obj/effect/decal/cleanable/cobweb/fire_act()
 	qdel(src)
 
-/obj/effect/decal/cleanable/molten_item
+/obj/effect/decal/cleanable/molten_object
 	name = "gooey grey mass"
 	desc = "It looks like a melted... something."
 	density = 0
 	anchored = 1
 	layer = 3
-	icon = 'icons/obj/chemical.dmi'
+	gender = NEUTER
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "molten"
 
+/obj/effect/decal/cleanable/molten_object/large
+	name = "big gooey grey mass"
+	icon_state = "big_molten"
+
 /obj/effect/decal/cleanable/cobweb2
 	name = "cobweb"
 	desc = "Somebody should remove that."
@@ -145,6 +150,15 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 
+/obj/effect/decal/cleanable/plant_smudge
+	name = "plant smudge"
+	density = 0
+	anchored = 1
+	layer = 2
+	gender = NEUTER
+	icon = 'icons/effects/tomatodecal.dmi'
+	random_icon_states = list("smashed_plant")
+
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
 	desc = "Seems like this one won't hatch."
@@ -163,16 +177,6 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
 
-/obj/effect/decal/cleanable/fruit_smudge
-	name = "smudge"
-	desc = "Some kind of fruit smear."
-	density = 0
-	anchored = 1
-	layer = 2
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "mfloor1"
-	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
-
 /obj/effect/decal/cleanable/fungus
 	name = "space fungus"
 	desc = "A fungal growth. Looks pretty nasty."

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -11,6 +11,9 @@
 
 /obj/effect/decal/cleanable/blood/gibs/robot/dry()	//pieces of robots do not dry up like
 	return
+	
+/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
+	return FALSE
 
 /obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
 	spawn (0)
@@ -42,6 +45,9 @@
 	desc = "It's black and greasy. Looks like Beepsky made another mess."
 	basecolor="#030303"
 
+/obj/effect/decal/cleanable/blood/oil/can_bloodcrawl_in()
+	return FALSE
+
 /obj/effect/decal/cleanable/blood/oil/dry()
 	return
 

code/game/objects/effects/decals/cleanable.dm

@@ -3,6 +3,9 @@
 	var/targeted_by = null			// Used so cleanbots can't claim a mess.
 	var/noscoop = 0   //if it has this, don't let it be scooped up
 	var/noclear = 0    //if it has this, don't delete it when its' scooped up
+	
+/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
+	return FALSE
 
 /obj/effect/decal/cleanable/New()
 	if(random_icon_states && length(src.random_icon_states) > 0)

code/game/objects/effects/effect_system.dm

@@ -425,21 +425,6 @@ steam.start() -- spawns the effect
 /obj/effect/effect/chem_smoke/Move()
 	..()
 
-	return
-
-// Spores
-/datum/effect/system/chem_smoke_spread/spores
-	var/datum/seed/seed
-
-/datum/effect/system/chem_smoke_spread/spores/New(seed_name)
-	if(seed_name && plant_controller)
-		seed = plant_controller.seeds[seed_name]
-	if(!seed)
-		qdel(src)
-	..()
-
-
-
 /datum/effect/system/chem_smoke_spread/New()
 	..()
 	chemholder = new/obj()
@@ -517,13 +502,6 @@ steam.start() -- spawns the effect
 				var/mob/living/carbon/C = A
 				if(C.can_breathe_gas())
 					chemholder.reagents.copy_to(C, chemholder.reagents.total_volume)
-			if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
-				var/obj/machinery/portable_atmospherics/hydroponics/tray = A
-				chemholder.reagents.copy_to(tray, chemholder.reagents.total_volume)
-			if(istype(A, /obj/effect/plant))
-				var/obj/effect/plant/plant = A
-				if(chemholder.reagents.has_reagent("atrazine"))
-					plant.die_off()
 		qdel(smokeholder)
 		for(i=0, i<src.number, i++)
 			if(src.total_smoke > 20)

code/game/objects/effects/glowshroom.dm

@@ -2,32 +2,39 @@
 
 /obj/effect/glowshroom
 	name = "glowshroom"
+	desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
 	anchored = 1
 	opacity = 0
 	density = 0
 	icon = 'icons/obj/lighting.dmi'
-	icon_state = "glowshroomf"
+	icon_state = "glowshroom" //replaced in New
 	layer = 2.1
 	var/endurance = 30
 	var/potency = 30
 	var/delay = 1200
 	var/floor = 0
 	var/yield = 3
-	var/spreadChance = 40
+	var/generation = 1
 	var/spreadIntoAdjacentChance = 60
-	var/evolveChance = 2
-	var/lastTick = 0
-	var/spreaded = 1
+	light_color = "#006622"
+
+obj/effect/glowshroom/glowcap
+	name = "glowcap"
+	icon_state = "glowcap"
+	light_color = "#8E0300"
 
 /obj/effect/glowshroom/single
-	spreadChance = 0
+	yield = 0
+
+/obj/effect/glowshroom/examine(mob/user)
+	. = ..()
+	to_chat(user, "This is a [generation]\th generation [name]!")
 
 /obj/effect/glowshroom/New()
-
 	..()
-
+	set_light(round(potency/10))
 	dir = CalcDir()
-
+	var/base_icon_state = initial(icon_state)
 	if(!floor)
 		switch(dir) //offset to make it be on the wall rather than on the floor
 			if(NORTH)
@@ -38,70 +45,52 @@
 				pixel_x = 32
 			if(WEST)
 				pixel_x = -32
-		icon_state = "glowshroom[rand(1,3)]"
+		icon_state = "[base_icon_state][rand(1,3)]"
 	else //if on the floor, glowshroom on-floor sprite
-		icon_state = "glowshroomf"
+		icon_state = "[base_icon_state]f"
 
-	processing_objects += src
+	addtimer(src, "Spread", delay)
 
+/obj/effect/glowshroom/proc/Spread()
+	for(var/i = 1 to yield)
+		if(prob(1/(generation * generation) * 100))//This formula gives you diminishing returns based on generation. 100% with 1st gen, decreasing to 25%, 11%, 6, 4, 2...
+			var/list/possibleLocs = list()
+			var/spreadsIntoAdjacent = FALSE
 
-	set_light(round(potency/10))
-	lastTick = world.timeofday
+			if(prob(spreadIntoAdjacentChance))
+				spreadsIntoAdjacent = TRUE
 
+			for(var/turf/simulated/floor/earth in view(3,src))
+				if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
+					possibleLocs += earth
+				CHECK_TICK
 
-/obj/effect/glowshroom/Destroy()
-	processing_objects -= src
-	return ..()
+			if(!possibleLocs.len)
+				break
 
-/obj/effect/glowshroom/process()
-	if(!spreaded)
-		return
+			var/turf/newLoc = pick(possibleLocs)
 
-	if(((world.timeofday - lastTick) > delay) || ((world.timeofday - lastTick) < 0))
-		lastTick = world.timeofday
-		spreaded = 0
+			var/shroomCount = 0 //hacky
+			var/placeCount = 1
+			for(var/obj/effect/glowshroom/shroom in newLoc)
+				shroomCount++
+			for(var/wallDir in cardinal)
+				var/turf/isWall = get_step(newLoc,wallDir)
+				if(isWall.density)
+					placeCount++
+			if(shroomCount >= placeCount)
+				continue
 
-		for(var/i=1,i<=yield,i++)
-			if(prob(spreadChance))
-				var/list/possibleLocs = list()
-				var/spreadsIntoAdjacent = 0
+			var/obj/effect/glowshroom/child = new type(newLoc)//The baby mushrooms have different stats :3
+			child.potency = max(potency + rand(-3,6), 0)
+			child.yield = max(yield + rand(-1,2), 0)
+			child.delay = max(delay + rand(-30,60), 0)
+			child.endurance = max(endurance + rand(-3,6), 1)
+			child.generation = generation + 1
 
-				if(prob(spreadIntoAdjacentChance))
-					spreadsIntoAdjacent = 1
-
-				for(var/turf/simulated/floor/plating/airless/asteroid/earth in view(3,src))
-					if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
-						possibleLocs += earth
-
-				if(!possibleLocs.len)
-					break
-
-				var/turf/newLoc = pick(possibleLocs)
-
-				var/shroomCount = 0 //hacky
-				var/placeCount = 1
-				for(var/obj/effect/glowshroom/shroom in newLoc)
-					shroomCount++
-				for(var/wallDir in cardinal)
-					var/turf/isWall = get_step(newLoc,wallDir)
-					if(isWall.density)
-						placeCount++
-				if(shroomCount >= placeCount)
-					continue
-
-				var/obj/effect/glowshroom/child = new /obj/effect/glowshroom(newLoc)
-				child.potency = potency
-				child.yield = yield
-				child.delay = delay
-				child.endurance = endurance
-
-				spreaded++
-
-		if(prob(evolveChance)) //very low chance to evolve on its own
-			potency += rand(4,6)
+			CHECK_TICK
 
 /obj/effect/glowshroom/proc/CalcDir(turf/location = loc)
-	//set background = 1
 	var/direction = 16
 
 	for(var/wallDir in cardinal)
@@ -133,28 +122,22 @@
 	floor = 1
 	return 1
 
-/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/effect/glowshroom/attackby(obj/item/I, mob/user)
 	..()
-
-	endurance -= W.force
-
-	CheckEndurance()
+	if(I.damtype != STAMINA)
+		endurance -= I.force
+		CheckEndurance()
 
 /obj/effect/glowshroom/ex_act(severity)
 	switch(severity)
-		if(1.0)
+		if(1)
 			qdel(src)
-			return
-		if(2.0)
+		if(2)
 			if(prob(50))
 				qdel(src)
-				return
-		if(3.0)
+		if(3)
 			if(prob(5))
 				qdel(src)
-				return
-		else
-	return
 
 /obj/effect/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)

code/game/objects/effects/landmarks.dm

@@ -1,252 +1,267 @@
-/obj/effect/landmark
-	name = "landmark"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x2"
-	anchored = 1.0
-	unacidable = 1
-
-/obj/effect/landmark/New()
-
-	..()
-	set_tag()
-	invisibility = 101
-
-	switch(name)			//some of these are probably obsolete
-		if("start")
-			newplayer_start += loc
-			qdel(src)
-
-		if("wizard")
-			wizardstart += loc
-			qdel(src)
-
-		if("JoinLate")
-			latejoin += loc
-			qdel(src)
-
-		if("JoinLateGateway")
-			latejoin_gateway += loc
-			qdel(src)
-
-		if("JoinLateCryo")
-			latejoin_cryo += loc
-			qdel(src)
-
-		if("JoinLateCyborg")
-			latejoin_cyborg += loc
-			qdel(src)
-
-		if("prisonwarp")
-			prisonwarp += loc
-			qdel(src)
+/obj/effect/landmark
+	name = "landmark"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	anchored = 1.0
+	unacidable = 1
 
-		if("prisonsecuritywarp")
-			prisonsecuritywarp += loc
-			qdel(src)
+/obj/effect/landmark/New()
 
-		if("tdome1")
-			tdome1	+= loc
+	..()
+	set_tag()
+	invisibility = 101
 
-		if("tdome2")
-			tdome2 += loc
+	switch(name)			//some of these are probably obsolete
+		if("start")
+			newplayer_start += loc
+			qdel(src)
 
-		if("tdomeadmin")
-			tdomeadmin	+= loc
+		if("wizard")
+			wizardstart += loc
+			qdel(src)
 
-		if("tdomeobserve")
-			tdomeobserve += loc
+		if("JoinLate")
+			latejoin += loc
+			qdel(src)
 
-		if("aroomwarp")
-			aroomwarp += loc
-
-		if("blobstart")
-			blobstart += loc
-			qdel(src)
-
-		if("xeno_spawn")
-			xeno_spawn += loc
-			qdel(src)
-
-		if("ninjastart")
-			ninjastart += loc
-			qdel(src)
-
-		if("carpspawn")
-			carplist += loc
-
-		if("voxstart")
-			raider_spawn += loc
-
-		if("ERT Director")
-			ertdirector += loc
-			qdel(src)
+		if("JoinLateGateway")
+			latejoin_gateway += loc
+			qdel(src)
 
-		if("Response Team")
-			emergencyresponseteamspawn += loc
-			qdel(src)
-
-	landmarks_list += src
-	return 1
-
-/obj/effect/landmark/Destroy()
-	landmarks_list -= src
-	..()
-	return QDEL_HINT_HARDDEL_NOW
-
-/obj/effect/landmark/proc/set_tag()
-	tag = text("landmark*[]", name)
-
-
-/obj/effect/landmark/start
-	name = "start"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-	anchored = 1.0
-
-/obj/effect/landmark/start/set_tag()
-	tag = "start*[name]"
-
-
-//Costume spawner landmarks
-
-/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
-
-	var/list/options = typesof(/obj/effect/landmark/costume)
-	var/PICK= options[rand(1,options.len)]
-	new PICK(src.loc)
-	qdel(src)
-
-//SUBCLASSES.  Spawn a bunch of items and disappear likewise
-/obj/effect/landmark/costume/chicken/New()
-	new /obj/item/clothing/suit/chickensuit(src.loc)
-	new /obj/item/clothing/head/chicken(src.loc)
-	new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/gladiator/New()
-	new /obj/item/clothing/under/gladiator(src.loc)
-	new /obj/item/clothing/head/helmet/gladiator(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/madscientist/New()
-	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
-	new /obj/item/clothing/head/flatcap(src.loc)
-	new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
-	new /obj/item/clothing/glasses/gglasses(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/elpresidente/New()
-	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
-	new /obj/item/clothing/head/flatcap(src.loc)
-	new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
-	new /obj/item/clothing/shoes/jackboots(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/nyangirl/New()
-	new /obj/item/clothing/under/schoolgirl(src.loc)
-	new /obj/item/clothing/head/kitty(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/maid/New()
-	new /obj/item/clothing/under/blackskirt(src.loc)
-	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
-	new CHOICE(src.loc)
-	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/butler/New()
-	new /obj/item/clothing/suit/wcoat(src.loc)
-	new /obj/item/clothing/under/suit_jacket(src.loc)
-	new /obj/item/clothing/head/that(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/scratch/New()
-	new /obj/item/clothing/gloves/color/white(src.loc)
-	new /obj/item/clothing/shoes/white(src.loc)
-	new /obj/item/clothing/under/scratch(src.loc)
-	if(prob(30))
-		new /obj/item/clothing/head/cueball(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/highlander/New()
-	new /obj/item/clothing/under/kilt(src.loc)
-	new /obj/item/clothing/head/beret(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/prig/New()
-	new /obj/item/clothing/suit/wcoat(src.loc)
-	new /obj/item/clothing/glasses/monocle(src.loc)
-	var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that)
-	new CHOICE(src.loc)
-	new /obj/item/clothing/shoes/black(src.loc)
-	new /obj/item/weapon/cane(src.loc)
-	new /obj/item/clothing/under/sl_suit(src.loc)
-	new /obj/item/clothing/mask/fakemoustache(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/plaguedoctor/New()
-	new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
-	new /obj/item/clothing/head/plaguedoctorhat(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/nightowl/New()
-	new /obj/item/clothing/under/owl(src.loc)
-	new /obj/item/clothing/mask/gas/owl_mask(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/waiter/New()
-	new /obj/item/clothing/under/waiter(src.loc)
-	var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
-	new CHOICE(src.loc)
-	new /obj/item/clothing/suit/apron(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/pirate/New()
-	new /obj/item/clothing/under/pirate(src.loc)
-	new /obj/item/clothing/suit/pirate_black(src.loc)
-	var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
-	new CHOICE(src.loc)
-	new /obj/item/clothing/glasses/eyepatch(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/commie/New()
-	new /obj/item/clothing/under/soviet(src.loc)
-	new /obj/item/clothing/head/ushanka(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/imperium_monk/New()
-	new /obj/item/clothing/suit/imperium_monk(src.loc)
-	if(prob(25))
-		new /obj/item/clothing/mask/gas/cyborg(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/holiday_priest/New()
-	new /obj/item/clothing/suit/holidaypriest(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/marisawizard/fake/New()
-	new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
-	new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/cutewitch/New()
-	new /obj/item/clothing/under/sundress(src.loc)
-	new /obj/item/clothing/head/witchwig(src.loc)
-	new /obj/item/weapon/twohanded/staff/broom(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/fakewizard/New()
-	new /obj/item/clothing/suit/wizrobe/fake(src.loc)
-	new /obj/item/clothing/head/wizard/fake(src.loc)
-	new /obj/item/weapon/twohanded/staff/(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/sexyclown/New()
-	new /obj/item/clothing/mask/gas/sexyclown(src.loc)
-	new /obj/item/clothing/under/sexyclown(src.loc)
-	qdel(src)
-
-/obj/effect/landmark/costume/sexymime/New()
-	new /obj/item/clothing/mask/gas/sexymime(src.loc)
-	new /obj/item/clothing/under/sexymime(src.loc)
-	qdel(src)
+		if("JoinLateCryo")
+			latejoin_cryo += loc
+			qdel(src)
+
+		if("JoinLateCyborg")
+			latejoin_cyborg += loc
+			qdel(src)
+
+		if("prisonwarp")
+			prisonwarp += loc
+			qdel(src)
+
+		if("prisonsecuritywarp")
+			prisonsecuritywarp += loc
+			qdel(src)
+
+		if("tdome1")
+			tdome1	+= loc
+
+		if("tdome2")
+			tdome2 += loc
+
+		if("tdomeadmin")
+			tdomeadmin	+= loc
+
+		if("tdomeobserve")
+			tdomeobserve += loc
+
+		if("aroomwarp")
+			aroomwarp += loc
+
+		if("blobstart")
+			blobstart += loc
+			qdel(src)
+
+		if("xeno_spawn")
+			xeno_spawn += loc
+			qdel(src)
+
+		if("ninjastart")
+			ninjastart += loc
+			qdel(src)
+
+		if("carpspawn")
+			carplist += loc
+
+		if("voxstart")
+			raider_spawn += loc
+
+		if("ERT Director")
+			ertdirector += loc
+			qdel(src)
+
+		if("Response Team")
+			emergencyresponseteamspawn += loc
+			qdel(src)
+
+	landmarks_list += src
+	return 1
+
+/obj/effect/landmark/Destroy()
+	landmarks_list -= src
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
+/obj/effect/landmark/proc/set_tag()
+	tag = text("landmark*[]", name)
+
+
+/obj/effect/landmark/start
+	name = "start"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x"
+	anchored = 1.0
+
+/obj/effect/landmark/start/set_tag()
+	tag = "start*[name]"
+
+
+//Costume spawner landmarks
+
+/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
+
+	var/list/options = typesof(/obj/effect/landmark/costume)
+	var/PICK= options[rand(1,options.len)]
+	new PICK(src.loc)
+	qdel(src)
+
+//SUBCLASSES.  Spawn a bunch of items and disappear likewise
+/obj/effect/landmark/costume/chicken/New()
+	new /obj/item/clothing/suit/chickensuit(src.loc)
+	new /obj/item/clothing/head/chicken(src.loc)
+	new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/gladiator/New()
+	new /obj/item/clothing/under/gladiator(src.loc)
+	new /obj/item/clothing/head/helmet/gladiator(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/madscientist/New()
+	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
+	new /obj/item/clothing/head/flatcap(src.loc)
+	new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
+	new /obj/item/clothing/glasses/gglasses(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/elpresidente/New()
+	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
+	new /obj/item/clothing/head/flatcap(src.loc)
+	new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
+	new /obj/item/clothing/shoes/jackboots(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/nyangirl/New()
+	new /obj/item/clothing/under/schoolgirl(src.loc)
+	new /obj/item/clothing/head/kitty(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/maid/New()
+	new /obj/item/clothing/under/blackskirt(src.loc)
+	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
+	new CHOICE(src.loc)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/butler/New()
+	new /obj/item/clothing/suit/wcoat(src.loc)
+	new /obj/item/clothing/under/suit_jacket(src.loc)
+	new /obj/item/clothing/head/that(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/scratch/New()
+	new /obj/item/clothing/gloves/color/white(src.loc)
+	new /obj/item/clothing/shoes/white(src.loc)
+	new /obj/item/clothing/under/scratch(src.loc)
+	if(prob(30))
+		new /obj/item/clothing/head/cueball(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/highlander/New()
+	new /obj/item/clothing/under/kilt(src.loc)
+	new /obj/item/clothing/head/beret(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/prig/New()
+	new /obj/item/clothing/suit/wcoat(src.loc)
+	new /obj/item/clothing/glasses/monocle(src.loc)
+	var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that)
+	new CHOICE(src.loc)
+	new /obj/item/clothing/shoes/black(src.loc)
+	new /obj/item/weapon/cane(src.loc)
+	new /obj/item/clothing/under/sl_suit(src.loc)
+	new /obj/item/clothing/mask/fakemoustache(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/plaguedoctor/New()
+	new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
+	new /obj/item/clothing/head/plaguedoctorhat(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/nightowl/New()
+	new /obj/item/clothing/under/owl(src.loc)
+	new /obj/item/clothing/mask/gas/owl_mask(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/waiter/New()
+	new /obj/item/clothing/under/waiter(src.loc)
+	var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
+	new CHOICE(src.loc)
+	new /obj/item/clothing/suit/apron(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/pirate/New()
+	new /obj/item/clothing/under/pirate(src.loc)
+	new /obj/item/clothing/suit/pirate_black(src.loc)
+	var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
+	new CHOICE(src.loc)
+	new /obj/item/clothing/glasses/eyepatch(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/commie/New()
+	new /obj/item/clothing/under/soviet(src.loc)
+	new /obj/item/clothing/head/ushanka(src.loc)
+	qdel(src)
+
+
+/obj/effect/landmark/costume/imperium_monk/New()
+	new /obj/item/clothing/suit/imperium_monk(src.loc)
+	if(prob(25))
+		new /obj/item/clothing/mask/gas/cyborg(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/holiday_priest/New()
+	new /obj/item/clothing/suit/holidaypriest(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/marisawizard/fake/New()
+	new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
+	new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/cutewitch/New()
+	new /obj/item/clothing/under/sundress(src.loc)
+	new /obj/item/clothing/head/witchwig(src.loc)
+	new /obj/item/weapon/twohanded/staff/broom(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/fakewizard/New()
+	new /obj/item/clothing/suit/wizrobe/fake(src.loc)
+	new /obj/item/clothing/head/wizard/fake(src.loc)
+	new /obj/item/weapon/twohanded/staff/(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/sexyclown/New()
+	new /obj/item/clothing/mask/gas/sexyclown(src.loc)
+	new /obj/item/clothing/under/sexyclown(src.loc)
+	qdel(src)
+
+/obj/effect/landmark/costume/sexymime/New()
+	new /obj/item/clothing/mask/gas/sexymime(src.loc)
+	new /obj/item/clothing/under/sexymime(src.loc)
+	qdel(src)
+	
+/obj/effect/landmark/ruin
+	var/datum/map_template/ruin/ruin_template
+
+/obj/effect/landmark/ruin/New(loc, my_ruin_template)
+	name = "ruin_[ruin_landmarks.len + 1]"
+	..(loc)
+	ruin_template = my_ruin_template
+	ruin_landmarks |= src
+
+/obj/effect/landmark/ruin/Destroy()
+	ruin_landmarks -= src
+	ruin_template = null
+	. = ..()

code/game/objects/effects/mines.dm

@@ -1,94 +1,166 @@
 /obj/effect/mine
-	name = "Mine"
+	name = "dummy mine"
 	desc = "I Better stay away from that thing."
-	density = 1
+	density = 0
 	anchored = 1
-	layer = 3
 	icon = 'icons/obj/weapons.dmi'
-	icon_state = "uglymine"
-	var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
-	var/triggered = 0
-
-/obj/effect/mine/New()
 	icon_state = "uglyminearmed"
+	var/triggered = 0
+	
+/obj/effect/mine/proc/mineEffect(mob/living/victim)
+	to_chat(victim, "<span class='danger'>*click*</span>")
 
 /obj/effect/mine/Crossed(AM as mob|obj)
-	Bumped(AM)
-
-/obj/effect/mine/Bumped(mob/M as mob|obj)
-
-	if(triggered) return
-
-	if(istype(M, /mob/living/carbon/human))
-		for(var/mob/O in viewers(world.view, src.loc))
-			to_chat(O, "<font color='red'>[M] triggered the [bicon(src)] [src]</font>")
-		triggered = 1
-		call(src,triggerproc)(M)
-
-/obj/effect/mine/proc/triggerrad(obj)
+	if(isanimal(AM))
+		var/mob/living/simple_animal/SA = AM
+		if(!SA.flying)
+			triggermine(SA)
+	else
+		triggermine(AM)
+		
+/obj/effect/mine/proc/triggermine(mob/living/victim)
+	if(triggered)
+		return
+	visible_message("<span class='danger'>[victim] sets off \icon[src] [src]!</span>")
 	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
-	obj:radiation += 50
-	randmutb(obj)
-	domutcheck(obj,null)
-	spawn(0)
-		qdel(src)
-
-/obj/effect/mine/proc/triggerstun(obj)
-	if(ismob(obj))
-		var/mob/M = obj
-		M.Stun(30)
-	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
-	spawn(0)
-		qdel(src)
-
-/obj/effect/mine/proc/triggern2o(obj)
-	atmos_spawn_air(SPAWN_N2O, 360)
-	spawn(0)
-		qdel(src)
-
-/obj/effect/mine/proc/triggerplasma(obj)
-	atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 360)
-	spawn(0)
-		qdel(src)
-
-/obj/effect/mine/proc/triggerkick(obj)
-	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
-	qdel(obj:client)
-	spawn(0)
-		qdel(src)
-
-/obj/effect/mine/proc/explode(obj)
-	explosion(loc, 0, 1, 2, 3)
-	spawn(0)
-		qdel(src)
+	mineEffect(victim)
+	triggered = 1
+	qdel(src)
+	
+/obj/effect/mine/explosive
+	name = "explosive mine"
+	var/range_devastation = 0
+	var/range_heavy = 1
+	var/range_light = 2
+	var/range_flash = 3
+	
+/obj/effect/mine/explosive/mineEffect(mob/living/victim)
+	explosion(loc, range_devastation, range_heavy, range_light, range_flash)	
+	
+/obj/effect/mine/stun
+	name = "stun mine"
+	var/stun_time = 8
 
+/obj/effect/mine/stun/mineEffect(mob/living/victim)
+	if(isliving(victim))
+		victim.Weaken(stun_time)
+		
 /obj/effect/mine/dnascramble
 	name = "Radiation Mine"
-	icon_state = "uglymine"
-	triggerproc = "triggerrad"
+	var/radiation_amount
+	
+/obj/effect/mine/dnascramble/mineEffect(mob/living/victim)
+	victim.apply_effect(radiation_amount, IRRADIATE, 0)
+	randmutb(victim)
+	domutcheck(victim ,null)
 
-/obj/effect/mine/plasma
-	name = "Plasma Mine"
-	icon_state = "uglymine"
-	triggerproc = "triggerplasma"
+/obj/effect/mine/gas
+	name = "oxygen mine"
+	var/gas_amount = 360
+	var/gas_type = SPAWN_OXYGEN
 
-/obj/effect/mine/kick
-	name = "Kick Mine"
-	icon_state = "uglymine"
-	triggerproc = "triggerkick"
+/obj/effect/mine/gas/mineEffect(mob/living/victim)
+	atmos_spawn_air(gas_type, gas_amount)
 
-/obj/effect/mine/n2o
-	name = "N2O Mine"
-	icon_state = "uglymine"
-	triggerproc = "triggern2o"
+/obj/effect/mine/gas/plasma
+	name = "plasma mine"
+	gas_type = SPAWN_HEAT | SPAWN_TOXINS
 
-/obj/effect/mine/stun
-	name = "Stun Mine"
-	icon_state = "uglymine"
-	triggerproc = "triggerstun"
+/obj/effect/mine/gas/n2o
+	name = "\improper N2O mine"
+	gas_type = SPAWN_N2O
+
+/obj/effect/mine/sound
+	name = "honkblaster 1000"
+	var/sound = 'sound/items/bikehorn.ogg'
+
+/obj/effect/mine/sound/mineEffect(mob/living/victim)
+	playsound(loc, sound, 100, 1)
+
+/obj/effect/mine/sound/bwoink
+	name = "bwoink mine"
+	sound = 'sound/effects/adminhelp.ogg'	
+	
+/obj/effect/mine/pickup
+	name = "pickup"
+	desc = "pick me up"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "electricity2"
+	density = 0
+	var/duration = 0
+
+/obj/effect/mine/pickup/New()
+	..()
+	animate(src, pixel_y = 4, time = 20, loop = -1)
+
+/obj/effect/mine/pickup/triggermine(mob/living/victim)
+	if(triggered)
+		return
+	triggered = 1
+	invisibility = 101
+	mineEffect(victim)
+	qdel(src)
+	
+/obj/effect/mine/pickup/bloodbath
+	name = "Red Orb"
+	desc = "You feel angry just looking at it."
+	duration = 1200 //2min
+	color = "red"
+
+/obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim)
+	if(!istype(victim) || !victim.client)
+		return
+	to_chat(victim, "<span class='reallybig redtext'>RIP AND TEAR</span>")
+	victim << 'sound/misc/e1m1.ogg'
+	var/old_color = victim.client.color
+	var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0)
+	var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
+
+	spawn(0)
+		new /obj/effect/hallucination/delusion(victim.loc, victim, force_kind = "demon", duration = duration, skip_nearby = 0)
+
+	var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
+	chainsaw.flags |= NODROP
+	victim.drop_l_hand()
+	victim.drop_r_hand()
+	victim.put_in_hands(chainsaw)
+	chainsaw.attack_self(victim)
+	chainsaw.wield(victim)
+	victim.reagents.add_reagent("adminordrazine", 25)
+
+	victim.client.color = pure_red
+	animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT)
+	spawn(10)
+		animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
+	spawn(duration)
+		to_chat(victim, "<span class='notice'>Your bloodlust seeps back into the bog of your subconscious and you regain self control.<span>")
+		qdel(chainsaw)
+		qdel(src)
+
+/obj/effect/mine/pickup/healing
+	name = "Blue Orb"
+	desc = "You feel better just looking at it."
+	color = "blue"
+
+/obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim)
+	if(!victim.client || !istype(victim))
+		return
+	to_chat(victim, "<span class='notice'>You feel great!</span>")
+	victim.revive()
+
+/obj/effect/mine/pickup/speed
+	name = "Yellow Orb"
+	desc = "You feel faster just looking at it."
+	color = "yellow"
+	duration = 300
+
+/obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim)
+	if(!victim.client || !istype(victim))
+		return
+	to_chat(victim, "<span class='notice'>You feel fast!</span>")
+	victim.status_flags |= GOTTAGOREALLYFAST
+	spawn(duration)
+		victim.status_flags &= ~GOTTAGOREALLYFAST
+		to_chat(victim, "<span class='notice'>You slow down.</span>")

code/game/objects/effects/overlays.dm

@@ -1,4 +1,3 @@
-
 /obj/effect/overlay
 	name = "overlay"
 	unacidable = 1
@@ -17,60 +16,9 @@
 	var/tmp/atom/BeamSource
 	New()
 		..()
-		spawn(10) qdel(src)
-
-
-/obj/effect/overlay/temp
-	anchored = 1
-	layer = 4.1
-	mouse_opacity = 0
-	var/duration = 10
-	var/randomdir = 1
-
-/obj/effect/overlay/temp/New()
-	if(randomdir)
-		dir = pick(cardinal)
-	spawn(duration)
-		qdel(src)
-
-/obj/effect/overlay/temp/revenant
-	name = "spooky lights"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "purplesparkles"
-
-/obj/effect/overlay/temp/revenant/cracks
-	name = "glowing cracks"
-	icon_state = "purplecrack"
-	duration = 6
-
-/obj/effect/overlay/temp/guardian
-	randomdir = 0
-
-/obj/effect/overlay/temp/guardian/phase
-	duration = 5
-	icon_state = "phasein"
-
-/obj/effect/overlay/temp/guardian/phase/out
-	icon_state = "phaseout"
-
-/obj/effect/overlay/temp/emp
-	name = "emp sparks"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "empdisable"
-
-/obj/effect/overlay/temp/emp/pulse
-	name = "emp pulse"
-	icon_state = "emp pulse"
-	duration = 8
-	randomdir = 0
-
-/obj/effect/overlay/temp/kinetic_blast
-	name = "kinetic explosion"
-	icon = 'icons/obj/projectiles.dmi'
-	icon_state = "kinetic_blast"
-	layer = 4.1
-	duration = 4
-
+		spawn(10) 
+			qdel(src)
+			
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'
@@ -98,6 +46,152 @@
 	icon_state = "admin"
 	layer = 4.1
 
+/obj/effect/overlay/temp
+	anchored = 1
+	layer = 4.1
+	mouse_opacity = 0
+	var/duration = 10
+	var/randomdir = 1
+
+/obj/effect/overlay/temp/New()
+	if(randomdir)
+		dir = pick(cardinal)
+		
+	flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation.
+
+	spawn(duration)
+		qdel(src)
+
+/obj/effect/overlay/temp/revenant
+	name = "spooky lights"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "purplesparkles"
+
+/obj/effect/overlay/temp/revenant/cracks
+	name = "glowing cracks"
+	icon_state = "purplecrack"
+	duration = 6
+
+/obj/effect/overlay/temp/guardian
+	randomdir = 0
+
+/obj/effect/overlay/temp/guardian/phase
+	duration = 5
+	icon_state = "phasein"
+
+/obj/effect/overlay/temp/guardian/phase/out
+	icon_state = "phaseout"
+	
+/obj/effect/overlay/temp/emp
+	name = "emp sparks"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "empdisable"
+
+/obj/effect/overlay/temp/emp/pulse
+	name = "emp pulse"
+	icon_state = "emppulse"
+	duration = 8
+	randomdir = 0
+	
+/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
+	name = "healing glow"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "heal"
+	duration = 15
+
+/obj/effect/overlay/temp/heal/New(loc, colour)
+	..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)
+	if(colour)
+		color = colour
+
+/obj/effect/overlay/temp/kinetic_blast
+	name = "kinetic explosion"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "kinetic_blast"
+	layer = 4.1
+	duration = 4
+	
+/obj/effect/overlay/temp/decoy
+	desc = "It's a decoy!"
+	duration = 15
+
+/obj/effect/overlay/temp/decoy/New(loc, atom/mimiced_atom)
+	..()
+	alpha = initial(alpha)
+	if(mimiced_atom)
+		name = mimiced_atom.name
+		appearance = mimiced_atom.appearance
+		dir = mimiced_atom.dir
+		mouse_opacity = 0
+
+/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
+	..()
+	animate(src, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/cult
+	icon = 'icons/effects/effects.dmi'
+	randomdir = 0
+	duration = 10
+
+/obj/effect/overlay/temp/cult/sparks
+	randomdir = 1
+	name = "blood sparks"
+	icon_state = "bloodsparkles"	
+	
+/obj/effect/overlay/temp/dir_setting
+	randomdir = FALSE
+
+/obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
+	if(set_dir)
+		dir = set_dir
+	..()
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter
+	icon = 'icons/effects/blood.dmi'
+	duration = 5
+	randomdir = FALSE
+	layer = MOB_LAYER - 0.1
+	var/splatter_type = "splatter"
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+	if(set_dir in diagonals)
+		icon_state = "[splatter_type][pick(1, 2, 6)]"
+	else
+		icon_state = "[splatter_type][pick(3, 4, 5)]"
+	..()
+	var/target_pixel_x = 0
+	var/target_pixel_y = 0
+	switch(set_dir)
+		if(NORTH)
+			target_pixel_y = 16
+		if(SOUTH)
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+		if(EAST)
+			target_pixel_x = 16
+		if(WEST)
+			target_pixel_x = -16
+		if(NORTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = 16
+		if(NORTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = 16
+		if(SOUTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+		if(SOUTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = -16
+			layer = MOB_LAYER + 0.1
+	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
+
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
+	splatter_type = "xsplatter"
+
 /obj/effect/overlay/wall_rot
 	name = "Wallrot"
 	desc = "Ick..."

code/game/objects/effects/spawners/lootdrop.dm

@@ -103,8 +103,8 @@
 				/obj/item/weapon/hand_labeler = 10,
 				/obj/item/weapon/paper/crumpled = 10,
 				/obj/item/weapon/pen = 10,
-				 /obj/item/weapon/minihoe = 10,
-				/obj/item/weapon/plantspray/pests = 10,
+				 /obj/item/weapon/cultivator = 10,
+				/obj/item/weapon/reagent_containers/spray/pestspray = 10,
 				/obj/item/weapon/stock_parts/cell = 30,
 				/obj/item/weapon/storage/belt/utility = 20,
 				/obj/item/weapon/storage/box = 20,
@@ -122,13 +122,13 @@
 				/obj/item/weapon/wrench = 40,
 				/obj/item/weapon/relic = 35,
 				/obj/item/clothing/shoes/brown = 30,
-				/obj/item/seeds/ambrosiadeusseed = 10,
-				/obj/item/seeds/ambrosiavulgarisseed = 20,
+				/obj/item/seeds/ambrosia/deus = 10,
+				/obj/item/seeds/ambrosia = 20,
 				/obj/item/clothing/under/color/black = 30,
 				/obj/item/stack/tape_roll = 10,
 				////////////////CONTRABAND STUFF//////////////////
 				/obj/item/weapon/grenade/clown_grenade = 3,
-				/obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3,
+				/obj/item/seeds/ambrosia/cruciatus = 3,
 				/obj/item/weapon/gun/projectile/automatic/pistol/empty = 1,
 				/obj/item/ammo_box/magazine/m10mm = 4,
 				/obj/item/weapon/soap/syndie = 7,

code/game/objects/items/blueprints.dm

@@ -53,7 +53,7 @@
 						By submitting this form, you accept any fines, fees, or personal injury/death that may occur during construction."
 	w_class = 1
 
-/obj/item/areaeditor/permit/attack_self(mob/user as mob)
+/obj/item/areaeditor/permit/attack_self(mob/user)
 	. = ..()
 	var/area/A = get_area()
 	if(get_area_type() == AREA_STATION)
@@ -85,7 +85,7 @@
 	return ..()
 
 
-/obj/item/areaeditor/blueprints/attack_self(mob/user as mob)
+/obj/item/areaeditor/blueprints/attack_self(mob/user)
 	. = ..()
 	var/area/A = get_area()
 	if(get_area_type() == AREA_STATION)
@@ -153,7 +153,7 @@
 
 
 /obj/item/areaeditor/proc/get_area_type(var/area/A = get_area())
-	if(istype(A,/area/space))
+	if(A.outdoors)
 		return AREA_SPACE
 	var/list/SPECIALS = list(
 		/area/shuttle,
@@ -305,3 +305,10 @@
 					return ROOM_ERR_SPACE
 		found+=T
 	return found
+
+//Blueprint Subtypes
+
+/obj/item/areaeditor/blueprints/cyborg
+	name = "station schematics"
+	desc = "A digital copy of the station blueprints stored in your memory."
+	fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."

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

@@ -1,44 +0,0 @@
-/**
- * Multitool -- A multitool is used for hacking electronic devices.
- * TO-DO -- Using it as a power measurement tool for cables etc. Nannek.
- *
- */
-
-/obj/item/device/debugger
-	icon = 'icons/obj/hacktool.dmi'
-	name = "debugger"
-	desc = "Used to debug electronic equipment."
-	icon_state = "hacktool-g"
-	flags = CONDUCT
-	force = 5.0
-	w_class = 2
-	throwforce = 5.0
-	throw_range = 15
-	throw_speed = 3
-	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	materials = list(MAT_METAL=50, MAT_GLASS=20)
-	origin_tech = "magnets=1;engineering=1"
-	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
-
-/obj/item/device/debugger/is_used_on(obj/O, mob/user)
-	if(istype(O, /obj/machinery/power/apc))
-		var/obj/machinery/power/apc/A = O
-		if(A.emagged || A.malfhack)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1
-	if(istype(O, /obj/machinery/door))
-		var/obj/machinery/door/D = O
-		if(D.operating == -1)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1
-	else if(istype(O, /obj/machinery))
-		var/obj/machinery/A = O
-		if(A.emagged)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1

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

@@ -128,8 +128,8 @@
 			to_chat(S, "<span class='warning'>Your sensors were overloaded by a laser!</span>")
 			outmsg = "<span class='notice'>You overload [S] by shining [src] at their sensors.</span>"
 
-			S.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had a laser pointer shone in their eyes by [user.name] ([user.ckey])</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='orange'>Shone a laser pointer in the eyes of [S.name] ([S.ckey])</font>")
+			S.create_attack_log("<font color='orange'>Has had a laser pointer shone in their eyes by [user.name] ([user.ckey])</font>")
+			user.create_attack_log("<font color='orange'>Shone a laser pointer in the eyes of [S.name] ([S.ckey])</font>")
 			log_attack("<font color='orange'>[user.name] ([user.ckey]) Shone a laser pointer in the eyes of [S.name] ([S.ckey])</font>")
 		else
 			outmsg = "<span class='notice'>You fail to overload [S] by shining [src] at their sensors.</span>"
@@ -142,7 +142,7 @@
 			outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
 
 			log_admin("\[[time_stamp()]\] [user.name] ([user.ckey]) EMPd a camera with a laser pointer")
-			user.attack_log += text("\[[time_stamp()]\] [user.name] ([user.ckey]) EMPd a camera with a laser pointer")
+			user.create_attack_log("[user.name] ([user.ckey]) EMPd a camera with a laser pointer")
 		else
 			outmsg = "<span class='info'>You missed the lens of [C] with [src].</span>"
 

code/game/objects/items/devices/radio/headset.dm

@@ -63,18 +63,16 @@
 		return RADIO_CONNECTION_FAIL
 
 	return ..()
-
-/obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0)
-	if(aiOverride)
-		return ..(freq, level)
+	
+/obj/item/device/radio/headset/is_listening()
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		if(H.l_ear == src || H.r_ear == src)
-			return ..(freq, level)
-	else if(isanimal(loc))
-		// frankly, all the ones with inventory are small enough to not warrant snowflaking the slot check somehow
-		return ..(freq, level)
-	return -1
+			return ..()
+	else if(isanimal(loc) || isAI(loc))
+		return ..()
+	
+	return FALSE
 
 /obj/item/device/radio/headset/alt
 	name = "bowman headset"
@@ -304,10 +302,10 @@
 	var/myAi = null    // Atlantis: Reference back to the AI which has this radio.
 	var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
 
-/obj/item/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
+/obj/item/device/radio/headset/heads/ai_integrated/is_listening()
 	if(disabledAi)
-		return -1 //Transciever Disabled.
-	return ..(freq, level, 1)
+		return FALSE
+	return ..()
 
 /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	user.set_machine(src)

code/game/objects/items/devices/radio/intercom.dm

@@ -120,15 +120,13 @@
 		attack_self(user)
 
 /obj/item/device/radio/intercom/receive_range(freq, level)
-	if(!on)
+	if(!is_listening())
 		return -1
 	if(!(0 in level))
 		var/turf/position = get_turf(src)
 		// TODO: Integrate radio with the space manager
 		if(isnull(position) || !(position.z in level))
 			return -1
-	if(!src.listening)
-		return -1
 	if(freq in ANTAG_FREQS)
 		if(!(src.syndie))
 			return -1//Prevents broadcast of messages over devices lacking the encryption

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

@@ -71,6 +71,7 @@ var/global/list/default_medbay_channels = list(
 		initialize()
 
 	internal_channels = default_internal_channels.Copy()
+	global_radios |= src
 
 /obj/item/device/radio/Destroy()
 	qdel(wires)
@@ -80,6 +81,7 @@ var/global/list/default_medbay_channels = list(
 		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
 	patch_link = null
+	global_radios -= src
 	return ..()
 
 
@@ -532,19 +534,15 @@ var/global/list/default_medbay_channels = list(
 	// what the range is in which mobs will hear the radio
 	// returns: -1 if can't receive, range otherwise
 
-	if(!wires || wires.IsIndexCut(WIRE_RECEIVE))
-		return -1
-	if(!listening)
+	if(!is_listening())
 		return -1
 	if(!(0 in level))
 		var/turf/position = get_turf(src)
 		if(!position || !(position.z in level))
 			return -1
 	if(freq in ANTAG_FREQS)
-		if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
+		if(!(syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
 			return -1
-	if(!on)
-		return -1
 	if(!freq) //recieved on main frequency
 		if(!listening)
 			return -1
@@ -561,11 +559,26 @@ var/global/list/default_medbay_channels = list(
 	return canhear_range
 
 /obj/item/device/radio/proc/send_hear(freq, level)
-
 	var/range = receive_range(freq, level)
 	if(range > -1)
 		return get_mobs_in_view(canhear_range, src)
+		
+/obj/item/device/radio/proc/is_listening()
+	var/is_listening = TRUE
+	if(!on)
+		is_listening = FALSE
+	if(!wires || wires.IsIndexCut(WIRE_RECEIVE))
+		is_listening = FALSE
+	if(!listening)
+		is_listening = FALSE
 
+	return is_listening
+		
+/obj/item/device/radio/proc/send_announcement()
+	if(is_listening())
+		return get_mobs_in_view(canhear_range, src)
+		
+	return null
 
 /obj/item/device/radio/examine(mob/user, var/distance = -1)
 	. = ..(user, distance)

code/game/objects/items/robot/ai_upgrades.dm

@@ -5,7 +5,7 @@
 /obj/item/device/malf_upgrade
 	name = "combat software upgrade"
 	desc = "A highly illegal, highly dangerous upgrade for artificial intelligence units, granting them a variety of powers as well as the ability to hack APCs."
-	icon = 'icons/obj/cloning.dmi'
+	icon = 'icons/obj/module.dmi'
 	icon_state = "datadisk3"
 
 
@@ -26,7 +26,7 @@
 /obj/item/device/surveillance_upgrade
 	name = "surveillance software upgrade"
 	desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading."
-	icon = 'icons/obj/cloning.dmi'
+	icon = 'icons/obj/module.dmi'
 	icon_state = "datadisk3"
 
 /obj/item/device/surveillance_upgrade/afterattack(mob/living/silicon/ai/AI, mob/user)

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

@@ -152,8 +152,6 @@
 	icon_state = "burnkit"
 	heal_burn = 25
 
-
-
 //Medical Herbs//
 
 
@@ -161,8 +159,8 @@
 	name = "\improper Comfrey leaf"
 	singular_name = "Comfrey leaf"
 	desc = "A soft leaf that is rubbed on bruises."
-	icon = 'icons/obj/hydroponics_products.dmi'
-	icon_state = "alien3-product"
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "tea_aspera_leaves"
 	color = "#378C61"
 	heal_brute = 12
 
@@ -171,13 +169,12 @@
 	name = "\improper Aloe Vera leaf"
 	singular_name = "Aloe Vera leaf"
 	desc = "A cold leaf that is rubbed on burns."
-	icon = 'icons/obj/hydroponics_products.dmi'
-	icon_state = "ambrosia-product"
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "ambrosiavulgaris"
 	color = "#4CC5C7"
 	heal_burn = 12
 
 
-
 //Splits//
 
 

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

@@ -102,19 +102,49 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
 	icon_state = "sheet-leather"
 	origin_tech = "materials=2"
 
+/obj/item/stack/sheet/sinew
+	name = "watcher sinew"
+	icon = 'icons/obj/mining.dmi'
+	desc = "Long stringy filaments which presumably came from a watcher's wings."
+	singular_name = "watcher sinew"
+	icon_state = "sinew"
+	origin_tech = "biotech=4"	
+	
+var/global/list/datum/stack_recipe/sinew_recipes = list ( \
+	new/datum/stack_recipe("sinew restraints", /obj/item/weapon/restraints/handcuffs/sinew, 1, on_floor = 1), \
+	)
 
+/obj/item/stack/sheet/sinew/New(var/loc, var/amount=null)
+	recipes = sinew_recipes
+	return ..()
+	
+/obj/item/stack/sheet/animalhide/goliath_hide
+	name = "goliath hide plates"
+	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "goliath_hide"
+	singular_name = "hide plate"
+	flags = NOBLUDGEON
+	w_class = 3
+	layer = MOB_LAYER
 
+/obj/item/stack/sheet/animalhide/ashdrake
+	name = "ash drake hide"
+	desc = "The strong, scaled hide of an ash drake."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "dragon_hide"
+	singular_name = "drake plate"
+	flags = NOBLUDGEON
+	w_class = 3
+	layer = MOB_LAYER
+	
 //Step one - dehairing.
 
 /obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(	istype(W, /obj/item/weapon/kitchen/knife) || \
-		istype(W, /obj/item/weapon/twohanded/fireaxe) || \
-		istype(W, /obj/item/weapon/hatchet) )
-
-		//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
-		usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh")
+	if(W.sharp)
+		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
 		if(do_after(user,50, target = src))
-			to_chat(usr, "\blue You cut the hair from this [src.singular_name]")
+			to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
 			//Try locating an exisitng stack on the tile and add to there if possible
 			for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc)
 				if(HS.amount < 50)
@@ -128,7 +158,6 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
 	else
 		..()
 
-
 //Step two - washing..... it's actually in washing machine code.
 
 //Step three - drying

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

@@ -18,7 +18,7 @@ Mineral Sheets
 */
 
 var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
-	new/datum/stack_recipe("pile of dirt", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
 	)
 

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

@@ -145,6 +145,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
 	new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
@@ -170,13 +171,42 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 /*
  * Cloth
  */
+var/global/list/datum/stack_recipe/cloth_recipes = list ( \
+	new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \
+	new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/black, 2), \
+	null, \
+	new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \
+	new/datum/stack_recipe("dufflebag", /obj/item/weapon/storage/backpack/duffel, 6), \
+	null, \
+	new/datum/stack_recipe("plant bag", /obj/item/weapon/storage/bag/plants, 4), \
+	new/datum/stack_recipe("book bag", /obj/item/weapon/storage/bag/books, 4), \
+	new/datum/stack_recipe("mining satchel", /obj/item/weapon/storage/bag/ore, 4), \
+	new/datum/stack_recipe("chemistry bag", /obj/item/weapon/storage/bag/chemistry, 4), \
+	new/datum/stack_recipe("bio bag", /obj/item/weapon/storage/bag/bio, 4), \
+	null, \
+	new/datum/stack_recipe("rag", /obj/item/weapon/reagent_containers/glass/rag, 1), \
+	new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 3), \
+	null, \
+	new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \
+	new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \
+	)
+
 /obj/item/stack/sheet/cloth
 	name = "cloth"
-	desc = "This roll of cloth is made from only the finest chemicals and bunny rabbits."
+	desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell."
 	singular_name = "cloth roll"
 	icon_state = "sheet-cloth"
 	origin_tech = "materials=2"
 	burn_state = FLAMMABLE
+	force = 0
+	throwforce = 0
+
+/obj/item/stack/sheet/cloth/New(loc, amount=null)
+	recipes = cloth_recipes
+	..()
+
+/obj/item/stack/sheet/cloth/ten
+	amount = 10
 
 /*
  * Cardboard
@@ -240,3 +270,19 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null)
 	recipes = runed_metal_recipes
 	return ..()
+
+/*
+ * Bones
+ */
+/obj/item/stack/sheet/bone
+	name = "bones"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "bone"
+	singular_name = "bone"
+	desc = "Someone's been drinking their milk."
+	force = 7
+	throwforce = 5
+	w_class = 3
+	throw_speed = 1
+	throw_range = 3
+	origin_tech = "materials=2;biotech=2"

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

@@ -46,13 +46,10 @@
 						to_chat(user, "<span class='warning'>The buzzing inside the briefcase swells momentarily, then returns to normal. Guess it was too cramped...</span>")
 				S.reagents.clear_reagents()
 				S.update_icon()
-	else if(istype(I, /obj/item/weapon/plantspray))
-		var/obj/item/weapon/plantspray/PS = I
-		user.drop_item(PS)
-		bees_left = max(0, (bees_left - PS.pest_kill_str))
-		to_chat(user, "You spray [PS] into \the [src].")
+	else if(istype(I, /obj/item/weapon/reagent_containers/spray/pestspray))
+		bees_left = max(0, (bees_left - 6))
+		to_chat(user, "You spray [I] into [src].")
 		playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
-		qdel(PS)
 
 /obj/item/weapon/bee_briefcase/attack_self(mob/user as mob)
 	if(!bees_left)

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

@@ -397,6 +397,7 @@
 							"medical",
 							"HoS",
 							"research",
+							"cargo",
 							"engineering",
 							"CMO",
 							"RD",
@@ -757,7 +758,7 @@
 	override_name = 1
 
 /proc/get_station_card_skins()
-	return list("data","id","gold","silver","security","medical","research","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
+	return list("data","id","gold","silver","security","medical","research","cargo","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
 
 /proc/get_centcom_card_skins()
 	return list("centcom","centcom_old","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
@@ -769,6 +770,8 @@
 	switch(skin)
 		if("id")
 			return "Standard"
+		if("cargo")
+			return "Supply"
 		if("HoS")
 			return "Head of Security"
 		if("CMO")

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

@@ -42,11 +42,13 @@ LIGHTERS ARE IN LIGHTERS.DM
 
 /obj/item/clothing/mask/cigarette/New()
 	..()
-	flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 30
+	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 
 /obj/item/clothing/mask/cigarette/Destroy()
-	qdel(reagents)
+	if(reagents)
+		qdel(reagents)
+	processing_objects -= src
 	return ..()
 
 /obj/item/clothing/mask/cigarette/attack(var/mob/living/M, var/mob/living/user, def_zone)
@@ -135,7 +137,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 				M.unEquip(src, 1)
 			qdel(src)
 			return
-		flags &= ~NOREACT // allowing reagents to react after being lit
+		reagents.set_reacting(TRUE)
 		reagents.handle_reactions()
 		icon_state = icon_on
 		item_state = icon_on
@@ -205,9 +207,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 	var/random_reagent = pick("fuel","saltpetre","synaptizine","green_vomit","potass_iodide","msg","lexorin","mannitol","spaceacillin","cryoxadone","holywater","tea","egg","haloperidol","mutagen","omnizine","carpet","aranesp","cryostylane","chocolate","bilk","cheese","rum","blood","charcoal","coffee","ectoplasm","space_drugs","milk","mutadone","antihol","teporone","insulin","salbutamol","toxin")
 	reagents.add_reagent(random_reagent, 10)
 
-/obj/item/clothing/mask/cigarette/joint
-	name = "joint"
-	desc = "A roll of ambrosium vulgaris wrapped in a thin paper. Dude."
+/obj/item/clothing/mask/cigarette/rollie
+	name = "rollie"
+	desc = "A roll of dried plant matter wrapped in thin paper."
 	icon_state = "spliffoff"
 	icon_on = "spliffon"
 	icon_off = "spliffoff"
@@ -217,35 +219,21 @@ LIGHTERS ARE IN LIGHTERS.DM
 	smoketime = 180
 	chem_volume = 50
 
-/obj/item/clothing/mask/cigarette/joint/New()
+/obj/item/clothing/mask/cigarette/rollie/New()
 	..()
-	var/list/jointnames = list("joint","doobie","spliff","blunt")
-	name = pick(jointnames)
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
-/obj/item/clothing/mask/cigarette/joint/deus
-	desc = "A roll of ambrosium deus wrapped in a thin paper. Dude."
 
 /obj/item/weapon/cigbutt/roach
 	name = "roach"
-	desc = "A manky old roach."
+	desc = "A manky old roach, or for non-stoners, a used rollup."
 	icon_state = "roach"
 
 /obj/item/weapon/cigbutt/roach/New()
 	..()
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
-
-/obj/item/clothing/mask/cigarette/handroll
-	name = "hand-rolled cigarette"
-	desc = "A roll of tobacco and nicotine, freshly rolled by hand."
-	icon_state = "hr_cigoff"
-	item_state = "hr_cigoff"
-	icon_on = "hr_cigon"  //Note - these are in masks.dmi not in cigarette.dmi
-	icon_off = "hr_cigoff"
-	type_butt = /obj/item/weapon/cigbutt
-	chem_volume = 50
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
 ////////////
 // CIGARS //
@@ -386,51 +374,30 @@ LIGHTERS ARE IN LIGHTERS.DM
 ///////////
 //ROLLING//
 ///////////
-obj/item/weapon/rollingpaper
+/obj/item/weapon/rollingpaper
 	name = "rolling paper"
 	desc = "A thin piece of paper used to make fine smokeables."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper"
 	w_class = 1
 
-
-obj/item/weapon/rollingpaperpack
-	name = "rolling paper pack"
-	desc = "A pack of Nanotrasen brand rolling papers."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "cig_paper_pack"
-	w_class = 1
-	var/papers = 25
-
-obj/item/weapon/rollingpaperpack/attack_self(mob/user)
-	if(papers > 1)
-		var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
-		user.put_in_inactive_hand(P)
-		to_chat(user, "You take a paper out of the pack.")
-		papers --
-	else
-		var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
-		user.put_in_inactive_hand(P)
-		to_chat(user, "You take the last paper out of the pack, and throw the pack away.")
-		qdel(src)
-
-/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
-	var/mob/M = usr
-	if(M.restrained() || M.stat)
+/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity)
+	if(!proximity)
 		return
-
-	if(over_object == M)
-		M.put_in_hands(src)
-
-	else if(istype(over_object, /obj/screen))
-		switch(over_object.name)
-			if("r_hand")
-				M.unEquip(src)
-				M.put_in_r_hand(src)
-			if("l_hand")
-				M.unEquip(src)
-				M.put_in_l_hand(src)
-
-/obj/item/weapon/rollingpaperpack/examine(mob/user)
-	..(user)
-	to_chat(user, "There are [src.papers] left")
+	if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown))
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target
+		if(O.dry)
+			user.unEquip(target, 1)
+			user.unEquip(src, 1)
+			var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
+			R.chem_volume = target.reagents.total_volume
+			target.reagents.trans_to(R, R.chem_volume)
+			user.put_in_active_hand(R)
+			to_chat(user, "<span class='notice'>You roll the [target.name] into a rolling paper.</span>")
+			R.desc = "Dried [target.name] rolled up in a thin piece of paper."
+			qdel(target)
+			qdel(src)
+		else
+			to_chat(user, "<span class='warning'>You need to dry this first!</span>")
+	else
+		..()

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

@@ -5,26 +5,6 @@
  *		Bike Horns
  */
 
-/*
- * Banana Peals
- */
-
-/obj/item/weapon/bananapeel
-	name = "banana peel"
-	desc = "A peel from a banana."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana_peel"
-	item_state = "banana_peel"
-	w_class = 1
-	throwforce = 0
-	throw_speed = 4
-	throw_range = 20
-
-/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
-	if(istype(AM, /mob/living/carbon))
-		var/mob/living/carbon/M =	AM
-		M.slip("banana peel", 4, 2)
-
 /*
  * Soap
  */

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

@@ -424,6 +424,7 @@
 							else if(ghost)
 								user.visible_message("<span class='notice'>[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.</span>")
 								to_chat(ghost, "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)")
+								window_flash(ghost.client)
 								ghost << sound('sound/effects/genetics.ogg')
 							else
 								user.visible_message("<span class='notice'>[defib] buzzes: Resuscitation failed.</span>")
@@ -546,6 +547,7 @@
 							else if(ghost)
 								user.visible_message("<span class='notice'>[user] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.</span>")
 								to_chat(ghost, "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)")
+								window_flash(ghost.client)
 								ghost << sound('sound/effects/genetics.ogg')
 							else
 								user.visible_message("<span class='warning'>[user] buzzes: Resuscitation failed.</span>")

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

@@ -1,3 +1,5 @@
 /obj/item/weapon/disk
-	name = "disk"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/module.dmi'
+	w_class = 1
+	item_state = "card-id"
+	icon_state = "datadisk0"

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

@@ -115,8 +115,8 @@
 	if(!user.IsAdvancedToolUser())
 		return 0
 
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to inject [M.name] ([M.ckey])</font>")
+	M.create_attack_log("<font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
+	user.create_attack_log("<font color='red'>Used the [name] to inject [M.name] ([M.ckey])</font>")
 	log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])")
 
 	if(!iscarbon(user))

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

@@ -71,7 +71,7 @@
 		/obj/item/weapon/pen/invisible,
 		/obj/item/weapon/lipstick/random,
 		/obj/item/weapon/grenade/smokebomb,
-		/obj/item/weapon/corncob,
+		/obj/item/weapon/grown/corncob,
 		/obj/item/weapon/contraband/poster,
 		/obj/item/weapon/bikehorn,
 		/obj/item/weapon/beach_ball,
@@ -85,8 +85,8 @@
 		/obj/random/mech,
 		/obj/item/toy/spinningtoy,
 		/obj/item/toy/sword,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
 		/obj/item/device/paicard,
 		/obj/item/device/violin,
 		/obj/item/device/guitar,

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

@@ -9,7 +9,7 @@ var/turf/T
 	icon_state = "banana"
 	item_state = "flashbang"
 	var/deliveryamt = 8
-	var/spawner_type = /obj/item/weapon/bananapeel
+	var/spawner_type = /obj/item/weapon/grown/bananapeel
 
 /obj/item/weapon/grenade/bananade/prime()
 	if(spawner_type && deliveryamt)
@@ -38,7 +38,7 @@ var/turf/T
 
 
 /obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params)
-	if(istype(I, /obj/item/weapon/bananapeel))
+	if(istype(I, /obj/item/weapon/grown/bananapeel))
 		if(fillamt < 9)
 			to_chat(usr, "<span  class='notice'>You add another banana peel to the assembly.</span>")
 			fillamt += 1

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

@@ -23,7 +23,7 @@
 		for(var/direction in alldirs)
 			for(i = 0; i < 2; i++)
 				number++
-				var/obj/item/weapon/bananapeel/traitorpeel/peel = new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
+				var/obj/item/weapon/grown/bananapeel/traitorpeel/peel = new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
 			/*	var/direction = pick(alldirs)
 				var/spaces = pick(1;150, 2)
 				var/a = 0
@@ -35,7 +35,7 @@
 						step(peel,direction)
 				else
 					step(peel,direction)
-		new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
+		new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
 		qdel(src)
 		return
 /*
@@ -46,10 +46,10 @@
 			return
 		if(locate(/obj/structure/window) in T)
 			return
-		new /obj/item/weapon/bananapeel/traitorpeel(T)
+		new /obj/item/weapon/grown/bananapeel/traitorpeel(T)
 */
 
-/obj/item/weapon/bananapeel/traitorpeel
+/obj/item/weapon/grown/bananapeel/traitorpeel
 	name = "banana peel"
 	desc = "A peel from a banana."
 	icon = 'icons/obj/items.dmi'

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

@@ -170,7 +170,7 @@
 
 /obj/item/weapon/grenade/clusterbuster/honk
 	name = "Mega Honk Grenade"
-	payload = /obj/item/weapon/bananapeel
+	payload = /obj/item/weapon/grown/bananapeel
 
 /obj/item/weapon/grenade/clusterbuster/honk_evil
 	name = "Evil Mega Honk Grenade"

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

@@ -20,6 +20,7 @@
 
 			for(var/i=1, i<=deliveryamt, i++)
 				var/atom/movable/x = new spawner_type
+				x.admin_spawned = admin_spawned
 				x.loc = T
 				if(prob(50))
 					for(var/j = 1, j <= rand(1, 3), j++)

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

@@ -62,6 +62,15 @@
 		target.update_handcuffed()
 		return
 
+/obj/item/weapon/restraints/handcuffs/sinew
+	name = "sinew restraints"
+	desc = "A pair of restraints fashioned from long strands of flesh."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "sinewcuff"
+	item_state = "sinewcuff"
+	breakouttime = 300 //Deciseconds = 30s
+	cuffsound = 'sound/weapons/cablecuff.ogg'
+
 /obj/item/weapon/restraints/handcuffs/cable
 	name = "cable restraints"
 	desc = "Looks like some cables tied together. Could be used to tie something up."

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

@@ -189,7 +189,7 @@
 	sharp = 1
 	edge = 1
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
-	hitsound = 'sound/weapons/bladeslice.ogg'
+	hitsound = 'sound/weapons/rapierhit.ogg'
 
 /obj/item/weapon/nullrod/scythe/vibro
 	name = "high frequency blade"
@@ -197,6 +197,14 @@
 	item_state = "hfrequency1"
 	desc = "Bad references are the DNA of the soul."
 	attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
+	
+/obj/item/weapon/nullrod/scythe/spellblade
+	icon_state = "spellblade"
+	item_state = "spellblade"
+	icon = 'icons/obj/guns/magic.dmi'
+	name = "dormant spellblade"
+	desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
+	hitsound = 'sound/weapons/rapierhit.ogg'
 
 /obj/item/weapon/nullrod/scythe/talking
 	name = "possessed blade"
@@ -204,7 +212,7 @@
 	item_state = "talking_sword"
 	desc = "When the station falls into chaos, it's nice to have a friend by your side."
 	attack_verb = list("chopped", "sliced", "cut")
-	hitsound = 'sound/weapons/bladeslice.ogg'
+	hitsound = 'sound/weapons/rapierhit.ogg'
 	var/possessed = FALSE
 
 /obj/item/weapon/nullrod/scythe/talking/attack_self(mob/living/user)
@@ -453,6 +461,51 @@
 					if(prob(10))
 						to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")
 
+/obj/item/weapon/nullrod/salt
+	name = "Holy Salt"
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "saltshakersmall"
+	desc = "While commonly used to repel some ghosts, it appears others are downright attracted to it."
+	force = 0
+	throwforce = 0
+	var/ghostcall_CD = 0
+
+
+/obj/item/weapon/nullrod/salt/attack_self(mob/user)
+
+	if(!user.mind || user.mind.assigned_role != "Chaplain")
+		to_chat(user, "<span class='notice'>You are not close enough with [ticker.Bible_deity_name] to use [src].</span>")
+		return
+
+	if(!(ghostcall_CD > world.time))
+		ghostcall_CD = world.time + 3000 //deciseconds..5 minutes
+		user.visible_message("<span class='info'>[user] kneels and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!</span>", \
+		"<span class='info'>You kneel and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!</span>")
+		notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [name]!", source = src)
+	else
+		to_chat(user, "<span class='notice'>You need to wait before using [src] again.</span>")
+		return
+
+
+/obj/item/weapon/nullrod/rosary/bread
+	name = "prayer bread"
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "baguette"
+	desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns."
+
+/obj/item/weapon/nullrod/rosary/bread/process()
+	if(ishuman(loc))
+		var/mob/living/carbon/human/holder = loc
+		//would like to make the holder mime if they have it in on thier person in general
+		if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will
+			for(var/mob/living/carbon/human/H in range(5))
+				if(H.mind.assigned_role == "Clown")
+					H.Silence(10)
+					animate_fade_grayscale(H,20)
+					if(prob(10))
+						to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your honk!</span>")
+
+
 /obj/item/weapon/nullrod/missionary_staff
 	name = "holy staff"
 	desc = "It has a mysterious, protective aura."

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

@@ -152,6 +152,17 @@
 	origin_tech = "materials=2;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
 
+/obj/item/weapon/kitchen/knife/carrotshiv
+	name = "carrot shiv"
+	icon_state = "carrotshiv"
+	item_state = "carrotshiv"
+	desc = "Unlike other carrots, you should probably keep this far away from your eyes."
+	force = 8
+	throwforce = 12 //fuck git
+	materials = list()
+	origin_tech = "biotech=3;combat=2"
+	attack_verb = list("shanked", "shivved")
+
 /*
  * Rolling Pins
  */

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

@@ -35,7 +35,7 @@
 	edge = 1
 	origin_tech = "combat=5"
 	attack_verb = list("lunged at", "stabbed")
-	hitsound = 'sound/weapons/slash.ogg'
+	hitsound = 'sound/weapons/rapierhit.ogg'
 	materials = list(MAT_METAL = 1000)
 
 /obj/item/weapon/melee/rapier/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)

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

@@ -18,6 +18,17 @@
 	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
 	var/chargerate = 1000 //how much power is given every tick in a recharger
 	var/self_recharge = 0 //does it self recharge, over time, or not?
+	var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
+
+/obj/item/weapon/stock_parts/cell/New()
+	..()
+	processing_objects.Add(src)
+	charge = maxcharge
+	updateicon()
+
+/obj/item/weapon/stock_parts/cell/Destroy()
+	processing_objects.Remove(src)
+	return ..()
 
 /obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
 	to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -29,6 +40,17 @@
 	else
 		return PROCESS_KILL
 
+/obj/item/weapon/stock_parts/cell/proc/updateicon()
+	overlays.Cut()
+	if(grown_battery)
+		overlays += image('icons/obj/power.dmi', "grown_wires")
+	if(charge < 0.01)
+		return
+	else if(charge/maxcharge >=0.995)
+		overlays += image('icons/obj/power.dmi', "cell-o2")
+	else
+		overlays += image('icons/obj/power.dmi', "cell-o1")
+
 /obj/item/weapon/stock_parts/cell/crap
 	name = "\improper Nanotrasen brand rechargable AA battery"
 	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
@@ -119,14 +141,15 @@
 /obj/item/weapon/stock_parts/cell/potato
 	name = "potato battery"
 	desc = "A rechargable starch based power cell."
-	origin_tech = "powerstorage=1"
-	icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
-	icon_state = "potato_cell" //"potato_battery"
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "potato"
+	origin_tech = "powerstorage=1;biotech=1"
 	charge = 100
 	maxcharge = 3000
-	rating = 1
 	materials = list()
+	rating = 1
 	minor_fault = 1
+	grown_battery = TRUE //it has the overlays for wires
 
 /obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"

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

@@ -159,52 +159,34 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/plants
-	icon = 'icons/obj/hydroponics.dmi'
+	name = "plant bag"
+	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "plantbag"
-	name = "Plant Bag"
-	storage_slots = 50; //the number of plant pieces it can carry.
-	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+	storage_slots = 100 //the number of plant pieces it can carry.
+	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = 3
 	w_class = 1
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass","/obj/item/stack/medical/ointment/aloe","/obj/item/stack/medical/bruise_pack/comfrey", "/obj/item/weapon/reagent_containers/honeycomb")
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown","/obj/item/weapon/reagent_containers/food/snacks/ash_flora")
 	burn_state = FLAMMABLE
 
 /obj/item/weapon/storage/bag/plants/portaseeder
 	name = "portable seed extractor"
 	desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
 	icon_state = "portaseeder"
+	origin_tech = "biotech=3;engineering=2"
 
 /obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents()
 	set name = "Activate Seed Extraction"
 	set category = "Object"
 	set desc = "Activate to convert your plants into plantable seeds."
-	if(usr.stat || !usr.canmove || usr.restrained())
+
+	if(usr.incapacitated())
 		return
 	for(var/obj/item/O in contents)
-		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
-
-			var/datum/seed/new_seed_type
-			if(istype(O, /obj/item/weapon/grown))
-				var/obj/item/weapon/grown/F = O
-				new_seed_type = plant_controller.seeds[F.plantname]
-			else
-				var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
-				new_seed_type = plant_controller.seeds[F.plantname]
-
-			if(new_seed_type)
-				var/obj/item/seeds/seeds = new(O.loc, O)
-				seeds.seed_type = new_seed_type.name
-				seeds.update_seed()
-			qdel(O)
-
-		if(istype(O, /obj/item/stack/tile/grass))
-			var/obj/item/stack/tile/grass/S = O
-			S.use(1)
-			new /obj/item/seeds/grassseed(O.loc, O)
-
+		seedify(O, 1)
 	for(var/mob/M in range(1))
 		if(M.s_active == src)
-			src.close(M)
+			close(M)
 
 
 // -----------------------------

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

@@ -139,8 +139,8 @@
 	item_state = "botany"
 	use_item_overlays = 1
 	can_hold = list(
-		"/obj/item/device/analyzer/plant_analyzer",
-		"/obj/item/weapon/minihoe",
+		"/obj/item/device/plant_analyzer",
+		"/obj/item/weapon/cultivator",
 		"/obj/item/weapon/hatchet",
 		"/obj/item/weapon/reagent_containers/glass/bottle",
 		"/obj/item/weapon/plantspray",
@@ -566,7 +566,7 @@
 	to_chat(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>"
+		user.create_attack_log("<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]!")
 
@@ -578,7 +578,7 @@
 		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>"
+			target:create_attack_log("<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")
 		to_chat(user, "You sacrifice your belt for the sake of justice. Timer counting down from 15.")

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

@@ -44,8 +44,8 @@
 		chaplain = 1
 
 
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+	M.create_attack_log("<font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
+	user.create_attack_log("<font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
 	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
 
 	if(!iscarbon(user))

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

@@ -176,8 +176,8 @@
 
 /obj/item/weapon/storage/fancy/cigarettes/New()
 	..()
-	flags |= NOREACT
 	create_reagents(30 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
+	reagents.set_reacting(FALSE)
 	for(var/i = 1 to storage_slots)
 		var/obj/item/clothing/mask/cigarette/C = new cigarette_type(src)
 		unlaced_cigarettes += C
@@ -315,6 +315,26 @@
 	item_state = "cigpacket"
 	cigarette_type  = /obj/item/clothing/mask/cigarette/random
 
+/obj/item/weapon/storage/fancy/rollingpapers
+	name = "rolling paper pack"
+	desc = "A pack of NanoTrasen brand rolling papers."
+	w_class = 1
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_state = "cig_paper_pack"
+	storage_slots = 10
+	icon_type = "rolling paper"
+	can_hold = list("/obj/item/weapon/rollingpaper")
+
+/obj/item/weapon/storage/fancy/rollingpapers/New()
+	..()
+	for(var/i in 1 to storage_slots)
+		new /obj/item/weapon/rollingpaper(src)
+
+/obj/item/weapon/storage/fancy/rollingpapers/update_icon()
+	overlays.Cut()
+	if(!contents.len)
+		overlays += "[icon_state]_empty"
+
 /*
  * Vial Box
  */

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

@@ -298,7 +298,7 @@
 		usr.update_icons()	//update our overlays
 	if(silent)
 		prevent_warning = 1
-	W.loc = src
+	W.forceMove(src)
 	W.on_enter_storage(src)
 	if(usr)
 		if(usr.client && usr.s_active != src)
@@ -344,9 +344,9 @@
 		else
 			W.layer = initial(W.layer)
 			W.plane = initial(W.plane)
-		W.loc = new_location
+		W.forceMove(new_location)
 	else
-		W.loc = get_turf(src)
+		W.forceMove(get_turf(src))
 
 	if(usr)
 		src.orient2hud(usr)

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

@@ -431,6 +431,7 @@
 	icon_state = "gchainsaw_off"
 	flags = CONDUCT
 	force = 13
+	var/force_on = 21
 	w_class = 5
 	throwforce = 13
 	throw_speed = 2
@@ -449,8 +450,8 @@
 	to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
 	if(on)
 		playsound(loc, 'sound/weapons/chainsawstart.ogg', 50, 1)
-	force = on ? 21 : 13
-	throwforce = on ? 21 : 13
+	force = on ? force_on : initial(force)
+	throwforce = on ? force_on : initial(force)
 	icon_state = "gchainsaw_[on ? "on" : "off"]"
 
 	if(hitsound == "swing_hit")
@@ -469,6 +470,14 @@
 	name = "OOOH BABY"
 	desc = "<span class='warning'>VRRRRRRR!!!</span>"
 	armour_penetration = 100
+	force_on = 30
+
+/obj/item/weapon/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
+	if(attack_type == PROJECTILE_ATTACK)
+		owner.visible_message("<span class='danger'>Ranged attacks just make [owner] angrier!</span>")
+		playsound(src, pick('sound/weapons/bulletflyby.ogg','sound/weapons/bulletflyby2.ogg','sound/weapons/bulletflyby3.ogg'), 75, 1)
+		return 1
+	return 0
 
 
 ///CHAINSAW///

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

@@ -82,3 +82,8 @@
 	machine_name = "CritterCare"
 	icon_state = "refill_pet"
 	charges = 31// of 94
+
+/obj/item/weapon/vending_refill/chinese
+	machine_name = "MrChangs"
+	charges = 8// of 24
+

code/game/objects/objs.dm

@@ -61,8 +61,6 @@
 	nanomanager.close_uis(src)
 	return ..()
 
-/obj/item/proc/is_used_on(obj/O, mob/user)
-
 /obj/proc/process()
 	set waitfor = 0
 	processing_objects.Remove(src)

code/game/objects/structures/crates_lockers/closets.dm

@@ -16,6 +16,7 @@
 	var/cutting_sound = 'sound/items/Welder.ogg'
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
 	var/material_drop = /obj/item/stack/sheet/metal
+	var/material_drop_amount = 2
 
 /obj/structure/closet/New()
 	..()
@@ -49,28 +50,13 @@
 	return 1
 
 /obj/structure/closet/proc/dump_contents()
-	//Cham Projector Exception
-	for(var/obj/effect/dummy/chameleon/AD in src)
-		AD.forceMove(loc)
-
-	for(var/obj/I in src)
-		I.forceMove(loc)
-
-	for(var/mob/M in src)
-		moveMob(M, loc)
-
-/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
-	loc.Exited(M)
-	M.loc = destination
-	M.reset_perspective(destination)
-	if(isturf(loc))
-		loc.Entered(M, src, ignoreRest = 1)
-	else
-		loc.Entered(M, src)
-	for(var/atom/movable/AM in loc)
-		if(istype(AM, /obj/item))
-			continue
-		AM.Crossed(M)
+	var/turf/T = get_turf(src)
+	for(var/atom/movable/AM in src)
+		AM.forceMove(T)
+		if(throwing) // you keep some momentum when getting out of a thrown closet
+			step(AM, dir)
+	if(throwing)
+		throwing = 0
 
 /obj/structure/closet/proc/open()
 	if(src.opened)
@@ -120,7 +106,7 @@
 		if(M.buckled)
 			continue
 
-		moveMob(M, src)
+		M.forceMove(src)
 		itemcount++
 
 	src.icon_state = src.icon_closed
@@ -271,7 +257,7 @@
 									"<span class='notice'>You cut \the [src] apart with \the [WT].</span>",
 									"<span class='italics'>You hear welding.</span>")
 					var/turf/T = get_turf(src)
-					new material_drop(T)
+					new material_drop(T, material_drop_amount)
 					qdel(src)
 					return
 		if(isrobot(user))
@@ -425,4 +411,4 @@
 
 /obj/structure/closet/get_remote_view_fullscreens(mob/user)
 	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
-		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -9,18 +9,18 @@
 	icon_off = "hydrosecureoff"
 
 
-	New()
-		..()
-		switch(rand(1,2))
-			if(1)
-				new /obj/item/clothing/suit/apron(src)
-			if(2)
-				new /obj/item/clothing/suit/apron/overalls(src)
-		new /obj/item/weapon/storage/bag/plants/portaseeder(src)
-		new /obj/item/clothing/under/rank/hydroponics(src)
-		new /obj/item/device/analyzer/plant_analyzer(src)
-		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/device/radio/headset/headset_service(src)
-		new /obj/item/clothing/mask/bandana/botany(src)
-		new /obj/item/weapon/minihoe(src)
-		new /obj/item/weapon/hatchet(src)
+/obj/structure/closet/secure_closet/hydroponics/New()
+	..()
+	switch(rand(1,2))
+		if(1)
+			new /obj/item/clothing/suit/apron(src)
+		if(2)
+			new /obj/item/clothing/suit/apron/overalls(src)
+	new /obj/item/weapon/storage/bag/plants/portaseeder(src)
+	new /obj/item/clothing/under/rank/hydroponics(src)
+	new /obj/item/device/plant_analyzer(src)
+	new /obj/item/device/radio/headset/headset_service(src)
+	new /obj/item/clothing/mask/bandana/botany(src)
+	new /obj/item/weapon/cultivator(src)
+	new /obj/item/weapon/hatchet(src)
+	new /obj/item/weapon/storage/box/disks_plantgene(src)

code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm

@@ -18,7 +18,7 @@
 	new /obj/item/weapon/bikehorn(src)
 	new /obj/item/weapon/reagent_containers/spray/waterflower(src)
 	new /obj/item/toy/crayon/rainbow(src)
-	new /obj/item/seeds/bananaseed(src)
+	new /obj/item/seeds/banana(src)
 
 
 

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -57,10 +57,9 @@
 		qdel(src)
 
 /obj/structure/closet/statue/dump_contents()
-
-	if(istype(src.loc, /mob/living/simple_animal/hostile/statue))
-		var/mob/living/simple_animal/hostile/statue/S = src.loc
-		src.loc = S.loc
+	if(istype(loc, /mob/living/simple_animal/hostile/statue))
+		var/mob/living/simple_animal/hostile/statue/S = loc
+		forceMove(S.loc)
 		if(S.mind)
 			for(var/mob/M in contents)
 				S.mind.transfer_to(M)
@@ -68,21 +67,16 @@
 				break
 		qdel(S)
 
-
-	for(var/obj/O in src)
-		O.loc = src.loc
-
 	for(var/mob/living/M in src)
 		M.forceMove(loc)
 		M.disabilities -= MUTE
 		M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
-
+			
+	..()
 
 /obj/structure/closet/statue/open()
 	return
 
-
-
 /obj/structure/closet/statue/open()
 	return
 
@@ -158,4 +152,4 @@ obj/structure/statue/angel
 	icon_state = "angelseen"
 
 obj/structure/statue/corgi
-	icon_state = "corgi"
+	icon_state = "corgi"

code/game/objects/structures/crates_lockers/crates.dm

@@ -568,8 +568,6 @@
 		new /obj/item/weapon/wirecutters(src)
 		new /obj/item/weapon/shovel/spade(src)
 		new /obj/item/weapon/shovel/spade(src)
-		new /obj/item/weapon/storage/box/botanydisk(src)
-		new /obj/item/weapon/storage/box/botanydisk(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/hand_labeler(src)

code/game/objects/structures/flora.dm

@@ -36,6 +36,14 @@
 	..()
 	icon_state = "tree_[rand(1, 6)]"
 
+/obj/structure/flora/tree/palm
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "palm1"
+
+/obj/structure/flora/tree/palm/New()
+	..()
+	icon_state = pick("palm1","palm2")
+	pixel_x = 0	
 
 //grass
 /obj/structure/flora/grass

code/game/objects/structures/misc.dm

@@ -57,3 +57,19 @@
 					return
 		else
 			to_chat(user, "<span class='danger'>FĆAL �Rr�R</span>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
+
+/obj/structure/respawner
+	name = "\improper Long-Distance Cloning Machine"
+	desc = "Top-of-the-line Nanotrasen technology allows for cloning of crew members from off-station upon bluespace request."
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	icon_state = "borgcharger1(old)"
+	anchored = 1
+	density = 1
+
+/obj/structure/respawner/attack_ghost(mob/dead/observer/user as mob)
+	var/response = alert(user, "Are you sure you want to spawn like this?\n(If you do this, you won't be able to be cloned!)","Respawn?","Yes","No")
+	if(response == "Yes")
+		user.forceMove(get_turf(src))
+		log_admin("[key_name(user)] was incarnated by a respawner machine.")
+		message_admins("[key_name_admin(user)] was incarnated by a respawner machine.")
+		user.incarnate_ghost()

code/game/objects/structures/morgue.dm

@@ -382,8 +382,8 @@
 			if(M.stat!=2)
 				M.emote("scream")
 			if(istype(user))
-				M.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>"
-				user.attack_log +="\[[time_stamp()]\] <font color='red'>Cremated [M.name] ([M.ckey])</font>"
+				M.create_attack_log("<font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>")
+				user.create_attack_log("<font color='red'>Cremated [M.name] ([M.ckey])</font>")
 				log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
 			M.death(1)
 			if(!M || !isnull(M.gcDestroyed))