Merge pull request #8288 from mwerezak/topicfix

Topic Fixes
This commit is contained in:
Zuhayr
2015-02-26 16:28:56 +10:30
40 changed files with 43 additions and 42 deletions

View File

@@ -302,6 +302,7 @@ update_flag
/obj/machinery/portable_atmospherics/canister/Topic(href, href_list)
//Do not use "if(..()) return" here, canisters will stop working in unpowered areas like space or on the derelict. // yeah but without SOME sort of Topic check any dick can mess with them via exploits as he pleases -walter0o
//First comment might be outdated.
if (!istype(src.loc, /turf))
return 0

View File

@@ -110,7 +110,7 @@
onclose(user, "lockdown")
Topic(href, href_list)
..()
if(..()) return 1
if( href_list["close"] )
usr << browse(null, "window=lockdown")

View File

@@ -148,7 +148,7 @@
/obj/machinery/computer/med_data/Topic(href, href_list)
if(..())
return
return 1
if (!( data_core.general.Find(src.active1) ))
src.active1 = null

View File

@@ -158,7 +158,7 @@
/obj/machinery/computer/pod/Topic(href, href_list)
if(..())
return
return 1
if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
if(href_list["power"])