Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes

code/game/objects/effects/anomalies.dm

@@ -21,7 +21,7 @@
 	poi_list |= src
 
 /obj/effect/anomaly/Destroy()
-	aSignal = null
+	QDEL_NULL(aSignal)
 	poi_list.Remove(src)
 	return ..()
 
@@ -31,10 +31,13 @@
 
 
 /obj/effect/anomaly/proc/anomalyNeutralize()
-	new /obj/effect/effect/bad_smoke(loc)
+	var/turf/T = get_turf(src)
 
-	for(var/atom/movable/O in src)
-		O.loc = src.loc
+	new /obj/effect/effect/bad_smoke(T)
+
+	if(aSignal)
+		aSignal.forceMove(T)
+		aSignal = null
 
 	qdel(src)
 

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

@@ -3,6 +3,8 @@
 	desc = "It's green and acidic. It looks like... <i>blood?</i>"
 	icon = 'icons/effects/blood.dmi'
 	basecolor = "#05EE05"
+	bloodiness = MAX_SHOE_BLOODINESS
+	blood_state = BLOOD_STATE_XENO
 
 /obj/effect/decal/cleanable/blood/gibs/xeno
 	name = "xeno gibs"

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

@@ -15,9 +15,11 @@ var/global/list/image/splatter_cache=list()
 	icon_state = "mfloor1"
 	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
 	var/base_icon = 'icons/effects/blood.dmi'
-	var/list/viruses = list()
+	appearance_flags = NO_CLIENT_COLOR
 	blood_DNA = list()
-	var/basecolor="#A10808" // Color when wet.
+	var/blood_state = BLOOD_STATE_HUMAN
+	var/bloodiness = MAX_SHOE_BLOODINESS
+	var/basecolor = "#A10808" // Color when wet.
 	var/amount = 5
 	appearance_flags = NO_CLIENT_COLOR
 	var/dry_timer = 0
@@ -33,11 +35,11 @@ var/global/list/image/splatter_cache=list()
 				mode_ticker.bloody_floors += T
 				mode_ticker.bloody_floors[T] = T
 				mode_ticker.blood_check()
-	if(istype(src, /obj/effect/decal/cleanable/blood/gibs))
+	if(type == /obj/effect/decal/cleanable/blood/gibs)
 		return
-	if(src.type == /obj/effect/decal/cleanable/blood)
-		if(src.loc && isturf(src.loc))
-			for(var/obj/effect/decal/cleanable/blood/B in src.loc)
+	if(type == /obj/effect/decal/cleanable/blood)
+		if(loc && isturf(loc))
+			for(var/obj/effect/decal/cleanable/blood/B in loc)
 				if(B != src)
 					if(B.blood_DNA)
 						blood_DNA |= B.blood_DNA.Copy()
@@ -59,44 +61,6 @@ var/global/list/image/splatter_cache=list()
 	if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
 	color = basecolor
 
-/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
-	if(!istype(perp))
-		return
-	if(amount < 1)
-		return
-
-	var/obj/item/organ/external/l_foot = perp.get_organ("l_foot")
-	var/obj/item/organ/external/r_foot = perp.get_organ("r_foot")
-	var/hasfeet = 1
-	if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
-		hasfeet = 0
-	if(perp.shoes && !perp.buckled)//Adding blood to shoes
-		var/obj/item/clothing/shoes/S = perp.shoes
-		if(istype(S))
-			S.blood_color = basecolor
-			S.track_blood = max(amount,S.track_blood)
-			if(!S.blood_overlay)
-				S.generate_blood_overlay()
-			if(!S.blood_DNA)
-				S.blood_DNA = list()
-				S.blood_overlay.color = basecolor
-				S.overlays += S.blood_overlay
-			if(S.blood_overlay && S.blood_overlay.color != basecolor)
-				S.blood_overlay.color = basecolor
-				S.overlays.Cut()
-				S.overlays += S.blood_overlay
-			S.blood_DNA |= blood_DNA.Copy()
-
-	else if(hasfeet)//Or feet
-		perp.feet_blood_color = basecolor
-		perp.track_blood = max(amount,perp.track_blood)
-		if(!perp.feet_blood_DNA)
-			perp.feet_blood_DNA = list()
-		perp.feet_blood_DNA |= blood_DNA.Copy()
-
-	perp.update_inv_shoes(1)
-	amount--
-
 /obj/effect/decal/cleanable/blood/proc/dry()
 	name = dryname
 	desc = drydesc
@@ -123,6 +87,46 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
 	return TRUE
 
+//Add "bloodiness" of this blood's type, to the human's shoes
+/obj/effect/decal/cleanable/blood/Crossed(atom/movable/O)
+	if(ishuman(O))
+		var/mob/living/carbon/human/H = O
+		var/obj/item/organ/external/l_foot = H.get_organ("l_foot")
+		var/obj/item/organ/external/r_foot = H.get_organ("r_foot")
+		var/hasfeet = 1
+		if(!l_foot && !r_foot)
+			hasfeet = 0
+		if(H.shoes && blood_state && bloodiness)
+			var/obj/item/clothing/shoes/S = H.shoes
+			var/add_blood = 0
+			if(bloodiness >= BLOOD_GAIN_PER_STEP)
+				add_blood = BLOOD_GAIN_PER_STEP
+			else
+				add_blood = bloodiness
+			bloodiness -= add_blood
+			S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS, S.bloody_shoes[blood_state] + add_blood)
+			if(blood_DNA && blood_DNA.len)
+				S.add_blood(H.blood_DNA, basecolor)
+			S.blood_state = blood_state
+			S.blood_color = basecolor
+			update_icon()
+			H.update_inv_shoes()
+		else if(hasfeet && blood_state && bloodiness)//Or feet
+			var/add_blood = 0
+			if(bloodiness >= BLOOD_GAIN_PER_STEP)
+				add_blood = BLOOD_GAIN_PER_STEP
+			else
+				add_blood = bloodiness
+			bloodiness -= add_blood
+			H.bloody_feet[blood_state] = min(MAX_SHOE_BLOODINESS, H.bloody_feet[blood_state] + add_blood)
+			if(!H.feet_blood_DNA)
+				H.feet_blood_DNA = list()
+			H.blood_state = blood_state
+			H.feet_blood_DNA |= blood_DNA.Copy()
+			H.feet_blood_color = basecolor
+			update_icon()
+			H.update_inv_shoes()
+
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
 	amount = 2
@@ -135,11 +139,25 @@ var/global/list/image/splatter_cache=list()
 	icon_state = "1"
 	random_icon_states = list("1","2","3","4","5")
 	amount = 0
-	var/list/drips = list()
+	var/drips = 1
+	bloodiness = 0
 
-/obj/effect/decal/cleanable/blood/drip/New()
-	..()
-	drips |= icon_state
+/obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in()
+	return TRUE
+
+/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
+	name = "blood"
+	icon_state = "ltrails_1"
+	desc = "Your instincts say you shouldn't be following these."
+	gender = PLURAL
+	density = 0
+	layer = 2
+	random_icon_states = null
+	var/list/existing_dirs = list()
+	blood_DNA = list()
+
+/obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in()
+	return TRUE
 
 /obj/effect/decal/cleanable/blood/writing
 	icon_state = "tracks"
@@ -176,19 +194,16 @@ var/global/list/image/splatter_cache=list()
 	noclear = 1
 
 /obj/effect/decal/cleanable/blood/gibs/update_icon()
-
 	var/image/giblets = new(base_icon, "[icon_state]_flesh", dir)
 	if(!fleshcolor || fleshcolor == "rainbow")
 		fleshcolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
 	giblets.color = fleshcolor
-
 	var/icon/blood = new(base_icon,"[icon_state]",dir)
-	if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
-	blood.Blend(basecolor,ICON_MULTIPLY)
 
 	icon = blood
 	overlays.Cut()
 	overlays += giblets
+	. = ..()
 
 /obj/effect/decal/cleanable/blood/gibs/up
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1")
@@ -223,21 +238,25 @@ var/global/list/image/splatter_cache=list()
 	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
 		sleep(3)
 		if(i > 0)
-			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(loc)
 			b.basecolor = src.basecolor
 			b.update_icon()
-			for(var/datum/disease/D in src.viruses)
-				var/datum/disease/ND = D.Copy(1)
-				b.viruses += ND
-				ND.holder = b
 		if(step_to(src, get_step(src, direction), 0))
 			break
 
 
 /obj/effect/decal/cleanable/blood/old/New()
 	..()
+	bloodiness = 0
 	dry()
 
+/obj/effect/decal/cleanable/blood/old/can_bloodcrawl_in()
+	return FALSE
+
 /obj/effect/decal/cleanable/blood/gibs/old/New()
 	..()
+	bloodiness = 0
 	dry()
+
+/obj/effect/decal/cleanable/blood/gibs/old/can_bloodcrawl_in()
+	return FALSE

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

@@ -5,13 +5,17 @@
 	icon_state = "gib1"
 	basecolor="#030303"
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
+	bloodiness = MAX_SHOE_BLOODINESS
+
+/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
+	return FALSE
 
 /obj/effect/decal/cleanable/blood/gibs/robot/update_icon()
 	color = "#FFFFFF"
 
 /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
 
@@ -44,6 +48,7 @@
 	name = "motor oil"
 	desc = "It's black and greasy. Looks like Beepsky made another mess."
 	basecolor="#030303"
+	bloodiness = MAX_SHOE_BLOODINESS
 
 /obj/effect/decal/cleanable/blood/oil/can_bloodcrawl_in()
 	return FALSE

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

@@ -1,165 +1,125 @@
-// Stolen en masse from N3X15 of /vg/station with much gratitude.
-
-// The idea is to have 4 bits for coming and 4 for going.
-#define TRACKS_COMING_NORTH 1
-#define TRACKS_COMING_SOUTH 2
-#define TRACKS_COMING_EAST  4
-#define TRACKS_COMING_WEST  8
-#define TRACKS_GOING_NORTH  16
-#define TRACKS_GOING_SOUTH  32
-#define TRACKS_GOING_EAST   64
-#define TRACKS_GOING_WEST   128
-
 // 5 seconds
 #define TRACKS_CRUSTIFY_TIME   50
 
 // color-dir-dry
 var/global/list/image/fluidtrack_cache=list()
 
-/datum/fluidtrack
-	var/direction=0
-	var/basecolor="#A10808"
-	var/wet=0
-	var/fresh=1
-	var/crusty=0
-	var/image/overlay
-
-	New(_direction,item_color,_wet)
-		src.direction=_direction
-		src.basecolor=item_color
-		src.wet=_wet
-
 // Footprints, tire trails...
 /obj/effect/decal/cleanable/blood/tracks
-	amount = 0
-	random_icon_states = null
-	var/dirs=0
 	icon = 'icons/effects/fluidtracks.dmi'
-	icon_state = ""
-	var/coming_state="blood1"
-	var/going_state="blood2"
-	var/updatedtracks=0
-
-	// dir = id in stack
-	var/list/setdirs=list(
-		"1"=0,
-		"2"=0,
-		"4"=0,
-		"8"=0,
-		"16"=0,
-		"32"=0,
-		"64"=0,
-		"128"=0
-	)
-
-	// List of laid tracks and their colors.
-	var/list/datum/fluidtrack/stack=list()
-
-	/**
-	* Add tracks to an existing trail.
-	*
-	* @param DNA bloodDNA to add to collection.
-	* @param comingdir Direction tracks come from, or 0.
-	* @param goingdir Direction tracks are going to (or 0).
-	* @param bloodcolor Color of the blood when wet.
-	*/
-	proc/AddTracks(var/list/DNA, var/comingdir, var/goingdir, var/bloodcolor="#A10808")
-		var/updated=0
-		// Shift our goingdir 4 spaces to the left so it's in the GOING bitblock.
-		var/realgoing=goingdir<<4
-
-		// Current bit
-		var/b=0
-
-		// When tracks will start to dry out
-		var/t=world.time + TRACKS_CRUSTIFY_TIME
-
-		var/datum/fluidtrack/track
-
-		// Process 4 bits
-		for(var/bi=0;bi<4;bi++)
-			b = 1 << bi
-			// COMING BIT
-			// If setting
-			if(comingdir&b)
-				// If not wet or not set
-				if(dirs&b)
-					var/sid=setdirs["[b]"]
-					track=stack[sid]
-					if(track.wet==t && track.basecolor==bloodcolor)
-						continue
-					// Remove existing stack entry
-					stack.Remove(track)
-				track=new /datum/fluidtrack(b,bloodcolor,t)
-				stack.Add(track)
-				setdirs["[b]"]=stack.Find(track)
-				updatedtracks |= b
-				updated=1
-
-			// GOING BIT (shift up 4)
-			b=b<<4
-			if(realgoing&b)
-				// If not wet or not set
-				if(dirs&b)
-					var/sid=setdirs["[b]"]
-					track=stack[sid]
-					if(track.wet==t && track.basecolor==bloodcolor)
-						continue
-					// Remove existing stack entry
-					stack.Remove(track)
-				track=new /datum/fluidtrack(b,bloodcolor,t)
-				stack.Add(track)
-				setdirs["[b]"]=stack.Find(track)
-				updatedtracks |= b
-				updated=1
-
-		dirs |= comingdir|realgoing
-		blood_DNA |= DNA.Copy()
-		if(updated)
-			update_icon()
-
-	update_icon()
-		overlays.Cut()
-		color = "#FFFFFF"
-		var/truedir=0
-
-		// Update ONLY the overlays that have changed.
-		for(var/datum/fluidtrack/track in stack)
-			var/stack_idx=setdirs["[track.direction]"]
-			var/state=coming_state
-			truedir=track.direction
-			if(truedir&240) // Check if we're in the GOING block
-				state=going_state
-				truedir=truedir>>4
-
-			if(track.overlay)
-				track.overlay=null
-			var/image/I = image(icon, icon_state=state, dir=num2dir(truedir))
-			I.color = track.basecolor
-
-			track.fresh=0
-			track.overlay=I
-			stack[stack_idx]=track
-			overlays += I
-		updatedtracks=0 // Clear our memory of updated tracks.
-
-/obj/effect/decal/cleanable/blood/tracks/footprints
-	name = "wet footprints"
-	dryname = "dried footprints"
-	desc = "Whoops..."
-	drydesc = "Whoops..."
-	coming_state = "human1"
-	going_state  = "human2"
-	amount = 0
-
-/obj/effect/decal/cleanable/blood/tracks/wheels
 	name = "wet tracks"
 	dryname = "dried tracks"
 	desc = "Whoops..."
 	drydesc = "Whoops..."
-	coming_state = "wheels1"
-	going_state  = "wheels2"
-	desc = "They look like tracks left by wheels."
+	icon_state = "wheels1"
 	gender = PLURAL
 	random_icon_states = null
-	amount = 0
+	amount = 0
+
+//BLOODY FOOTPRINTS
+/obj/effect/decal/cleanable/blood/footprints
+	icon = 'icons/effects/fluidtracks.dmi'
+	icon_state = "nothingwhatsoever"
+	desc = "You REALLY shouldn't follow these.."
+	gender = PLURAL
+	random_icon_states = null
+	basecolor="#A10808"
+	var/entered_dirs = 0
+	var/exited_dirs = 0
+	blood_state = BLOOD_STATE_HUMAN //the icon state to load images from
+
+
+/obj/effect/decal/cleanable/blood/footprints/Crossed(atom/movable/O)
+	if(ishuman(O))
+		var/mob/living/carbon/human/H = O
+		var/obj/item/clothing/shoes/S = H.shoes
+		var/obj/item/organ/external/l_foot = H.get_organ("l_foot")
+		var/obj/item/organ/external/r_foot = H.get_organ("r_foot")
+		var/hasfeet = 1
+		if(!l_foot && !r_foot)
+			hasfeet = 0
+		if(S && S.bloody_shoes[blood_state] && S.blood_color == basecolor)
+			S.bloody_shoes[blood_state] = max(S.bloody_shoes[blood_state] - BLOOD_LOSS_PER_STEP, 0)
+			entered_dirs |= H.dir
+			if(!S.blood_DNA)
+				S.blood_DNA = list()
+			S.blood_DNA |= blood_DNA.Copy()
+		else if(hasfeet && H.bloody_feet[blood_state] && H.feet_blood_color == basecolor)//Or feet //This will need to be changed.
+			H.bloody_feet[blood_state] = max(H.bloody_feet[blood_state] - BLOOD_LOSS_PER_STEP, 0)
+			entered_dirs |= H.dir
+			if(!H.feet_blood_DNA)
+				H.feet_blood_DNA = list()
+			H.feet_blood_DNA |= blood_DNA.Copy()
+	update_icon()
+
+/obj/effect/decal/cleanable/blood/footprints/Uncrossed(atom/movable/O)
+	if(ishuman(O))
+		var/mob/living/carbon/human/H = O
+		var/obj/item/clothing/shoes/S = H.shoes
+		var/obj/item/organ/external/l_foot = H.get_organ("l_foot")
+		var/obj/item/organ/external/r_foot = H.get_organ("r_foot")
+		var/hasfeet = 1
+		if(!l_foot && !r_foot)
+			hasfeet = 0
+		if(S && S.bloody_shoes[blood_state] && S.blood_color == basecolor)
+			S.bloody_shoes[blood_state] = max(S.bloody_shoes[blood_state] - BLOOD_LOSS_PER_STEP, 0)
+			exited_dirs |= H.dir
+			if(!S.blood_DNA)
+				S.blood_DNA = list()
+			S.blood_DNA |= blood_DNA.Copy()
+		else if(hasfeet && H.bloody_feet[blood_state] && H.feet_blood_color == basecolor)//Or feet
+			H.bloody_feet[blood_state] = max(H.bloody_feet[blood_state] - BLOOD_LOSS_PER_STEP, 0)
+			exited_dirs |= H.dir
+			if(!H.feet_blood_DNA)
+				H.feet_blood_DNA = list()
+			H.feet_blood_DNA |= blood_DNA.Copy()
+	update_icon()
+
+
+/obj/effect/decal/cleanable/blood/footprints/update_icon()
+	overlays.Cut()
+
+	for(var/Ddir in cardinal)
+		if(entered_dirs & Ddir)
+			var/image/I
+			if(fluidtrack_cache["entered-[blood_state]-[Ddir]"])
+				I = fluidtrack_cache["entered-[blood_state]-[Ddir]"]
+			else
+				I = image(icon,"[blood_state]1",dir = Ddir)
+				fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
+			if(I)
+				I.color = basecolor
+				overlays += I
+		if(exited_dirs & Ddir)
+			var/image/I
+			if(fluidtrack_cache["exited-[blood_state]-[Ddir]"])
+				I = fluidtrack_cache["exited-[blood_state]-[Ddir]"]
+			else
+				I = image(icon,"[blood_state]2",dir = Ddir)
+				fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
+			if(I)
+				I.color = basecolor
+				overlays += I
+
+	alpha = BLOODY_FOOTPRINT_BASE_ALPHA+bloodiness
+
+/proc/createFootprintsFrom(atom/movable/A, dir, turf/T)
+	var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
+	if(ishuman(A))
+		var/mob/living/carbon/human/H = A
+		FP.blood_state = H.blood_state
+		FP.bloodiness = H.bloody_feet[H.blood_state]
+		FP.basecolor = H.feet_blood_color
+		if(H.blood_DNA)
+			FP.blood_DNA = H.blood_DNA.Copy()
+	else if(istype(A, /obj/item/clothing/shoes))
+		var/obj/item/clothing/shoes/S = A
+		FP.blood_state = S.blood_state
+		FP.bloodiness = S.bloody_shoes[S.blood_state]
+		FP.basecolor = S.blood_color
+		if(S.blood_DNA)
+			FP.blood_DNA = S.blood_DNA.Copy()
+	FP.entered_dirs |= dir
+	FP.update_icon()
+
+	return FP

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

@@ -1,4 +1,5 @@
 /obj/effect/decal/cleanable
+	anchored = 1
 	var/list/random_icon_states = list()
 	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
@@ -43,4 +44,4 @@
 	if(reagents)
 		reagents.chem_temp += 30
 		reagents.handle_reactions()
-	..()
+	..()

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

@@ -1,335 +1,92 @@
-//########################## CONTRABAND ;3333333333333333333 -Agouri ###################################################
+// This is synced up to the poster placing animation.
+#define PLACE_SPEED 30
 
-#define NUM_OF_POSTER_DESIGNS 33 //subtype 0-contraband posters
+// The poster item
 
-#define NUM_OF_POSTER_DESIGNS_LEGIT 40 //subtype 1-corporate approved posters
-
-/obj/item/weapon/contraband
-	name = "contraband item"
-	desc = "You probably shouldn't be holding this."
-	icon = 'icons/obj/contraband.dmi'
-	force = 0
-
-
-/obj/item/weapon/contraband/poster
+/obj/item/weapon/poster
 	name = "rolled-up poster"
 	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
-	icon_state = "rolled_poster"
-	var/serial_number = 0
-	var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
-	var/subtype = 0
+	icon = 'icons/obj/contraband.dmi'
+	force = 0
 	burn_state = FLAMMABLE
+	var/poster_type
+	var/obj/structure/sign/poster/poster_structure
 
+/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure)
+	..()
+	poster_structure = new_poster_structure
+	if(!new_poster_structure && poster_type)
+		poster_structure = new poster_type(src)
 
-/obj/item/weapon/contraband/poster/New(turf/loc, given_serial = 0)
-	if(given_serial == 0)
-		if(subtype == 0)
-			serial_number = rand(1, NUM_OF_POSTER_DESIGNS)
-			resulting_poster = new(serial_number,subtype)
-		if(subtype == 1)
-			serial_number = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT)
-			resulting_poster = new(serial_number,subtype)
-	else
-		serial_number = given_serial
-		//We don't give it a resulting_poster because if we called it with a given_serial it means that we're rerolling an already used poster.
-	name += " - No. [serial_number]"
-	..(loc)
+	// posters store what name and description they would like their rolled up form to take.
+	if(poster_structure)
+		name = poster_structure.poster_item_name
+		desc = poster_structure.poster_item_desc
+		icon_state = poster_structure.poster_item_icon_state
 
+		name = "[name] - [poster_structure.original_name]"
 
-/*/obj/item/weapon/contraband/poster/attack(mob/M as mob, mob/user as mob)
-	src.add_fingerprint(user)
-	if(resulting_poster)
-		resulting_poster.add_fingerprint(user)
-	..()*/
+/obj/item/weapon/poster/Destroy()
+	poster_structure = null
+	. = ..()
 
-/*/obj/item/weapon/contraband/poster/attack(atom/A, mob/user as mob) //This shit is handled through the wall's attackby()
-	if(istype(A, /turf/simulated/wall))
-		if(resulting_poster == null)
-			return
-		else
-			var/turf/simulated/wall/W = A
-			var/check = 0
-			var/stuff_on_wall = 0
-			for(var/obj/O in W.contents) //Let's see if it already has a poster on it or too much stuff
-				if(istype(O,/obj/structure/sign/poster))
-					check = 1
-					break
-				stuff_on_wall++
-				if(stuff_on_wall == 3)
-					check = 1
-					break
-
-			if(check)
-				to_chat(user, "<span class='notice'>The wall is far too cluttered to place a poster!</span>")
-				return
-
-			resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster
-			W.contents += resulting_poster
-
-			qdel(src)*/
+// These icon_states may be overriden, but are for mapper's convinence
+/obj/item/weapon/poster/random_contraband
+	name = "random contraband poster"
+	poster_type = /obj/structure/sign/poster/contraband/random
+	icon_state = "rolled_poster"
 
+/obj/item/weapon/poster/random_official
+	name = "random official poster"
+	poster_type = /obj/structure/sign/poster/official/random
+	icon_state = "rolled_poster_legit"
 
 
 //############################## THE ACTUAL DECALS ###########################
 
-obj/structure/sign/poster
+/obj/structure/sign/poster
 	name = "poster"
 	desc = "A large piece of space-resistant printed paper."
 	icon = 'icons/obj/contraband.dmi'
-	anchored = 1
-	var/serial_number	//Will hold the value of src.loc if nobody initialises it
-	var/ruined = 0
-	var/subtype = 0
+	anchored = TRUE
+	var/original_name
+	var/random_basetype
+	var/ruined = FALSE
+	var/never_random = FALSE // used for the 'random' subclasses.
 
-obj/structure/sign/poster/legit // For mappers looking to pre-spawn NT approved posters.
-	subtype = 1
+	var/poster_item_name = "hypothetical poster"
+	var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here."
+	var/poster_item_icon_state = "rolled_poster"
 
-obj/structure/sign/poster/New(serial,var/subtypeIn = -1)
-	serial_number = serial
-	if(subtypeIn != -1)
-		subtype = subtypeIn
-
-	if(serial_number == loc)
-		if(subtype == 0)
-			serial_number = rand(1, NUM_OF_POSTER_DESIGNS)	//This is for the mappers that want individual posters without having to use rolled posters.
-		if(subtype == 1)
-			serial_number = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT)
-	if(subtype == 0)
-		icon_state = "poster[serial_number]"
-		switch(serial_number)
-			if(1)
-				name += " - Free Tonto"
-				desc += " A framed shred of a much larger flag, colors bled together and faded from age."
-			if(2)
-				name += " - Atmosia Declaration of Independence"
-				desc += " A relic of a failed rebellion."
-			if(3)
-				name += " - Fun Police"
-				desc += " A poster condemning the station's security forces."
-			if(4)
-				name += " - Lusty Xeno"
-				desc += " A heretical poster depicting the titular star of an equally heretical book."
-			if(5)
-				name += " - Syndicate Recruitment Poster"
-				desc += " See the galaxy! Shatter corrupt megacorporations! Join today!"
-			if(6)
-				name += " - Clown"
-				desc += " Honk."
-			if(7)
-				name += " - Smoke"
-				desc += " A poster depicting a carton of cigarettes."
-			if(8)
-				name += " - Grey Tide"
-				desc += " A rebellious poster symbolizing assistant solidarity."
-			if(9)
-				name += " - Missing Gloves"
-				desc += " This poster is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
-			if(10)
-				name += " - Hacking Guide"
-				desc += " This poster details the internal workings of the common Nanotrasen airlock."
-			if(11)
-				name += " - RIP Badger"
-				desc += " This poster commemorates the day hundreds of badgers worldwide were sacrificed for the greater good."
-			if(12)
-				name += " - Ambrosia Vulgaris"
-				desc += " This poster is lookin' pretty trippy man."
-			if(13)
-				name += " - Donut Corp."
-				desc += " This poster is an advertisement for Donut Corp."
-			if(14)
-				name += " - EAT"
-				desc += " This poster is advising that you eat."
-			if(15)
-				name += " - Tools"
-				desc += " This poster is an advertisement for tools."
-			if(16)
-				name += " - Power"
-				desc += " A poster all about power."
-			if(17)
-				name += " - Power to the People"
-				desc += " Screw those EDF guys!"
-			if(18)
-				name += " - Communist state"
-				desc += " All hail the Communist party!"
-			if(19)
-				name += " - Lamarr"
-				desc += " This poster depicts Lamarr. Probably made by the Research Director."
-			if(20)
-				name += " - Borg Fancy"
-				desc += " Being fancy can be for any borg, just need a suit."
-			if(21)
-				name += " - Borg Fancy v2"
-				desc += " Borg Fancy, Now only taking the most fancy."
-			if(22)
-				name += " - Kosmicheskaya Stantsiya 13 Does Not Exist"
-				desc += " A poster denying the existence of the derelict station near [station_name()]."
-			if(23)
-				name += " - Rebels Unite!"
-				desc += " A poster telling the viewer to rebel against Nanotrasen."
-			if(24)
-				name += " - C-20r Advertisement"
-				desc += " A poster advertising the Scarborough Arms C-20r."
-			if(25)
-				name += " - Have A Puff"
-				desc += " Who cares about lung cancer when you're high as a kite?"
-			if(26)
-				name += " - Revolver Advertisement"
-				desc += " Because seven shots are all you need."
-			if(27)
-				name += " - D-Day Promotional Poster"
-				desc += " A promotional poster for some rapper."
-			if(28)
-				name += " - Syndicate Pistol Advertisement"
-				desc += " A poster advertising Syndicate pistols as being 'Classy as fuck'."
-			if(29)
-				name += " - E-sword Rainbow"
-				desc += " All the colors of bloody murder rainbow."
-			if(30)
-				name += " - Red Rum"
-				desc += " Looking at this poster makes you want to kill."
-			if(31)
-				name += " - CC 64K Advertisement"
-				desc += " The latest portable computer from Comrade Computing, with a whole 64kB of ram!"
-			if(32)
-				name += " - Punch Shit"
-				desc += " Fight things for no reason, like a man!"
-			if(33)
-				name += " - The Griffin"
-				desc += " The Griffin commands you to be the worst you can be. Will you?"
-			else
-				name += " - Error (subtype 0 serial_number)"
-				desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/ParadiseSS13/Paradise/issues."
-
-	if(subtype == 1)
-		icon_state = "poster[serial_number]_legit"
-		switch(serial_number)
-			if(1)
-				name += " - Here for Your Safety"
-				desc += " A poster glorifying the station's security force."
-			if(2)
-				name += " - Nanotrasen Logo"
-				desc += " A poster depicting the logo of Nanotrasen."
-			if(3)
-				name += " - Cleanliness"
-				desc += " A poster warning of the dangers of poor hygiene."
-			if(4)
-				name += " - Help Others"
-				desc += " A poster encouraging you to help fellow crewmembers."
-			if(5)
-				name += " - Build"
-				desc += " A poster glorifying the engineering team."
-			if(6)
-				name += " - Bless This Spess"
-				desc += " A poster blessing this area."
-			if(7)
-				name += " - Science"
-				desc += " A poster depicting an atom."
-			if(8)
-				name += " - Ian"
-				desc += " Arf Arf."
-			if(9)
-				name += " - Obey"
-				desc += " A poster instructing the viewer to obey authority."
-			if(10)
-				name += " - Walk"
-				desc += " A poster instructing the viewer to walk instead of running."
-			if(11)
-				name += " - State Laws"
-				desc += " A poster instructing cyborgs to state their laws."
-			if(12)
-				name += " - Love Ian"
-				desc += " Ian is love, Ian is life."
-			if(13)
-				name += " - Space Cops"
-				desc += " A poster advertising the television show Space Cops."
-			if(14)
-				name += " - Ue No"
-				desc += " This thing is all in Japanese."
-			if(15)
-				name += " - Get Your LEGS"
-				desc += " LEGS: Leadership, Experience, Genius, S(Opportunity)."
-			if(16)
-				name += " - Do Not Question"
-				desc += " A poster instructing the viewer not to ask about things they aren't meant to know."
-			if(17)
-				name += " - Work for a Future"
-				desc += " A poster encouraging you to work for your future, what it is, no one is really sure."
-			if(18)
-				name += " - Soft Cap Pop Art"
-				desc += " A poster reprint of some cheap pop art."
-			if(19)
-				name += " - Safety: Internals"
-				desc += " A poster instructing the viewer to wear internals in environments where there is no oxygen or the air has been rendered toxic."
-			if(20)
-				name += " - Safety: Eye Protection"
-				desc += " A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights."
-			if(21)
-				name += " - Safety: Report"
-				desc += " A poster instructing the viewer to report suspicious activity to the security force."
-			if(22)
-				name += " - Report Crimes"
-				desc += " Report crimes at: 1-800-FUCKING-TERRORISTS or at https://www.sectorthirteen.nt/malcontents."
-			if(23)
-				name += " - Ion Rifle"
-				desc += " A poster displaying an Ion Rifle."
-			if(24)
-				name += " - Foam Force Advertisement"
-				desc += " Foam Force, it's Foam or be Foamed!"
-			if(25)
-				name += " - Cohiba Robusto Advertisement"
-				desc += " Cohiba Robusto, the classy cigar."
-			if(26)
-				name += " - 50th Anniversary Vintage Reprint"
-				desc += " A reprint of a poster from 2504, commemorating the 50th Anniversary of Nanoposters Manufacturing, a subsidiary of Nanotrasen."
-			if(27)
-				name += " - Fruit Bowl"
-				desc += " Simple, yet awe inspiring."
-			if(28)
-				name += " - NanoPDA 1000 Advertisement"
-				desc += " A poster advertising the latest PDA from Nanotrasen."
-			if(29)
-				name += " - Enlist"
-				desc += " Enlist in the Nanotrasen ERT reserves today!"
-			if(30)
-				name += " - Nanomichi Advertisement"
-				desc += " A poster advertising Nanomichi brand audio cassettes."
-			if(31)
-				name += " - 12 Gauge"
-				desc += " A poster boasting about the superiority of 12-gauge shotgun shells."
-			if(32)
-				name += " - High-Class Martini"
-				desc += " I told you to shake it, no stirring."
-			if(33)
-				name += " - The Owl"
-				desc += " The Owl would do his best to protect the station. Will you?"
-			if(34)
-				name += " - Spider Risk"
-				desc += " A poster detailing what to do when giant spiders are seen."
-			if(35)
-				name += " - Kill Syndicate"
-				desc += " A poster demanding that all crew should be ready to fight the Syndicate."
-			if(36)
-				name += " - Information on Air"
-				desc += " A poster providing visual aid to remind crew of air canisters."
-			if(37)
-				name += " - Information on Air"
-				desc += " A poster providing visual aid to remind crew of air canisters."
-			if(38)
-				name += " - Dig for Glory!"
-				desc += " A poster providing trying to convince crew to mine for ore."
-			if(39)
-				name += " - Religious Poster"
-				desc += " A generic religious poser telling you to believe."
-			if(40)
-				name += " - Stay Healthy!"
-				desc += " A healthy crew is a happy crew!"
-			else
-				name += " - Error (subtype 1 serial_number)"
-				desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/ParadiseSS13/Paradise/issues."
+/obj/structure/sign/poster/New()
 	..()
+	if(random_basetype)
+		randomise(random_basetype)
+	if(!ruined)
+		original_name = name
+		name = "poster - [name]"
+		desc = "A large piece of space-resistant printed paper. [desc]"
 
-obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/wirecutters))
+/obj/structure/sign/poster/proc/randomise(base_type)
+	var/list/poster_types = subtypesof(base_type)
+	var/list/approved_types = list()
+	for(var/t in poster_types)
+		var/obj/structure/sign/poster/T = t
+		if(initial(T.icon_state) && !initial(T.never_random))
+			approved_types |= T
+
+	var/obj/structure/sign/poster/selected = pick(approved_types)
+
+	name = initial(selected.name)
+	desc = initial(selected.desc)
+	icon_state = initial(selected.icon_state)
+	poster_item_name = initial(selected.poster_item_name)
+	poster_item_desc = initial(selected.poster_item_desc)
+	poster_item_icon_state = initial(selected.poster_item_icon_state)
+	ruined = initial(selected.ruined)
+
+/obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
+	if(iswirecutter(I))
 		playsound(loc, I.usesound, 100, 1)
 		if(ruined)
 			to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
@@ -337,45 +94,33 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
 		else
 			to_chat(user, "<span class='notice'>You carefully remove the poster from the wall.</span>")
 			roll_and_drop(user.loc)
-		return
-
 
 /obj/structure/sign/poster/attack_hand(mob/user)
 	if(ruined)
 		return
-	var/temp_loc = user.loc
-	switch(alert("Do I want to rip the poster from the wall?","You think...","Yes","No"))
-		if("Yes")
-			if( user.loc != temp_loc || ruined )
-				return
-			visible_message("<span class='warning'>[user] rips [src] in a single, decisive motion!</span>" )
-			playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
-			ruined = 1
-			icon_state = "poster_ripped"
-			name = "ripped poster"
-			desc = "You can't make out anything from the poster's original print. It's ruined."
-			add_fingerprint(user)
-		if("No")
-			return
+	visible_message("[user] rips [src] in a single, decisive motion!" )
+	playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
 
-/obj/structure/sign/poster/proc/roll_and_drop(turf/location)
-	var/obj/item/weapon/contraband/poster/P
-	if(subtype == 1)
-		P = new/obj/item/weapon/contraband/poster/legit/(src, serial_number)
-	else
-		P = new(src, serial_number)
-	P.resulting_poster = src
-	P.loc = location
-	loc = P
+	var/obj/structure/sign/poster/ripped/R = new(loc)
+	R.pixel_y = pixel_y
+	R.pixel_x = pixel_x
+	R.add_fingerprint(user)
+	qdel(src)
 
+/obj/structure/sign/poster/proc/roll_and_drop(loc)
+	pixel_x = 0
+	pixel_y = 0
+	var/obj/item/weapon/poster/P = new(loc, src)
+	forceMove(P)
+	return P
 
 //seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
-/turf/simulated/wall/proc/place_poster(obj/item/weapon/contraband/poster/P, mob/user)
-	if(!P.resulting_poster)	return
-
+/turf/simulated/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user)
+	if(!P.poster_structure)
+		return
 	var/stuff_on_wall = 0
-	for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff
-		if(istype(O,/obj/structure/sign))
+	for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff
+		if(istype(O, /obj/structure/sign/poster))
 			to_chat(user, "<span class='notice'>The wall is far too cluttered to place a poster!</span>")
 			return
 		stuff_on_wall++
@@ -385,9 +130,7 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
 
 		to_chat(user, "<span class='notice'>You start placing the poster on the wall...</span>")//Looks like it's uncluttered enough. Place the poster.
 
-
-	//declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
-	var/obj/structure/sign/poster/D = P.resulting_poster
+	var/obj/structure/sign/poster/D = P.poster_structure
 
 	var/temp_loc = user.loc
 
@@ -408,24 +151,422 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
 			to_chat(user, "<span class='notice'>You cannot reach the wall from here!</span>")
 			return
 
-	flick("poster_being_set",D)
-	D.loc = temp_loc
-
+	flick("poster_being_set", D)
+	D.forceMove(temp_loc)
 	qdel(P)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
 	playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1)
 
-	sleep(17)
-	if(!D)	return
+	if(do_after(user, PLACE_SPEED, target = src))
+		if(!D || qdeleted(D))
+			return
 
-	if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc)	//Let's check if everything is still there
-		to_chat(user, "<span class='notice'>You place the poster!</span>")
-	else
-		D.roll_and_drop(temp_loc)
-	return
+		if(iswallturf(src) && user && user.loc == temp_loc)	//Let's check if everything is still there
+			to_chat(user, "<span class='notice'>You place the poster!</span>")
+			return
 
-//Putting non-contraband posters here because everything else here is related to posters anyway. -JS
+	to_chat(user, "<span class='notice'>The poster falls down!</span>")
+	D.roll_and_drop(temp_loc)
 
-/obj/item/weapon/contraband/poster/legit
-	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. It's contents go through Nanotrasen's strict content guidelines."
-	icon_state = "rolled_poster_legit"
-	subtype = 1
+
+////////////////////////////////POSTER VARIATIONS////////////////////////////////
+
+/obj/structure/sign/poster/ripped
+	ruined = TRUE
+	icon_state = "poster_ripped"
+	name = "ripped poster"
+	desc = "You can't make out anything from the poster's original print. It's ruined."
+
+/obj/structure/sign/poster/random
+	name = "random poster" // could even be ripped
+	icon_state = "random_anything"
+	never_random = TRUE
+	random_basetype = /obj/structure/sign/poster
+
+/obj/structure/sign/poster/contraband
+	poster_item_name = "contraband poster"
+	poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
+	poster_item_icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/contraband/random
+	name = "random contraband poster"
+	icon_state = "random_contraband"
+	never_random = TRUE
+	random_basetype = /obj/structure/sign/poster/contraband
+
+/obj/structure/sign/poster/contraband/free_tonto
+	name = "Free Tonto"
+	desc = "A salvaged shred of a much larger flag, colors bled together and faded from age."
+	icon_state = "poster1"
+
+/obj/structure/sign/poster/contraband/atmosia_independence
+	name = "Atmosia Declaration of Independence"
+	desc = "A relic of a failed rebellion."
+	icon_state = "poster2"
+
+/obj/structure/sign/poster/contraband/fun_police
+	name = "Fun Police"
+	desc = "A poster condemning the station's security forces."
+	icon_state = "poster3"
+
+/obj/structure/sign/poster/contraband/lusty_xenomorph
+	name = "Lusty Xenomorph"
+	desc = "A heretical poster depicting the titular star of an equally heretical book."
+	icon_state = "poster4"
+
+/obj/structure/sign/poster/contraband/syndicate_recruitment
+	name = "Syndicate Recruitment"
+	desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"
+	icon_state = "poster5"
+
+/obj/structure/sign/poster/contraband/clown
+	name = "Clown"
+	desc = "Honk."
+	icon_state = "poster6"
+
+/obj/structure/sign/poster/contraband/smoke
+	name = "Smoke"
+	desc = "A poster advertising a rival corporate brand of cigarettes."
+	icon_state = "poster7"
+
+/obj/structure/sign/poster/contraband/grey_tide
+	name = "Grey Tide"
+	desc = "A rebellious poster symbolizing assistant solidarity."
+	icon_state = "poster8"
+
+/obj/structure/sign/poster/contraband/missing_gloves
+	name = "Missing Gloves"
+	desc = "This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases."
+	icon_state = "poster9"
+
+/obj/structure/sign/poster/contraband/hacking_guide
+	name = "Hacking Guide"
+	desc = "This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date."
+	icon_state = "poster10"
+
+/obj/structure/sign/poster/contraband/rip_badger
+	name = "RIP Badger"
+	desc = "This seditious poster references Nanotrasen's genocide of a space station full of badgers."
+	icon_state = "poster11"
+
+/obj/structure/sign/poster/contraband/ambrosia_vulgaris
+	name = "Ambrosia Vulgaris"
+	desc = "This poster is lookin' pretty trippy man."
+	icon_state = "poster12"
+
+/obj/structure/sign/poster/contraband/donut_corp
+	name = "Donut Corp."
+	desc = "This poster is an unauthorized advertisement for Donut Corp."
+	icon_state = "poster13"
+
+/obj/structure/sign/poster/contraband/eat
+	name = "EAT."
+	desc = "This poster promotes rank gluttony."
+	icon_state = "poster14"
+
+/obj/structure/sign/poster/contraband/tools
+	name = "Tools"
+	desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."
+	icon_state = "poster15"
+
+/obj/structure/sign/poster/contraband/power
+	name = "Power"
+	desc = "A poster that positions the seat of power outside Nanotrasen."
+	icon_state = "poster16"
+
+/obj/structure/sign/poster/contraband/power_people
+	name = "Power to the people"
+	desc = "Screw those EDF guys!"
+	icon_state = "poster17"
+
+/obj/structure/sign/poster/contraband/communist_state
+	name = "Communist State"
+	desc = "All hail the Communist party!"
+	icon_state = "poster18"
+
+/obj/structure/sign/poster/contraband/lamarr
+	name = "Lamarr"
+	desc = "This poster depicts Lamarr. Probably made by a traitorous Research Director."
+	icon_state = "poster19"
+
+/obj/structure/sign/poster/contraband/borg_fancy_1
+	name = "Borg Fancy"
+	desc = "Being fancy can be for any borg, just need a suit."
+	icon_state = "poster20"
+
+/obj/structure/sign/poster/contraband/borg_fancy_2
+	name = "Borg Fancy v2"
+	desc = "Borg Fancy, Now only taking the most fancy."
+	icon_state = "poster21"
+
+/obj/structure/sign/poster/contraband/kss13
+	name = "Kosmicheskaya Stantsiya 13 Does Not Exist"
+	desc = "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."
+	icon_state = "poster22"
+
+/obj/structure/sign/poster/contraband/rebels_unite
+	name = "Rebels Unite"
+	desc = "A poster urging the viewer to rebel against Nanotrasen."
+	icon_state = "poster23"
+
+/obj/structure/sign/poster/contraband/c20r
+	name = "C-20r"
+	desc = "A poster advertising the Scarborough Arms C-20r."
+	icon_state = "poster24"
+
+/obj/structure/sign/poster/contraband/have_a_puff
+	name = "Have a Puff"
+	desc = "Who cares about lung cancer when you're high as a kite?"
+	icon_state = "poster25"
+
+/obj/structure/sign/poster/contraband/revolver
+	name = "Revolver"
+	desc = "Because seven shots are all you need."
+	icon_state = "poster26"
+
+/obj/structure/sign/poster/contraband/d_day_promo
+	name = "D-Day Promo"
+	desc = "A promotional poster for some rapper."
+	icon_state = "poster27"
+
+/obj/structure/sign/poster/contraband/syndicate_pistol
+	name = "Syndicate Pistol"
+	desc = "A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags."
+	icon_state = "poster28"
+
+/obj/structure/sign/poster/contraband/energy_swords
+	name = "Energy Swords"
+	desc = "All the colors of the bloody murder rainbow."
+	icon_state = "poster29"
+
+/obj/structure/sign/poster/contraband/red_rum
+	name = "Red Rum"
+	desc = "Looking at this poster makes you want to kill."
+	icon_state = "poster30"
+
+/obj/structure/sign/poster/contraband/cc64k_ad
+	name = "CC 64K Ad"
+	desc = "The latest portable computer from Comrade Computing, with a whole 64kB of ram!"
+	icon_state = "poster31"
+
+/obj/structure/sign/poster/contraband/punch_shit
+	name = "Punch Shit"
+	desc = "Fight things for no reason, like a man!"
+	icon_state = "poster32"
+
+/obj/structure/sign/poster/contraband/the_griffin
+	name = "The Griffin"
+	desc = "The Griffin commands you to be the worst you can be. Will you?"
+	icon_state = "poster33"
+
+/obj/structure/sign/poster/official
+	poster_item_name = "motivational poster"
+	poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
+	poster_item_icon_state = "rolled_poster_legit"
+
+/obj/structure/sign/poster/official/random
+	name = "random official poster"
+	random_basetype = /obj/structure/sign/poster/official
+	icon_state = "random_official"
+	never_random = TRUE
+
+/obj/structure/sign/poster/official/here_for_your_safety
+	name = "Here For Your Safety"
+	desc = "A poster glorifying the station's security force."
+	icon_state = "poster1_legit"
+
+/obj/structure/sign/poster/official/nanotrasen_logo
+	name = "Nanotrasen Logo"
+	desc = "A poster depicting the Nanotrasen logo."
+	icon_state = "poster2_legit"
+
+/obj/structure/sign/poster/official/cleanliness
+	name = "Cleanliness"
+	desc = "A poster warning of the dangers of poor hygiene."
+	icon_state = "poster3_legit"
+
+/obj/structure/sign/poster/official/help_others
+	name = "Help Others"
+	desc = "A poster encouraging you to help fellow crewmembers."
+	icon_state = "poster4_legit"
+
+/obj/structure/sign/poster/official/build
+	name = "Build"
+	desc = "A poster glorifying the engineering team."
+	icon_state = "poster5_legit"
+
+/obj/structure/sign/poster/official/bless_this_spess
+	name = "Bless This Spess"
+	desc = "A poster blessing this area."
+	icon_state = "poster6_legit"
+
+/obj/structure/sign/poster/official/science
+	name = "Science"
+	desc = "A poster depicting an atom."
+	icon_state = "poster7_legit"
+
+/obj/structure/sign/poster/official/ian
+	name = "Ian"
+	desc = "Arf arf. Yap."
+	icon_state = "poster8_legit"
+
+/obj/structure/sign/poster/official/obey
+	name = "Obey"
+	desc = "A poster instructing the viewer to obey authority."
+	icon_state = "poster9_legit"
+
+/obj/structure/sign/poster/official/walk
+	name = "Walk"
+	desc = "A poster instructing the viewer to walk instead of running."
+	icon_state = "poster10_legit"
+
+/obj/structure/sign/poster/official/state_laws
+	name = "State Laws"
+	desc = "A poster instructing cyborgs to state their laws."
+	icon_state = "poster11_legit"
+
+/obj/structure/sign/poster/official/love_ian
+	name = "Love Ian"
+	desc = "Ian is love, Ian is life."
+	icon_state = "poster12_legit"
+
+/obj/structure/sign/poster/official/space_cops
+	name = "Space Cops."
+	desc = "A poster advertising the television show Space Cops."
+	icon_state = "poster13_legit"
+
+/obj/structure/sign/poster/official/ue_no
+	name = "Ue No."
+	desc = "This thing is all in Japanese."
+	icon_state = "poster14_legit"
+
+/obj/structure/sign/poster/official/get_your_legs
+	name = "Get Your LEGS"
+	desc = "LEGS: Leadership, Experience, Genius, Subordination."
+	icon_state = "poster15_legit"
+
+/obj/structure/sign/poster/official/do_not_question
+	name = "Do Not Question"
+	desc = "A poster instructing the viewer not to ask about things they aren't meant to know."
+	icon_state = "poster16_legit"
+
+/obj/structure/sign/poster/official/work_for_a_future
+	name = "Work For A Future"
+	desc = " A poster encouraging you to work for your future."
+	icon_state = "poster17_legit"
+
+/obj/structure/sign/poster/official/soft_cap_pop_art
+	name = "Soft Cap Pop Art"
+	desc = "A poster reprint of some cheap pop art."
+	icon_state = "poster18_legit"
+
+/obj/structure/sign/poster/official/safety_internals
+	name = "Safety: Internals"
+	desc = "A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic."
+	icon_state = "poster19_legit"
+
+/obj/structure/sign/poster/official/safety_eye_protection
+	name = "Safety: Eye Protection"
+	desc = "A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights."
+	icon_state = "poster20_legit"
+
+/obj/structure/sign/poster/official/safety_report
+	name = "Safety: Report"
+	desc = "A poster instructing the viewer to report suspicious activity to the security force."
+	icon_state = "poster21_legit"
+
+/obj/structure/sign/poster/official/report_crimes
+	name = "Report Crimes"
+	desc = "A poster encouraging the swift reporting of crime or seditious behavior to station security."
+	icon_state = "poster22_legit"
+
+/obj/structure/sign/poster/official/ion_rifle
+	name = "Ion Rifle"
+	desc = "A poster displaying an Ion Rifle."
+	icon_state = "poster23_legit"
+
+/obj/structure/sign/poster/official/foam_force_ad
+	name = "Foam Force Ad"
+	desc = "Foam Force, it's Foam or be Foamed!"
+	icon_state = "poster24_legit"
+
+/obj/structure/sign/poster/official/cohiba_robusto_ad
+	name = "Cohiba Robusto Ad"
+	desc = "Cohiba Robusto, the classy cigar."
+	icon_state = "poster25_legit"
+
+/obj/structure/sign/poster/official/anniversary_vintage_reprint
+	name = "50th Anniversary Vintage Reprint"
+	desc = "A reprint of a poster from 2505, commemorating the 50th Anniversery of Nanoposters Manufacturing, a subsidary of Nanotrasen."
+	icon_state = "poster26_legit"
+
+/obj/structure/sign/poster/official/fruit_bowl
+	name = "Fruit Bowl"
+	desc = " Simple, yet awe-inspiring."
+	icon_state = "poster27_legit"
+
+/obj/structure/sign/poster/official/pda_ad
+	name = "PDA Ad"
+	desc = "A poster advertising the latest PDA from Nanotrasen suppliers."
+	icon_state = "poster28_legit"
+
+/obj/structure/sign/poster/official/enlist
+	name = "Enlist"
+	desc = "Enlist in the Nanotrasen ERT reserves today!"
+	icon_state = "poster29_legit"
+
+/obj/structure/sign/poster/official/nanomichi_ad
+	name = "Nanomichi Ad"
+	desc = " A poster advertising Nanomichi brand audio cassettes."
+	icon_state = "poster30_legit"
+
+/obj/structure/sign/poster/official/twelve_gauge
+	name = "12 Gauge"
+	desc = "A poster boasting about the superiority of 12 gauge shotgun shells."
+	icon_state = "poster31_legit"
+
+/obj/structure/sign/poster/official/high_class_martini
+	name = "High-Class Martini"
+	desc = "I told you to shake it, no stirring."
+	icon_state = "poster32_legit"
+
+/obj/structure/sign/poster/official/the_owl
+	name = "The Owl"
+	desc = "The Owl would do his best to protect the station. Will you?"
+	icon_state = "poster33_legit"
+
+/obj/structure/sign/poster/official/spiders
+	name = "Spider Risk"
+	desc = "A poster detailing what to do when giant spiders are seen."
+	icon_state = "poster34_legit"
+
+/obj/structure/sign/poster/official/kill_syndicate
+	name = "Kill Syndicate"
+	desc = "A poster demanding that all crew should be ready to fight the Syndicate."
+	icon_state = "poster35_legit"
+
+/obj/structure/sign/poster/official/air1
+	name = "Information on Air"
+	desc = "A poster providing visual aid to remind crew of air canisters."
+	icon_state = "poster36_legit"
+
+/obj/structure/sign/poster/official/air2
+	name = "Information on Air"
+	desc = "A poster providing visual aid to remind crew of air canisters."
+	icon_state = "poster37_legit"
+
+/obj/structure/sign/poster/official/dig
+	name = "Dig for Glory!"
+	desc = "A poster trying to convince the crew to mine for ore."
+	icon_state = "poster38_legit"
+
+/obj/structure/sign/poster/official/religious
+	name = "Religious Poster"
+	desc = "A generic religious poster telling you to believe."
+	icon_state = "poster39_legit"
+
+/obj/structure/sign/poster/official/healthy
+	name = "Stay Healthy!"
+	desc = "A healthy crew is a happy crew!"
+	icon_state = "poster40_legit"
+
+#undef PLACE_SPEED

code/game/objects/effects/gibs.dm

@@ -1,29 +1,28 @@
-/proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA)		//CARN MARKER
-	new /obj/effect/gibspawner/generic(get_turf(location),viruses,MobDNA)
+/proc/gibs(atom/location, datum/dna/MobDNA)		//CARN MARKER
+	new /obj/effect/gibspawner/generic(get_turf(location), MobDNA)
 
-/proc/hgibs(atom/location, var/list/viruses, var/datum/dna/MobDNA)
-	new /obj/effect/gibspawner/human(get_turf(location),viruses,MobDNA)
+/proc/hgibs(atom/location, datum/dna/MobDNA)
+	new /obj/effect/gibspawner/human(get_turf(location), MobDNA)
 
-/proc/xgibs(atom/location, var/list/viruses)
-	new /obj/effect/gibspawner/xeno(get_turf(location),viruses)
+/proc/xgibs(atom/location)
+	new /obj/effect/gibspawner/xeno(get_turf(location))
 
-/proc/robogibs(atom/location, var/list/viruses)
-	new /obj/effect/gibspawner/robot(get_turf(location),viruses)
+/proc/robogibs(atom/location)
+	new /obj/effect/gibspawner/robot(get_turf(location))
 
 /obj/effect/gibspawner
 	var/sparks = 0 //whether sparks spread on Gib()
-	var/virusProb = 20 //the chance for viruses to spread on the gibs
 	var/list/gibtypes = list()
 	var/list/gibamounts = list()
 	var/list/gibdirections = list() //of lists
 
-	New(location, var/list/viruses, var/datum/dna/MobDNA)
+	New(location, datum/dna/MobDNA)
 		..()
 
 		if(istype(loc,/turf)) //basically if a badmin spawns it
-			Gib(loc,viruses,MobDNA)
+			Gib(loc, MobDNA)
 
-	proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null)
+	proc/Gib(atom/location, datum/dna/MobDNA = null)
 		if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
 			to_chat(world, "<span class='warning'>Gib list length mismatch!</span>")
 			return

code/game/objects/effects/overlays.dm

@@ -16,9 +16,9 @@
 	var/tmp/atom/BeamSource
 	New()
 		..()
-		spawn(10) 
+		spawn(10)
 			qdel(src)
-			
+
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'
@@ -56,7 +56,7 @@
 /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)
@@ -81,7 +81,7 @@
 
 /obj/effect/overlay/temp/guardian/phase/out
 	icon_state = "phaseout"
-	
+
 /obj/effect/overlay/temp/emp
 	name = "emp sparks"
 	icon = 'icons/effects/effects.dmi'
@@ -92,7 +92,7 @@
 	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'
@@ -112,7 +112,7 @@
 	icon_state = "kinetic_blast"
 	layer = 4.1
 	duration = 4
-	
+
 /obj/effect/overlay/temp/explosion
 	name = "explosion"
 	icon = 'icons/effects/96x96.dmi'
@@ -124,7 +124,7 @@
 /obj/effect/overlay/temp/explosion/fast
 	icon_state = "explosionfast"
 	duration = 4
-	
+
 /obj/effect/overlay/temp/decoy
 	desc = "It's a decoy!"
 	duration = 15
@@ -150,14 +150,14 @@
 /obj/effect/overlay/temp/cult/sparks
 	randomdir = 1
 	name = "blood sparks"
-	icon_state = "bloodsparkles"	
-	
+	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
+		setDir(set_dir)
 	..()
 
 /obj/effect/overlay/temp/dir_setting/bloodsplatter
@@ -165,9 +165,12 @@
 	duration = 5
 	randomdir = FALSE
 	layer = MOB_LAYER - 0.1
+	color = "#C80000"
 	var/splatter_type = "splatter"
 
-/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
+	if(blood_color)
+		color = blood_color
 	if(set_dir in diagonals)
 		icon_state = "[splatter_type][pick(1, 2, 6)]"
 	else
@@ -247,7 +250,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "heal"
 	duration = 15
-	
+
 /obj/effect/overlay/temp/heal/New(loc, colour)
 	..()
 	pixel_x = rand(-12, 12)

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

@@ -95,7 +95,7 @@
 				/obj/item/clothing/head/cone = 10,
 				/obj/item/weapon/coin/silver = 10,
 				/obj/item/weapon/coin/twoheaded = 10,
-				/obj/item/weapon/contraband/poster = 10,
+				/obj/item/weapon/poster/random_contraband = 10,
 				/obj/item/weapon/crowbar = 10,
 				/obj/item/weapon/crowbar/red = 10,
 				/obj/item/weapon/extinguisher = 90,

code/game/objects/items.dm

@@ -87,6 +87,15 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	var/sprite_sheets_obj = null //Used to override hardcoded clothing inventory object dmis in human clothing proc.
 	var/list/species_fit = null //This object has a different appearance when worn by these species
 
+	var/trip_verb = TV_TRIP
+	var/trip_chance = 0
+
+	var/trip_stun = 0
+	var/trip_weaken = 0
+	var/trip_any = FALSE
+	var/trip_walksafe = TRUE
+	var/trip_tiles = 0
+
 /obj/item/New()
 	..()
 	for(var/path in actions_types)
@@ -474,51 +483,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	M.AdjustEyeBlurry(rand(3,4))
 	return
 
-/obj/item/clean_blood()
-	. = ..()
-	if(blood_overlay)
-		overlays.Remove(blood_overlay)
-	if(istype(src, /obj/item/clothing/gloves))
-		var/obj/item/clothing/gloves/G = src
-		G.transfer_blood = 0
-
-
-/obj/item/add_blood(mob/living/carbon/human/M as mob)
-	if(!..())
-		return 0
-
-	if(istype(src, /obj/item/weapon/melee/energy))
-		return
-
-	//if we haven't made our blood_overlay already
-	if( !blood_overlay )
-		generate_blood_overlay()
-
-	//apply the blood-splatter overlay if it isn't already in there
-	if(!blood_DNA.len)
-		blood_overlay.color = blood_color
-		overlays += blood_overlay
-
-	//if this blood isn't already in the list, add it
-	if(istype(M))
-		if(blood_DNA[M.dna.unique_enzymes])
-			return 0 //already bloodied with this blood. Cannot add more.
-		blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
-	return 1 //we applied blood to the item
-
-/obj/item/proc/generate_blood_overlay()
-	if(blood_overlay)
-		return
-
-	var/icon/I = new /icon(icon, icon_state)
-	I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD) //fills the icon_state with white (except where it's transparent)
-	I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"),ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
-
-	//not sure if this is worth it. It attaches the blood_overlay to every item of the same type if they don't have one already made.
-	for(var/obj/item/A in world)
-		if(A.type == type && !A.blood_overlay)
-			A.blood_overlay = image(I)
-
 /obj/item/singularity_pull(S, current_size)
 	spawn(0) //this is needed or multiple items will be thrown sequentially and not simultaneously
 		if(current_size >= STAGE_FOUR)
@@ -575,3 +539,12 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 /obj/item/proc/is_equivalent(obj/item/I)
 	return I == src
+
+/obj/item/Crossed(atom/movable/AM)
+	if(prob(trip_chance) && ishuman(AM))
+		var/mob/living/carbon/human/H = AM
+		on_trip(H)
+
+/obj/item/proc/on_trip(mob/living/carbon/human/H)
+	if(H.slip(src, trip_stun, trip_weaken, trip_tiles, trip_walksafe, trip_any, trip_verb))
+		return TRUE

code/game/objects/items/bodybag.dm

@@ -89,51 +89,4 @@
 	// Make it possible to escape from bodybags in morgues and crematoriums
 	if(loc && (isturf(loc) || istype(loc, /obj/structure/morgue) || istype(loc, /obj/structure/crematorium)))
 		if(!open())
-			to_chat(user, "<span class='notice'>It won't budge!</span>")
-
-/obj/item/bodybag/cryobag
-	name = "stasis bag"
-	desc = "A folded, non-reusable bag designed for the preservation of an occupant's brain by stasis."
-	icon = 'icons/obj/cryobag.dmi'
-	icon_state = "bodybag_folded"
-
-	attack_self(mob/user)
-		var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
-		R.add_fingerprint(user)
-		qdel(src)
-
-
-
-/obj/structure/closet/body_bag/cryobag
-	name = "stasis bag"
-	desc = "A non-reusable plastic bag designed for the preservation of an occupant's brain by stasis."
-	icon = 'icons/obj/cryobag.dmi'
-	item_path = /obj/item/bodybag/cryobag
-	var/used = 0
-	var/locked = 0
-	req_access = list(access_medical)
-
-	open()
-		. = ..()
-		if(used)
-			var/obj/item/O = new/obj/item(src.loc)
-			O.name = "used stasis bag"
-			O.icon = src.icon
-			O.icon_state = "bodybag_used"
-			O.desc = "Pretty useless now.."
-			qdel(src)
-
-	MouseDrop(over_object, src_location, over_location)
-		if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
-			if(!ishuman(usr))	return
-			to_chat(usr, "<span class='warning'>You can't fold that up anymore..</span>")
-		..()
-
-	attackby(W as obj, mob/user as mob, params)
-		if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
-			if(src.allowed(user))
-				src.locked = !src.locked
-				to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
-			else
-				to_chat(user, "<span class='warning'>Access denied.</span>")
-			return
+			to_chat(user, "<span class='notice'>It won't budge!</span>")

code/game/objects/items/crayons.dm

@@ -190,7 +190,7 @@
 	..()
 
 /obj/item/toy/crayon/mime/Topic(href,href_list)
-	if((usr.restrained() || usr.stat || usr.is_in_active_hand(src)))
+	if(!Adjacent(usr) || usr.incapacitated())
 		return
 	if(href_list["color"])
 		if(colour != "#FFFFFF")
@@ -215,11 +215,10 @@
 	..()
 
 /obj/item/toy/crayon/rainbow/Topic(href,href_list[])
-
+	if(!Adjacent(usr) || usr.incapacitated())
+		return
 	if(href_list["color"])
 		var/temp = input(usr, "Please select colour.", "Crayon colour") as color
-		if((usr.restrained() || usr.stat || usr.is_in_active_hand(src)))
-			return
 		colour = temp
 		update_window(usr)
 	else

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

@@ -1,45 +0,0 @@
-//copy pasta of the space piano, don't hurt me -Pete
-
-/obj/item/device/guitar
-	name = "guitar"
-	desc = "It's made of wood and has bronze strings."
-	icon = 'icons/obj/musician.dmi'
-	icon_state = "guitar"
-	item_state = "guitar"
-	force = 10
-	burn_state = FLAMMABLE
-	burntime = 20
-	var/datum/song/handheld/song
-	hitsound = 'sound/effects/guitarsmash.ogg'
-
-/obj/item/device/guitar/New()
-	song = new("guitar", src)
-	song.instrumentExt = "ogg"
-
-/obj/item/device/guitar/Destroy()
-	QDEL_NULL(song)
-	return ..()
-
-/obj/item/device/guitar/attack_self(mob/user as mob)
-	ui_interact(user)
-
-/obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!isliving(user) || user.incapacitated())
-		return
-
-	song.ui_interact(user, ui_key, ui, force_open)
-
-/obj/item/device/guitar/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
-	return song.ui_data(user, ui_key, state)
-
-/obj/item/device/guitar/Topic(href, href_list)
-	song.Topic(href, href_list)
-
-/datum/crafting_recipe/guitar
-	name = "Guitar"
-	result = /obj/item/device/guitar
-	reqs = list(/obj/item/stack/sheet/wood = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
-	time = 80

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

@@ -0,0 +1,103 @@
+//copy pasta of the space piano, don't hurt me -Pete
+/obj/item/device/instrument
+	name = "generic instrument"
+	icon = 'icons/obj/musician.dmi'
+	burn_state = FLAMMABLE
+	var/datum/song/handheld/song
+	var/instrumentId = "generic"
+	var/instrumentExt = "ogg"
+
+/obj/item/device/instrument/New()
+	song = new(instrumentId, src)
+	song.instrumentExt = instrumentExt
+	..()
+
+/obj/item/device/instrument/Destroy()
+	QDEL_NULL(song)
+	return ..()
+
+/obj/item/device/instrument/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] begins to play 'Gloomy Sunday'! It looks like \he's trying to commit suicide!</span>")
+	return (BRUTELOSS)
+
+/obj/item/device/instrument/initialize(mapload)
+	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
+	..()
+
+/obj/item/device/instrument/attack_self(mob/user)
+	ui_interact(user)
+
+/obj/item/device/instrument/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
+	if(!isliving(user) || user.incapacitated())
+		return
+
+	song.ui_interact(user, ui_key, ui, force_open)
+
+/obj/item/device/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+	return song.ui_data(user, ui_key, state)
+
+/obj/item/device/instrument/Topic(href, href_list)
+	song.Topic(href, href_list)
+
+/obj/item/device/instrument/violin
+	name = "space violin"
+	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+	icon_state = "violin"
+	item_state = "violin"
+	force = 10
+	hitsound = "swing_hit"
+	instrumentId = "violin"
+
+/obj/item/device/instrument/violin/golden
+	name = "golden violin"
+	desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+	icon_state = "golden_violin"
+	item_state = "golden_violin"
+	burn_state = LAVA_PROOF
+
+/obj/item/device/instrument/guitar
+	name = "guitar"
+	desc = "It's made of wood and has bronze strings."
+	icon_state = "guitar"
+	item_state = "guitar"
+	force = 10
+	attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
+	hitsound = 'sound/effects/guitarsmash.ogg'
+	instrumentId = "guitar"
+
+/obj/item/device/instrument/eguitar
+	name = "electric guitar"
+	desc = "Makes all your shredding needs possible."
+	icon_state = "eguitar"
+	item_state = "eguitar"
+	force = 12
+	attack_verb = list("played metal on", "shredded", "crashed", "smashed")
+	hitsound = 'sound/weapons/stringsmash.ogg'
+	instrumentId = "eguitar"
+
+/datum/crafting_recipe/violin
+	name = "Violin"
+	result = /obj/item/device/instrument/violin
+	reqs = list(/obj/item/stack/sheet/wood = 5,
+				/obj/item/stack/cable_coil = 6,
+				/obj/item/stack/tape_roll = 5)
+	tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
+	time = 80
+
+/datum/crafting_recipe/guitar
+	name = "Guitar"
+	result = /obj/item/device/instrument/guitar
+	reqs = list(/obj/item/stack/sheet/wood = 5,
+				/obj/item/stack/cable_coil = 6,
+				/obj/item/stack/tape_roll = 5)
+	tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
+	time = 80
+
+/datum/crafting_recipe/eguitar
+	name = "Electric Guitar"
+	result = /obj/item/device/instrument/eguitar
+	reqs = list(/obj/item/stack/sheet/metal = 5,
+				/obj/item/stack/cable_coil = 6,
+				/obj/item/stack/tape_roll = 5)
+	tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
+	time = 80

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

@@ -81,7 +81,7 @@
 		return
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if((HULK in H.mutations) || (H.species.flags & NOGUNS))
+		if((HULK in H.mutations) || (NOGUNS in H.species.species_traits))
 			user << "<span class='warning'>Your fingers can't press the button!</span>"
 			return
 

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

@@ -14,6 +14,7 @@ REAGENT SCANNER
 	icon_state = "t-ray0"
 	var/on = 0
 	slot_flags = SLOT_BELT
+	w_class = 2
 	w_class = WEIGHT_CLASS_SMALL
 	item_state = "electronic"
 	materials = list(MAT_METAL=150)
@@ -96,7 +97,7 @@ REAGENT SCANNER
 			if(H.reagents.reagent_list.len)
 				user.show_message("<span class='notice'>Subject contains the following reagents:</span>")
 				for(var/datum/reagent/R in H.reagents.reagent_list)
-					user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'boldannounce'>OVERDOSING</span>" : ".</span>"]")
+					user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed ? "</span> - <span class = 'boldannounce'>OVERDOSING</span>" : ".</span>"]")
 			else
 				user.show_message("<span class = 'notice'>Subject contains no reagents.</span>")
 			if(H.reagents.addiction_list.len)
@@ -164,15 +165,9 @@ REAGENT SCANNER
 		var/mob/living/carbon/human/H = M
 		var/list/damaged = H.get_damaged_organs(1,1)
 		user.show_message("<span class='notice'>Localized Damage, Brute/Burn:</span>",1)
-		if(length(damaged)>0)
+		if(length(damaged) > 0)
 			for(var/obj/item/organ/external/org in damaged)
-				user.show_message(text("<span class='notice'>\t []: [][] - []</span>",	\
-				capitalize(org.name),					\
-				(org.brute_dam > 0)	?	"<span class='warning'>[org.brute_dam]</span>"							:0,		\
-				(org.status & ORGAN_BLEEDING)?"<span class='danger'>\[Bleeding\]</span>":"\t", 		\
-				(org.burn_dam > 0)	?	"<font color='#FFA500'>[org.burn_dam]</font>"	:0),1)
-		else
-			user.show_message("<span class='notice'>\t Limbs are OK.</span>",1)
+				user.show_message("\t\t<span class='info'>[capitalize(org.name)]: [(org.brute_dam > 0) ? "<font color='red'>[org.brute_dam]</font></span>" : "<font color='red'>0</font>"]-[(org.burn_dam > 0) ? "<font color='#FF8000'>[org.burn_dam]</font>" : "<font color='#FF8000'>0</font>"]")
 
 	OX = M.getOxyLoss() > 50 ? 	"<font color='blue'><b>Severe oxygen deprivation detected</b></font>" 		: 	"Subject bloodstream oxygen level normal"
 	TX = M.getToxLoss() > 50 ? 	"<font color='green'><b>Dangerous amount of toxins detected</b></font>" 	: 	"Subject bloodstream toxin level minimal"
@@ -184,9 +179,10 @@ REAGENT SCANNER
 	if(istype(M, /mob/living/carbon))
 		if(upgraded)
 			chemscan(user, M)
-		for(var/datum/disease/D in M.viruses)
+		for(var/thing in M.viruses)
+			var/datum/disease/D = thing
 			if(!(D.visibility_flags & HIDDEN_SCANNER))
-				to_chat(user, "<span class='alert'><b>Warning: [D.form] detected</b>\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]</span>")
+				user.show_message("<span class='alert'><b>Warning: [D.form] detected</b>\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]</span>")
 	if(M.getStaminaLoss())
 		user.show_message("<span class='info'>Subject appears to be suffering from fatigue.</span>")
 	if(M.getCloneLoss())
@@ -220,23 +216,28 @@ REAGENT SCANNER
 				user.show_message(text("<span class='warning'>Bone fractures detected. Advanced scanner required for location.</span>"), 1)
 				break
 		for(var/obj/item/organ/external/e in H.bodyparts)
-			for(var/datum/wound/W in e.wounds) if(W.internal)
+			if(e.internal_bleeding)
 				user.show_message(text("<span class='warning'>Internal bleeding detected. Advanced scanner required for location.</span>"), 1)
 				break
-		if(H.vessel)
-			var/blood_type = H.get_blood_name()
-			var/blood_volume = round(H.vessel.get_reagent_amount(blood_type))
-			var/blood_percent =  blood_volume / BLOOD_VOLUME_NORMAL
-			blood_percent *= 100
-			if(blood_volume <= 500)
-				user.show_message("<span class='warning'><b>Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl</span>")
-			else if(blood_volume <= 336)
-				user.show_message("<span class='warning'><b>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl</span>")
+		var/blood_id = H.get_blood_id()
+		if(blood_id)
+			if(H.bleed_rate)
+				user.show_message("<span class='danger'>Subject is bleeding!</span>")
+			var/blood_percent =  round((H.blood_volume / BLOOD_VOLUME_NORMAL)*100)
+			var/blood_type = H.b_type
+			if(blood_id != "blood")//special blood substance
+				var/datum/reagent/R = chemical_reagents_list[blood_id]
+				if(R)
+					blood_type = R.name
+				else
+					blood_type = blood_id
+			if(H.blood_volume <= BLOOD_VOLUME_SAFE && H.blood_volume > BLOOD_VOLUME_OKAY)
+				user.show_message("<span class='danger'>LOW blood level [blood_percent] %, [H.blood_volume] cl,</span> <span class='info'>type: [blood_type]</span>")
+			else if(H.blood_volume <= BLOOD_VOLUME_OKAY)
+				user.show_message("<span class='danger'>CRITICAL blood level [blood_percent] %, [H.blood_volume] cl,</span> <span class='info'>type: [blood_type]</span>")
 			else
-				user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl</span>")
-			if(H.species.exotic_blood)
-				user.show_message("<span class='warning'>Subject possesses exotic blood.</span>")
-				user.show_message("<span class='warning'>Exotic blood type: [blood_type].</span>")
+				user.show_message("<span class='info'>Blood level [blood_percent] %, [H.blood_volume] cl, type: [blood_type]</span>")
+
 		if(H.undergoing_cardiac_arrest() && H.stat != DEAD)
 			user.show_message("<span class='userdanger'>Subject suffering from heart attack: Apply defibrillator immediately.</span>")
 		user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")

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

@@ -1,41 +0,0 @@
-//copy pasta of the space piano, don't hurt me -Pete
-
-/obj/item/device/violin
-	name = "space violin"
-	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	icon = 'icons/obj/musician.dmi'
-	icon_state = "violin"
-	item_state = "violin"
-	attack_verb = list("strung", "fiddled", "tuned", "pitched")
-	force = 10
-	burn_state = FLAMMABLE
-	burntime = 20
-	hitsound = 'sound/weapons/smash.ogg'
-	var/datum/song/handheld/song
-
-/obj/item/device/violin/New()
-	song = new("violin", src)
-	song.instrumentExt = "ogg"
-
-/obj/item/device/violin/Destroy()
-	QDEL_NULL(song)
-	return ..()
-
-/obj/item/device/violin/initialize()
-	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-	..()
-
-/obj/item/device/violin/attack_self(mob/user as mob)
-	ui_interact(user)
-
-/obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!isliving(user) || user.incapacitated())
-		return
-
-	song.ui_interact(user, ui_key, ui, force_open)
-
-/obj/item/device/violin/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
-	return song.ui_data(user, ui_key, state)
-
-/obj/item/device/violin/Topic(href, href_list)
-	song.Topic(href, href_list)

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

@@ -11,6 +11,7 @@
 	var/heal_burn = 0
 	var/self_delay = 20
 	var/unique_handling = 0 //some things give a special prompt, do we want to bypass some checks in parent?
+	var/stop_bleeding = 0
 
 /obj/item/stack/medical/attack(mob/living/M, mob/user)
 	if(!iscarbon(M) && !isanimal(M))
@@ -37,6 +38,14 @@
 			to_chat(user, "<span class='danger'>This can't be used on a robotic limb.</span>")
 			return 1
 
+		if(stop_bleeding)
+			if(H.bleedsuppress)
+				to_chat(user, "<span class='warning'>[H]'s bleeding is already bandaged!</span>")
+				return 1
+			else if(!H.bleed_rate)
+				to_chat(user, "<span class='warning'>[H] isn't bleeding!</span>")
+				return 1
+
 		if(M == user && !unique_handling)
 			user.visible_message("<span class='notice'>[user] starts to apply [src] on [H]...</span>")
 			if(!do_mob(user, H, self_delay))
@@ -76,6 +85,7 @@
 	desc = "Some sterile gauze to wrap around bloody stumps."
 	icon_state = "gauze"
 	origin_tech = "biotech=2"
+	stop_bleeding = 1800
 
 /obj/item/stack/medical/bruise_pack/attack(mob/living/M, mob/user)
 	if(..())
@@ -86,19 +96,17 @@
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
-			var/bandaged = affecting.bandage()
-			var/disinfected = affecting.disinfect()
+			affecting.germ_level = 0
 
-			if(!(bandaged || disinfected))
-				to_chat(user, "<span class='warning'>The wounds on [H]'s [affecting.name] have already been bandaged.</span>")
-				return 1
-			else
-				user.visible_message("<span class='green'>[user] bandages the wounds on [H]'s [affecting.name].", \
-								 	 "<span class='green'>You bandage the wounds on [H]'s [affecting.name].</span>" )
+			user.visible_message("<span class='green'>[user] bandages the wounds on [H]'s [affecting.name].</span>", \
+							 	 "<span class='green'>You bandage the wounds on [H]'s [affecting.name].</span>" )
 
-				affecting.heal_damage(heal_brute, heal_burn)
-				H.UpdateDamageIcon()
-				use(1)
+			if(stop_bleeding)
+				if(!H.bleedsuppress) //so you can't stack bleed suppression
+					H.suppress_bloodloss(stop_bleeding)
+			affecting.heal_damage(heal_brute, heal_burn)
+			H.UpdateDamageIcon()
+			use(1)
 		else
 			to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than a bandage!</span>")
 
@@ -109,6 +117,7 @@
 	desc = "An advanced trauma kit for severe injuries."
 	icon_state = "traumakit"
 	heal_brute = 25
+	stop_bleeding = 0
 
 
 
@@ -132,15 +141,13 @@
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
-			if(!affecting.salve())
-				to_chat(user, "<span class='warning'>The wounds on [H]'s [affecting.name] have already been salved.</span>")
-				return 1
-			else
-				user.visible_message("<span class='green'>[user] salves the wounds on [H]'s [affecting.name].", \
-								 	 "<span class='green'>You salve the wounds on [H]'s [affecting.name].</span>" )
-				affecting.heal_damage(heal_brute, heal_burn)
-				H.UpdateDamageIcon()
-				use(1)
+			affecting.germ_level = 0
+
+			user.visible_message("<span class='green'>[user] salves the wounds on [H]'s [affecting.name].</span>", \
+							 	 "<span class='green'>You salve the wounds on [H]'s [affecting.name].</span>" )
+			affecting.heal_damage(heal_brute, heal_burn)
+			H.UpdateDamageIcon()
+			use(1)
 		else
 			to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than some ointment!</span>")
 

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

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /*
 CONTAINS:
 RCD

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

@@ -55,7 +55,8 @@
 		proc/dead_legs(mob/living/carbon/human/H as mob)
 			var/obj/item/organ/external/l = H.get_organ("l_leg")
 			var/obj/item/organ/external/r = H.get_organ("r_leg")
-			if(l && !(l.status & ORGAN_DESTROYED))
-				l.status |= ORGAN_DESTROYED
-			if(r && !(r.status & ORGAN_DESTROYED))
-				r.status |= ORGAN_DESTROYED
+			if(l)
+				l.droplimb(0, DROPLIMB_SHARP)
+			if(r)
+				r.droplimb(0, DROPLIMB_SHARP)
+

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

@@ -5,49 +5,6 @@
  *		Bike Horns
  */
 
-/*
- * Soap
- */
-/obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
-	if(istype(AM, /mob/living/carbon))
-		var/mob/living/carbon/M = AM
-		M.slip("soap", 4, 2)
-
-/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity)
-	if(!proximity) return
-	//I couldn't feasibly  fix the overlay bugs caused by cleaning items we are wearing.
-	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
-	if(user.client && (target in user.client.screen))
-		to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>")
-	else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target))
-		var/mob/living/carbon/human/muncher = user
-		if(muncher && muncher.get_species() == "Drask")
-			to_chat(user, "You take a bite of the [src.name]. Delicious!")
-			playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0)
-			user.nutrition += 2
-	else if(istype(target,/obj/effect/decal/cleanable))
-		user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
-		if(do_after(user, src.cleanspeed, target = target) && target)
-			to_chat(user, "<span class='notice'>You scrub \the [target.name] out.</span>")
-			qdel(target)
-	else
-		user.visible_message("<span class='warning'>[user] begins to clean \the [target.name] with [src].</span>")
-		if(do_after(user, src.cleanspeed, target = target))
-			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
-			var/obj/effect/decal/cleanable/C = locate() in target
-			qdel(C)
-			target.clean_blood()
-			if(istype(target, /turf/simulated))
-				var/turf/simulated/T = target
-				T.dirt = 0
-	return
-
-/obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob)
-	if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" )
-		user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with [src.name]!</span>")
-		return
-	..()
-
 /*
  * Bike Horns
  */

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

@@ -99,7 +99,7 @@
 			if(!get_location_accessible(H, "mouth"))
 				to_chat(user, "<span class='warning'>The mask is in the way.</span>")
 				return
-			if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+			if((C.species.bodyflags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
 				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of facial hair.</span>")
 				return
 			if(C.f_style == "Shaved")
@@ -130,7 +130,7 @@
 			if(!get_location_accessible(H, "head"))
 				to_chat(user, "<span class='warning'>The headgear is in the way.</span>")
 				return
-			if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+			if((C.species.bodyflags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
 				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of hair.</span>")
 				return
 			if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead")

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

@@ -74,7 +74,7 @@
 		H = M
 
 	spawn(0) //Some mutations have sleeps in them, like monkey
-		if(!(NOCLONE in M.mutations) && !(H && (H.species.flags & NO_DNA))) // prevents drained people from having their DNA changed
+		if(!(NOCLONE in M.mutations) && !(H && (NO_DNA in H.species.species_traits))) // prevents drained people from having their DNA changed
 			var/prev_ue = M.dna.unique_enzymes
 			var/mutflags = 0
 			// UI in syringe.
@@ -113,7 +113,7 @@
 
 	if(ishuman(M)) // Would've done this via species instead of type, but the basic mob doesn't have a species, go figure.
 		var/mob/living/carbon/human/H = M
-		if(H.species.flags & NO_DNA)
+		if(NO_DNA in H.species.species_traits)
 			return 0
 
 	if(!user.IsAdvancedToolUser())

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

@@ -19,40 +19,41 @@
 		if(!ishuman(M) || !ishuman(user))
 			return
 
-		if(src.used)
+		if(used)
 			return
 
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(H.species.flags & NO_DNA)
+			if(NO_DNA in H.species.species_traits)
 				to_chat(user, "<span class='warning'>You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.</span>")
 				return
 
 		if(M == user)
 			user.visible_message("<span class='danger'>[user] injects \himself with [src]!</span>")
-			src.injected(user,user)
+			injected(user, user)
 		else
 			user.visible_message("<span class='danger'>[user] is trying to inject [M] with [src]!</span>")
 			if(do_mob(user,M,30))
 				user.visible_message("<span class='danger'>[user] injects [M] with [src].</span>")
-				src.injected(M, user)
+				injected(M, user)
 			else
 				to_chat(user, "<span class='warning'>You failed to inject [M].</span>")
 
-	proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user)
-		scramble(1, target, 100)
-		target.generate_name()
-		if(istype(target, /mob/living/carbon/human))
+	proc/injected(var/mob/living/carbon/human/target, var/mob/living/carbon/user)
+		if(istype(target))
 			var/mob/living/carbon/human/H = target
+			scramble(1, H, 100)
+			H.real_name = random_name(H.gender, H.species.name) //Give them a name that makes sense for their species.
 			H.sync_organ_dna(assimilate = 1)
 			H.update_body(0)
-			H.reset_hair() // No more winding up with hairstyles you're not supposed to have, and blowing your cover
+			H.reset_hair() //No more winding up with hairstyles you're not supposed to have, and blowing your cover.
+			H.reset_markings() //...Or markings.
 			H.dna.ResetUIFrom(H)
 		target.update_icons()
 
 		log_attack("[key_name(user)] injected [key_name(target)] with the [name]")
 		log_game("[key_name_admin(user)] injected [key_name_admin(target)] with the [name]")
 
-		src.used = 1
-		src.update_icon()
-		src.name = "used " + src.name
+		used = 1
+		update_icon()
+		name = "used " + name

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

@@ -72,7 +72,7 @@
 		/obj/item/weapon/lipstick/random,
 		/obj/item/weapon/grenade/smokebomb,
 		/obj/item/weapon/grown/corncob,
-		/obj/item/weapon/contraband/poster,
+		/obj/item/weapon/poster/random_contraband,
 		/obj/item/weapon/bikehorn,
 		/obj/item/weapon/beach_ball,
 		/obj/item/weapon/beach_ball/holoball,
@@ -88,8 +88,8 @@
 		/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,
+		/obj/item/device/instrument/violin,
+		/obj/item/device/instrument/guitar,
 		/obj/item/weapon/storage/belt/utility/full,
 		/obj/item/clothing/accessory/horrible,
 		/obj/random/carp_plushie,

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

@@ -50,24 +50,20 @@
 */
 
 /obj/item/weapon/grown/bananapeel/traitorpeel
+	trip_stun = 0
+	trip_weaken = 7
+	trip_tiles = 4
+	trip_walksafe = FALSE
+
+	trip_chance = 100
 
 
-/obj/item/weapon/grown/bananapeel/traitorpeel/Crossed(AM as mob|obj)
-	var/burned = rand(2,5)
-	if(istype(AM, /mob/living/carbon))
-		var/mob/living/carbon/M = AM
-		if(ishuman(M))
-			if(isobj(M:shoes))
-				if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP))
-					return
-			else
-				to_chat(M, "<span class='warning'>Your feet feel like they're on fire!</span>")
-				M.take_overall_damage(0, max(0, (burned - 2)))
-
-		if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
-			M.slip("banana peel!", 0, 7, 4)
-			M.take_organ_damage(2) // Was 5 -- TLE
-			M.take_overall_damage(0, burned)
+/obj/item/weapon/grown/bananapeel/traitorpeel/on_trip(mob/living/carbon/human/H)
+	. = ..()
+	if(.)
+		to_chat(H, "<span class='warning'>Your feet feel like they're on fire!</span>")
+		H.take_overall_damage(0, rand(2,8))
+		H.take_organ_damage(2) // Was 5 -- TLE
 
 /obj/item/weapon/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom)
 	var/burned = rand(1,3)

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

@@ -37,7 +37,7 @@
 			var/mob/living/carbon/human/H = M
 			var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
 			if(E)
-				E.damage += 8
+				E.take_damage(8, 1)
 
 	if(M.flash_eyes(affect_silicon = 1))
 		M.Stun(max(10/distance, 3))

code/game/objects/items/weapons/implants/health.dm

@@ -0,0 +1,11 @@
+/obj/item/weapon/implant/health
+	name = "health implant"
+	activated = FALSE
+	var/healthstring = ""
+
+/obj/item/weapon/implant/health/proc/sensehealth()
+	if(!imp_in)
+		return "ERROR"
+	else
+		healthstring = "[round(imp_in.getOxyLoss())] - [round(imp_in.getFireLoss())] - [round(imp_in.getToxLoss())] - [round(imp_in.getBruteLoss())]"
+	return healthstring

code/game/objects/items/weapons/implants/implantchair.dm

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/machinery/implantchair
 	name = "mindshield implanter"
 	desc = "Used to implant occupants with mindshield implants."

code/game/objects/items/weapons/implants/implantpad.dm

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/item/weapon/implantpad
 	name = "implantpad"
 	desc = "Used to modify implants."

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

@@ -1,12 +1,10 @@
-#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune))
-
 /obj/item/weapon/mop
 	desc = "The world of janitalia wouldn't be complete without a mop."
 	name = "mop"
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mop"
-	force = 3.0
-	throwforce = 5.0
+	force = 3
+	throwforce = 5
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
@@ -43,23 +41,25 @@
 		to_chat(user, "<span class='warning'>Your mop is dry!</span>")
 		return
 
-	var/turf/simulated/turf = A
-	if(is_cleanable(A))
-		turf = A.loc
-	A = null
+	var/turf/simulated/T = get_turf(A)
 
-	if(istype(turf))
-		user.visible_message("[user] begins to clean \the [turf] with [src].", "<span class='notice'>You begin to clean \the [turf] with [src]...</span>")
+	if(istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/janitorialcart))
+		return
 
-		if(do_after(user, src.mopspeed, target = turf))
+	if(istype(T))
+		user.visible_message("[user] begins to clean [T] with [src].", "<span class='notice'>You begin to clean [T] with [src]...</span>")
+
+		if(do_after(user, src.mopspeed, target = T))
 			to_chat(user, "<span class='notice'>You finish mopping.</span>")
-			clean(turf)
+			clean(T)
 
 
 /obj/effect/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
 		return
-	..()
+	else
+		return ..()
+
 
 /obj/item/weapon/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
 	J.put_in_cart(src, user)
@@ -75,22 +75,47 @@
 /obj/item/weapon/mop/advanced
 	desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
 	name = "advanced mop"
-	mopcap = 15
+	mopcap = 10
 	icon_state = "advmop"
-	item_state = "mop"	//meh will do for now until TG makes one
+	item_state = "mop"
 	origin_tech = "materials=3;engineering=3"
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 10
+	mopspeed = 20
+	var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water.
+	var/refill_rate = 1 //Rate per process() tick mop refills itself
+	var/refill_reagent = "water" //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING
+
+/obj/item/weapon/mop/advanced/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/item/weapon/mop/advanced/attack_self(mob/user)
+	refill_enabled = !refill_enabled
+	if(refill_enabled)
+		processing_objects.Add(src)
+	else
+		processing_objects.Remove(src)
+	to_chat(user, "<span class='notice'>You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.</span>")
+	playsound(user, 'sound/machines/click.ogg', 30, 1)
+
+/obj/item/weapon/mop/advanced/process()
+
+	if(reagents.total_volume < mopcap)
+		reagents.add_reagent(refill_reagent, refill_rate)
+
+/obj/item/weapon/mop/advanced/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>.</span>")
+
+/obj/item/weapon/mop/advanced/Destroy()
+	if(refill_enabled)
+		processing_objects.Remove(src)
+	return ..()
+
 
 /obj/item/weapon/mop/advanced/cyborg
-	mopcap = 40
 
-/obj/item/weapon/mop/advanced/cyborg/New()
-	..()
-	reagents.add_reagent("water", mopcap)
-
-/obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
-	..(user)
-	to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")
+/obj/item/weapon/mop/advanced/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+	return

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

@@ -38,14 +38,14 @@
 				for(var/i in facial_hair_styles_list)
 					var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
 					if(C.species.name in tmp_facial.species_allowed)  //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human hair styles.
-						if(C.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+						if(C.species.bodyflags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
 							if(robohead.is_monitor)
 								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
 								return
 							continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 						species_facial_hair += i
 					else
-						if(C.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+						if(C.species.bodyflags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
 							if(!robohead.is_monitor)
 								if("Human" in tmp_facial.species_allowed)
 									species_facial_hair += i
@@ -61,14 +61,14 @@
 			for(var/i in hair_styles_list)
 				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
 				if(C.species.name in tmp_hair.species_allowed) //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human facial hair styles.
-					if(C.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+					if(C.species.bodyflags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
 						if(robohead.is_monitor)
 							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
 							return
 						continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 					species_hair += i
 				else
-					if(C.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+					if(C.species.bodyflags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
 						if(!robohead.is_monitor)
 							if("Human" in tmp_hair.species_allowed)
 								species_hair += i
@@ -117,9 +117,8 @@
 				user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices their throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice their throat!</span>") //Just a little off the top.
 				H.AdjustLoseBreath(10) //30 Oxy damage over time
 				H.apply_damage(18, BRUTE, "head", sharp =1, used_weapon = "scissors")
-				var/turf/location = get_turf(H)
-				if(istype(location, /turf/simulated))
-					location.add_blood(H)
+				var/turf/location = get_turf(src)
+				H.add_splatter_floor(location)
 				H.bloody_hands(H)
 				H.bloody_body(H)
 				var/mob/living/carbon/human/U = user

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

@@ -9,8 +9,51 @@
 	throw_speed = 4
 	throw_range = 20
 	discrete = 1
+
+	trip_stun = 4
+	trip_weaken = 2
+	trip_chance = 100
+	trip_walksafe = FALSE
+	trip_verb = TV_SLIP
+
 	var/cleanspeed = 50 //slower than mop
 
+
+
+/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity)
+	if(!proximity) return
+	//I couldn't feasibly  fix the overlay bugs caused by cleaning items we are wearing.
+	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
+	if(user.client && (target in user.client.screen))
+		to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>")
+	else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target))
+		var/mob/living/carbon/human/muncher = user
+		if(muncher && muncher.get_species() == "Drask")
+			to_chat(user, "You take a bite of the [src.name]. Delicious!")
+			playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0)
+			user.nutrition += 2
+	else if(istype(target,/obj/effect/decal/cleanable))
+		user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
+		if(do_after(user, src.cleanspeed, target = target) && target)
+			to_chat(user, "<span class='notice'>You scrub \the [target.name] out.</span>")
+			qdel(target)
+	else
+		user.visible_message("<span class='warning'>[user] begins to clean \the [target.name] with [src].</span>")
+		if(do_after(user, src.cleanspeed, target = target))
+			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
+			var/obj/effect/decal/cleanable/C = locate() in target
+			qdel(C)
+			target.clean_blood()
+			if(istype(target, /turf/simulated))
+				var/turf/simulated/T = target
+				T.dirt = 0
+
+/obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob)
+	if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" )
+		user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with [src.name]!</span>")
+		return
+	..()
+
 /obj/item/weapon/soap/nanotrasen
 	desc = "A Nanotrasen brand bar of soap. Smells of plasma."
 	icon_state = "soapnt"
@@ -38,7 +81,7 @@
 			else if(istype(target,/mob/living/carbon))
 				for(var/obj/item/carried_item in target.contents)
 					if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant.
-						carried_item.add_blood(target)//Oh yes, there will be blood...
+						carried_item.add_mob_blood(target)//Oh yes, there will be blood...
 				var/mob/living/carbon/human/H = target
 				H.bloody_hands(target,0)
 				H.bloody_body(target)

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

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/item/weapon/storage/lockbox
 	name = "lockbox"
 	desc = "A locked box."

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

@@ -216,6 +216,14 @@
 	for(var/i = 0, i < storage_slots - 2, i++)
 		handle_item_insertion(new /obj/item/stack/spacecash/c1000, 1)
 
+/obj/item/weapon/storage/secure/briefcase/reaper/New()
+	..()
+	handle_item_insertion(new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow, 1)
+	handle_item_insertion(new /obj/item/weapon/gun/projectile/revolver/mateba, 1)
+	handle_item_insertion(new /obj/item/ammo_box/a357, 1)
+	handle_item_insertion(new /obj/item/weapon/grenade/plastic/c4, 1)
+
+
 // -----------------------------
 //        Secure Safe
 // -----------------------------

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

@@ -568,6 +568,8 @@
 	for(var/thing in data["content"])
 		if(islist(thing))
 			list_to_object(thing, src)
+		else if(thing == null)
+			log_runtime(EXCEPTION("Null entry found in storage/deserialize."), src)
 		else
 			log_runtime(EXCEPTION("Non-list thing found in storage/deserialize."), src, list("Thing: [thing]"))
 	..()

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/item/weapon/tank/jetpack
 	name = "Jetpack (Empty)"
 	desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
@@ -109,6 +107,14 @@
 	..()
 	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 
+/obj/item/weapon/tank/jetpack/oxygen/captain
+	name = "Captain's jetpack"
+	desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen."
+	icon_state = "jetpack-captain"
+	item_state = "jetpack-captain"
+	volume = 90
+	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/weapon/tank/jetpack/oxygen/harness
 	name = "jet harness (oxygen)"
 	desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."

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

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /* Tools!
  * Note: Multitools are /obj/item/device
  *

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

@@ -17,6 +17,7 @@
 	new /obj/item/clothing/mask/gas/clown_hat(src)
 	new /obj/item/weapon/bikehorn(src)
 	new /obj/item/weapon/reagent_containers/spray/waterflower(src)
+	new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana(src)
 	new /obj/item/toy/crayon/rainbow(src)
 	new /obj/item/seeds/banana(src)
 

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

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."

code/game/objects/structures/decor/decor.dm

@@ -0,0 +1,7 @@
+// The purpose of "Decor" structures is to look like pre-existing objects without having functionality
+
+/obj/structure/decor
+	name = "Non-existent Decor"
+	desc = "Yell at a coder!"
+	anchored = TRUE
+	density = TRUE

code/game/objects/structures/decor/machinery/telecomms.dm

@@ -0,0 +1,23 @@
+/obj/structure/decor/machinery/telecomms/processor
+	name = "Processor Unit"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "processor"
+	desc = "This machine is used to process large quantities of information."
+
+/obj/structure/decor/machinery/telecomms/hub
+	name = "Telecommunication Hub"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "hub"
+	desc = "A mighty piece of hardware used to send/receive massive amounts of data."
+
+/obj/structure/decor/machinery/telecomms/server
+	name = "Telecommunication Server"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "comm_server"
+	desc = "A machine used to store data and network statistics."
+
+/obj/structure/decor/machinery/telecomms/relay
+	name = "Telecommunication Relay"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "relay"
+	desc = "A mighty piece of hardware used to send massive amounts of data far away."

code/game/objects/structures/kitchen_spike.dm

@@ -82,9 +82,8 @@
 	playsound(loc, 'sound/effects/splat.ogg', 25, 1)
 	H.forceMove(loc)
 	H.emote("scream")
-	if(istype(H, /mob/living/carbon/human)) //So you don't get human blood when you spike a giant spidere
-		var/turf/simulated/pos = get_turf(H)
-		pos.add_blood_floor(H)
+	if(ishuman(H))
+		H.add_splatter_floor()
 	H.adjustBruteLoss(30)
 	H.buckled = src
 	H.dir = 2

code/game/objects/structures/musician.dm

@@ -1,14 +1,14 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /datum/song
 	var/name = "Untitled"
 	var/list/lines = new()
-	var/tempo = 5					// delay between notes
+	var/tempo = 5			// delay between notes
 
-	var/playing = 0					// if we're playing
-	var/help = 0					// if help is open
-	var/repeat = 0					// number of times remaining to repeat
-	var/max_repeat = 10				// maximum times we can repeat
+	var/playing = 0			// if we're playing
+	var/help = 0			// if help is open
+	var/repeat = 0			// number of times remaining to repeat
+	var/max_repeat = 10		// maximum times we can repeat
 
 	var/instrumentDir = "piano"		// the folder with the sounds
 	var/instrumentExt = "ogg"		// the file extension
@@ -26,7 +26,7 @@
 // note is a number from 1-7 for A-G
 // acc is either "b", "n", or "#"
 // oct is 1-8 (or 9 for C)
-/datum/song/proc/playnote(var/note, var/acc as text, var/oct)
+/datum/song/proc/playnote(note, acc as text, oct)
 	// handle accidental -> B<>C of E<>F
 	if(acc == "b" && (note == 3 || note == 6)) // C or F
 		if(note == 3)
@@ -70,7 +70,7 @@
 	else
 		return 1
 
-/datum/song/proc/playsong(mob/user as mob)
+/datum/song/proc/playsong(mob/user)
 	while(repeat >= 0)
 		var/cur_oct[7]
 		var/cur_acc[7]
@@ -79,18 +79,14 @@
 			cur_acc[i] = "n"
 
 		for(var/line in lines)
-//			to_chat(world, line)
 			for(var/beat in splittext(lowertext(line), ","))
-//				to_chat(world, "beat: [beat]")
 				var/list/notes = splittext(beat, "/")
 				for(var/note in splittext(notes[1], "-"))
-//					to_chat(world, "note: [note]")
-					if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case
+					if(!playing || shouldStopPlaying(user)) //If the instrument is playing, or special case
 						playing = 0
 						return
 					if(lentext(note) == 0)
 						continue
-//					to_chat(world, "Parse: [copytext(note,1,2)]")
 					var/cur_note = text2ascii(note) - 96
 					if(cur_note < 1 || cur_note > 7)
 						continue
@@ -244,6 +240,7 @@
 		playing = 0
 
 /datum/song/proc/sanitize_tempo(new_tempo)
+	new_tempo = abs(new_tempo)
 	return max(round(new_tempo, world.tick_lag), world.tick_lag)
 
 // subclass for handheld instruments, like violin
@@ -269,6 +266,7 @@
 
 
 /obj/structure/piano/New()
+	..()
 	song = new("piano", src)
 
 	if(prob(50))
@@ -304,7 +302,7 @@
 	song.Topic(href, href_list)
 
 /obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob, params)
-	if(istype(O, /obj/item/weapon/wrench))
+	if(iswrench(O))
 		if(!anchored && !isinspace())
 			playsound(src.loc, O.usesound, 50, 1)
 			to_chat(user, "<span class='notice'> You begin to tighten \the [src] to the floor...</span>")
@@ -324,4 +322,4 @@
 					"You hear ratchet.")
 				anchored = 0
 	else
-		..()
+		return ..()

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

@@ -41,12 +41,12 @@
 			var/mob/living/carbon/human/driver = user
 			var/obj/item/organ/external/l_hand = driver.get_organ("l_hand")
 			var/obj/item/organ/external/r_hand = driver.get_organ("r_hand")
-			if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED)))
+			if(!l_hand && !r_hand)
 				return 0 // No hands to drive your chair? Tough luck!
 
 			for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
 				var/obj/item/organ/external/E = driver.get_organ(organ_name)
-				if(!E || (E.status & ORGAN_DESTROYED))
+				if(!E)
 					calculated_move_delay += 4
 				else if(E.status & ORGAN_SPLINTED)
 					calculated_move_delay += 0.5
@@ -129,12 +129,12 @@
 			var/mob/living/carbon/human/driver = user
 			var/obj/item/organ/external/l_hand = driver.get_organ("l_hand")
 			var/obj/item/organ/external/r_hand = driver.get_organ("r_hand")
-			if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED)))
+			if(!l_hand && !r_hand)
 				calculated_move_delay += 0.5	//I can ride my bike with no handlebars... (but it's slower)
 
 			for(var/organ_name in list("l_leg","r_leg","l_foot","r_foot"))
 				var/obj/item/organ/external/E = driver.get_organ(organ_name)
-				if(!E || (E.status & ORGAN_DESTROYED))
+				if(!E)
 					return 0	//Bikes need both feet/legs to work. missing even one makes it so you can't ride the bike
 				else if(E.status & ORGAN_SPLINTED)
 					calculated_move_delay += 0.5