Merging robot_modules.dm and master controller setup.

This commit is contained in:
Zuhayr
2014-07-14 09:10:02 +09:30
42 changed files with 417 additions and 177 deletions

View File

@@ -75,6 +75,15 @@
set name = "Reset Computer"
set category = "Object"
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
return
if(!Adjacent(usr))
usr << "You can't reach it."
return
Reset()
New(var/L, var/built = 0)
@@ -446,4 +455,4 @@
icon_state = "wallframe"
density = 0
pixel_y = -3
show_keyboard = 0
show_keyboard = 0

View File

@@ -13,7 +13,7 @@
set category = "Object"
set name = "Access Computer's Internals"
set src in oview(1)
if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon))
if(!Adjacent(usr) || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon) || !istype(usr, /mob/living))
return
opened = !opened

View File

@@ -33,7 +33,15 @@
set name = "open laptop"
set category = "Object"
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
return
if(!Adjacent(usr))
usr << "You can't reach it."
return
if(!istype(loc,/turf))
usr << "[src] is too bulky! You'll have to set it down."
return
@@ -58,7 +66,8 @@
del src
AltClick()
open_computer()
if(Adjacent(usr))
open_computer()
/obj/machinery/computer3/laptop
name = "Laptop Computer"
@@ -81,7 +90,15 @@
set name = "Close Laptop"
set category = "Object"
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
return
if(!Adjacent(usr))
usr << "You can't reach it."
return
if(istype(loc,/obj/item/device/laptop))
testing("Close closed computer")
return
@@ -133,5 +150,5 @@
AltClick()
close_computer()
if(Adjacent(usr))
close_computer()