Merge remote-tracking branch 'bay12-upstream/master' into development

code/game/objects/objs.dm

@@ -1,10 +1,8 @@
 /obj
 	//Used to store information about the contents of the object.
 	var/list/matter
-
-	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
-	var/reliability = 100	//Used by SOME devices to determine how reliable they are.
-	var/crit_fail = 0
+	var/w_class // Size of the object.
+	var/list/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
 	var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
 	animate_movement = 2
 	var/throwforce = 1
@@ -12,20 +10,18 @@
 	var/sharp = 0		// whether this object cuts
 	var/edge = 0		// whether this object is more likely to dismember
 	var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
-
 	var/damtype = "brute"
 	var/force = 0
+	var/armor_penetration = 0
 
 	var/being_shocked = 0
 
 /obj/Destroy()
 	processing_objects -= src
-	nanomanager.close_uis(src)
 	return ..()
 
-/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state)
-	// Calling Topic without a corresponding window open causes runtime errors
-	if(!nowindow && ..())
+/obj/Topic(href, href_list, var/datum/topic_state/state = default_state)
+	if(..())
 		return 1
 
 	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
@@ -37,9 +33,33 @@
 	CouldNotUseTopic(usr)
 	return 1
 
+/obj/CanUseTopic(var/mob/user, var/datum/topic_state/state)
+	if(user.CanUseObjTopic(src))
+		return ..()
+	user << "<span class='danger'>\icon[src]Access Denied!</span>"
+	return STATUS_CLOSE
+
+/mob/living/silicon/CanUseObjTopic(var/obj/O)
+	var/id = src.GetIdCard()
+	return O.check_access(id)
+
+/mob/proc/CanUseObjTopic()
+	return 1
+
 /obj/proc/CouldUseTopic(var/mob/user)
-	var/atom/host = nano_host()
-	host.add_fingerprint(user)
+	user.AddTopicPrint(src)
+
+/mob/proc/AddTopicPrint(var/obj/target)
+	target.add_hiddenprint(src)
+
+/mob/living/AddTopicPrint(var/obj/target)
+	if(Adjacent(target))
+		target.add_fingerprint(src)
+	else
+		target.add_hiddenprint(src)
+
+/mob/living/silicon/ai/AddTopicPrint(var/obj/target)
+	target.add_hiddenprint(src)
 
 /obj/proc/CouldNotUseTopic(var/mob/user)
 	// Nada
@@ -106,6 +126,10 @@
 		if(!ai_in_use && !is_in_use)
 			in_use = 0
 
+/obj/attack_ghost(mob/user)
+	ui_interact(user)
+	..()
+
 /obj/proc/interact(mob/user)
 	return
 
@@ -127,13 +151,11 @@
 	if(istype(M) && M.client && M.machine == src)
 		src.attack_self(M)
 
+/obj/proc/hide(var/hide)
+	invisibility = hide ? INVISIBILITY_MAXIMUM : initial(invisibility)
 
-/obj/proc/alter_health()
-	return 1
-
-/obj/proc/hide(h)
-	return
-
+/obj/proc/hides_under_flooring()
+	return level == 1
 
 /obj/proc/hear_talk(mob/M as mob, text, verb, datum/language/speaking)
 	if(talking_atom)
@@ -155,3 +177,6 @@
 	tesla_zap(src, 5, power_bounced)
 	spawn(10)
 		being_shocked = 0
+
+/obj/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
+	return