cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8840 from PsiOmegaDelta/NanoI

Browse Source 
Fixes NanoUI interaction.
This commit is contained in:
Chinsky
2015-04-15 02:12:12 +03:00
parent 7848a1c300 aa5d5d5256
commit b94366067a
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/doors/airlock.dm
View File

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

2
code/game/machinery/portable_turret.dm
View File

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

2
code/game/machinery/turret_control.dm
View File

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

2
code/modules/nano/interaction/base.dm
View File

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

2
code/modules/nano/interaction/default.dm
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) /datum/topic_state/default/href_list(var/mob/user)
return list() return list()