cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed checking for assassination targets. It checked for them on 8 or higher, the away mission Z is 7.

Browse Source 
A number of computers no longer work on Z7 (away mission).

-AI upload
-Security cameras
-Crew monitoring computer
-Comms console
-Robotics console
-Security records

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4699 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Kortgstation@gmail.com
2012-09-16 04:36:58 +00:00
parent 91b8ea22d5
commit d85e161c4d
7 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/objective.dm
View File

@@ -51,7 +51,7 @@ datum/objective/assassinate
check_completion() check_completion()
if(target && target.current) if(target && target.current)
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 7) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1 return 1
return 0 return 0
return 1 return 1

3
code/game/machinery/computer/camera.dm
View File

@@ -28,6 +28,9 @@
attack_hand(var/mob/user as mob) attack_hand(var/mob/user as mob)
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
if(stat & (NOPOWER|BROKEN)) return if(stat & (NOPOWER|BROKEN)) return
if(!isAI(user)) if(!isAI(user))

6
code/game/machinery/computer/communications.dm
View File

@@ -43,6 +43,9 @@
/obj/machinery/computer/communications/Topic(href, href_list) /obj/machinery/computer/communications/Topic(href, href_list)
if(..()) if(..())
return return
if (src.z > 6)
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
usr.machine = src usr.machine = src
if(!href_list["operation"]) if(!href_list["operation"])
@@ -274,6 +277,9 @@
/obj/machinery/computer/communications/attack_hand(var/mob/user as mob) /obj/machinery/computer/communications/attack_hand(var/mob/user as mob)
if(..()) if(..())
return return
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
user.machine = src user.machine = src
var/dat = "<head><title>Communications Console</title></head><body>" var/dat = "<head><title>Communications Console</title></head><body>"

3
code/game/machinery/computer/crew.dm
View File

@@ -41,6 +41,9 @@
Topic(href, href_list) Topic(href, href_list)
if(..()) return if(..()) return
if (src.z > 6)
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
if( href_list["close"] ) if( href_list["close"] )
usr << browse(null, "window=crewcomp") usr << browse(null, "window=crewcomp")
usr.machine = null usr.machine = null

3
code/game/machinery/computer/law.dm
View File

@@ -25,6 +25,9 @@
attackby(obj/item/weapon/O as obj, mob/user as mob) attackby(obj/item/weapon/O as obj, mob/user as mob)
if (user.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
if(istype(O, /obj/item/weapon/aiModule)) if(istype(O, /obj/item/weapon/aiModule))
var/obj/item/weapon/aiModule/M = O var/obj/item/weapon/aiModule/M = O
M.install(src) M.install(src)

3
code/game/machinery/computer/robot.dm
View File

@@ -28,6 +28,9 @@
/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob) /obj/machinery/computer/robotics/attack_hand(var/mob/user as mob)
if(..()) if(..())
return return
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
user.machine = src user.machine = src
var/dat var/dat
if (src.temp) if (src.temp)

3
code/game/machinery/computer/security.dm
View File

@@ -41,6 +41,9 @@
/obj/machinery/computer/secure_data/attack_hand(mob/user as mob) /obj/machinery/computer/secure_data/attack_hand(mob/user as mob)
if(..()) if(..())
return return
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return
var/dat var/dat
if (temp) if (temp)