cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8703 from PsiOmegaDelta/Map

Browse Source 
Area/Camera network refactor - Part 1
This commit is contained in:
Chinsky
2015-04-07 21:41:06 +03:00
parent d6aaff7837 75757a48f6
commit 175fdf57e6
5 changed files with 253 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space Station 13 areas.dm
+8 -8
View File
@@ -1362,35 +1362,35 @@ area/space/atmosalert()
icon_state = "security"
/area/security/lobby
name = "\improper Security lobby"
name = "\improper Security Lobby"
icon_state = "security"
/area/security/brig
name = "\improper Brig"
name = "\improper Security - Brig"
icon_state = "brig"
/area/security/prison
name = "\improper Prison Wing"
name = "\improper Security - Prison Wing"
icon_state = "sec_prison"
/area/security/warden
name = "\improper Warden"
name = "\improper Security - Warden's Office"
icon_state = "Warden"
/area/security/armoury
name = "\improper Armory"
name = "\improper Security - Armory"
icon_state = "Warden"
/area/security/detectives_office
name = "\improper Detective's Office"
name = "\improper Security - Forensic Office"
icon_state = "detective"
/area/security/range
name = "\improper Firing Range"
name = "\improper Security - Firing Range"
icon_state = "firingrange"
/area/security/tactical
name = "\improper Tactical Equipment"
name = "\improper Security - Tactical Equipment"
icon_state = "Tactical"
code/game/machinery/camera/presets.dm
+13 -3
View File
@@ -1,4 +1,11 @@
// PRESETS
var/global/list/station_networks = list("SS13","Engineering Outpost","MINE","Research Outpost","Prison","Security")
/obj/machinery/camera/network/prison
network = list("Prison")
/obj/machinery/camera/network/security
network = list("Security")
// EMP
@@ -32,13 +39,16 @@
// AUTONAME
/obj/machinery/camera/autoname/engineering_outpost
network = list("SS13", "Engineering Outpost")
network = list("Engineering Outpost")
/obj/machinery/camera/autoname/mining_outpost
network = list("SS13", "MINE")
network = list("MINE")
/obj/machinery/camera/autoname/research_outpost
network = list("SS13", "Research Outpost")
network = list("Research Outpost")
/obj/machinery/camera/autoname/security
network = list("Security")
/obj/machinery/camera/autoname
var/number = 0 //camera number in area
code/game/machinery/computer/camera.dm
+7 -2
View File
@@ -12,11 +12,16 @@
icon_state = "cameras"
var/obj/machinery/camera/current = null
var/last_pic = 1.0
var/list/network = list("SS13")
var/list/network
var/mapping = 0//For the overview file, interesting bit of code.
circuit = /obj/item/weapon/circuitboard/security
var/camera_cache = null
New()
if(!network)
network = station_networks
..()
attack_ai(var/mob/user as mob)
return attack_hand(user)
@@ -235,7 +240,7 @@
name = "engineering camera monitor"
desc = "Used to monitor fires and breaches."
icon_state = "engineeringcameras"
network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
network = list("Engineering","Engineering Outpost","Power Alarms","Atmosphere Alarms","Fire Alarms")
circuit = /obj/item/weapon/circuitboard/security/engineering
/obj/machinery/computer/security/nuclear