Merge pull request #8840 from PsiOmegaDelta/NanoI

Fixes NanoUI interaction.
This commit is contained in:
Chinsky
2015-04-15 02:12:12 +03:00
5 changed files with 5 additions and 5 deletions

View File

@@ -627,7 +627,7 @@ About the new airlock wires panel:
user << "<span class='warning'>Unable to interface: Connection refused.</span>"
return STATUS_CLOSE
return STATUS_INTERACTIVE
return ..()
/obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0)
if(..())

View File

@@ -214,7 +214,7 @@
usr << "<span class='notice'>\The [src] has to be secured first!</span>"
return STATUS_CLOSE
return STATUS_INTERACTIVE
return ..()
/obj/machinery/porta_turret/Topic(href, href_list, var/nowindow = 0)

View File

@@ -79,7 +79,7 @@
if(isLocked(user))
return STATUS_CLOSE
return STATUS_INTERACTIVE
return ..()
/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user)
if(stat & BROKEN)

View File

@@ -9,7 +9,7 @@
return list()
/datum/topic_state/proc/can_use_topic(var/src_object, var/mob/user)
return STATUS_INTERACTIVE
return STATUS_CLOSE
/mob/proc/shared_nano_interaction()
if (src.stat || !client)

View File

@@ -1,4 +1,4 @@
/var/global/datum/topic_state/default_state = new()
/var/global/datum/topic_state/default/default_state = new()
/datum/topic_state/default/href_list(var/mob/user)
return list()