Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/defines/obj.dm

@@ -88,7 +88,7 @@
 
 /obj/structure/bedsheetbin
 	name = "linen bin"
-	desc = "A bin for containing bedsheets. It looks rather cosy."
+	desc = "A small wire mesh bin full of extra bedsheets and cleaning supplies for the beds.  Smells of lilacs and has a faint undertone of disinfectant."
 	icon = 'items.dmi'
 	icon_state = "bedbin"
 	var/amount = 23.0
@@ -232,7 +232,7 @@
 	var/mob/living/carbon/monkey/target = null
 
 /obj/effect/sign/securearea
-	desc = "A warning sign which reads 'SECURE AREA'"
+	desc = "A large yellow warning sign which reads 'SECURE AREA', it appears to have been painted onto the wall like that."
 	name = "SECURE AREA"
 	icon = 'decals.dmi'
 	icon_state = "securearea"
@@ -250,7 +250,7 @@
 	density = 0
 
 /obj/effect/sign/biohazard
-	desc = "A warning sign which reads 'BIOHAZARD'"
+	desc = "A warning sign which reads 'BIOHAZARD', you think it'd be a good idea to ensure you have a properly sealed hazardsuit on."
 	name = "BIOHAZARD"
 	icon = 'decals.dmi'
 	icon_state = "bio"
@@ -259,7 +259,7 @@
 	density = 0
 
 /obj/effect/sign/electricshock
-	desc = "A warning sign which reads 'HIGH VOLTAGE'"
+	desc = "A warning sign which reads 'HIGH VOLTAGE', it looks like it'd be a wise decision to stay away from here."
 	name = "HIGH VOLTAGE"
 	icon = 'decals.dmi'
 	icon_state = "shock"

code/defines/obj/machinery.dm

@@ -225,38 +225,6 @@
 	idle_power_usage = 10
 	active_power_usage = 400
 
-/obj/machinery/door_control
-	name = "remote door-control"
-	desc = "It controls doors, remotely."
-	icon = 'stationobjs.dmi'
-	icon_state = "doorctrl0"
-	desc = "A remote control-switch for a door."
-	var/id = null
-	var/range = 10
-	var/normaldoorcontrol = 0
-	var/desiredstate = 0 // Zero is closed, 1 is open.
-	var/specialfunctions = 1
-	/*
-	Bitflag, 	1= open
-				2= idscan,
-				4= bolts
-				8= shock
-				16= door safties
-
-	*/
-
-	var/exposedwires = 0
-	var/wires = 3
-	/*
-	Bitflag,	1=checkID
-				2=Network Access
-	*/
-
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
 /obj/machinery/driver_button
 	name = "mass driver button"
 	icon = 'objects.dmi'

code/defines/procs/helpers.dm

@@ -838,6 +838,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	var/list/names = list()
 	var/list/creatures = list()
 	var/list/namecounts = list()
+
 	for(var/mob/M in mobs)
 		var/name = M.name
 		if (name in names)
@@ -846,13 +847,16 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		else
 			names.Add(name)
 			namecounts[name] = 1
+
 		if (M.real_name && M.real_name != M.name)
 			name += " \[[M.original_name? M.original_name : M.real_name]\]"
+
 		if (M.stat == 2)
 			if(istype(M, /mob/dead/observer/))
 				name += " \[ghost\]"
 			else
 				name += " \[dead\]"
+
 		creatures[name] = M
 
 	return creatures