cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7888 from PsiOmegaDelta/MoreGun

Browse Source 
Fixes  #7879.
This commit is contained in:
Zuhayr
2015-01-20 22:09:23 +10:30
parent b1ba9a6d0e b3e367c778
commit c58b2860d4
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,6 +154,12 @@
user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
return 0
if (get_dist(src, user) > 0 && !issilicon(user))
user << "<span class='notice'>You are too far away.</span>"
user.unset_machine()
user << browse(null, "window=turretid")
return 0
if(locked && !issilicon(user))
user << "<span class='notice'>Access denied.</span>"
return 0
@@ -175,7 +181,6 @@
<TT><B>Automatic Portable Turret Installation</B></TT><BR><BR>
Status: []<BR>
Behaviour controls are [locked ? "locked" : "unlocked"]"},
"<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>" )
if(!locked || issilicon(user))

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

@@ -66,15 +66,20 @@
return
/obj/machinery/turretid/proc/can_use(mob/user)
if(ailock && issilicon(user))
user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
return 0
if (get_dist(src, user) > 0 && !issilicon(user))
user << "<span class='notice'>You are too far away.</span>"
user.unset_machine()
user << browse(null, "window=turretid")
return 0
if(ailock && issilicon(user))
user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
if(locked && !issilicon(user))
user << "<span class='notice'>Access denied.</span>"
return 0
return 1
/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user)
@@ -124,7 +129,9 @@
if (!istype(loc, /area))
return
var/area/area = loc
var/dat = ""
var/dat = text({"Status: []<BR>
Behaviour controls are [locked ? "locked" : "unlocked"]"},
"<A href='?src=\ref[src];operation=toggleon'>[enabled ? "On" : "Off"]</A>" )
if(!locked || issilicon(user))
dat += text({"<BR><BR>