cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8839 from PsiOmegaDelta/PAPs

Browse Source 
Camera network refactor - Part 3 - Final
This commit is contained in:
Chinsky
2015-04-14 16:32:14 +03:00
parent 03b85a5cb4 0466a1f47a
commit a601c50f08
11 changed files with 751 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/area/Space Station 13 areas.dm
View File

@@ -1754,7 +1754,7 @@ area/space/atmosalert()
//Construction
/area/construction
name = "\improper Construction Area"
name = "\improper Engineering Construction Area"
icon_state = "yellow"
/area/construction/supplyshuttle

2
code/game/machinery/camera/camera.dm
View File

@@ -8,7 +8,7 @@
active_power_usage = 10
layer = 5
var/list/network = list("SS13")
var/list/network = list("Exodus")
var/c_tag = null
var/c_tag_order = 999
var/status = 1

2
code/game/machinery/camera/camera_assembly.dm
View File

@@ -78,7 +78,7 @@
if(isscrewdriver(W))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13"))
var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: Exodus,Security,Secret ", "Set Network", "Exodus"))
if(!input)
usr << "No input found please hang up and try your call again."
return

91
code/game/machinery/camera/presets.dm
View File

@@ -1,20 +1,33 @@
// PRESETS
#define NETWORK_CRESCENT "Crescent"
#define NETWORK_CIVILIAN_EAST "Civilian East"
#define NETWORK_CIVILIAN_WEST "Civilian West"
#define NETWORK_COMMAND "Command"
#define NETWORK_ENGINE "Engine"
#define NETWORK_ENGINEERING "Engineering"
#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
#define NETWORK_ERT "ERT"
#define NETWORK_EXODUS "Exodus"
#define NETWORK_MEDBAY "Medbay"
#define NETWORK_MINE "MINE"
#define NETWORK_RESEARCH "Research"
#define NETWORK_RESEARCH_OUTPOST "Research Outpost"
#define NETWORK_PRISON "Prison"
#define NETWORK_SECURITY "Security"
#define NETWORK_TELECOM "Tcomsat"
#define NETWORK_THUNDER "thunder"
var/global/list/station_networks = list(
"SS13",
NETWORK_CIVILIAN_EAST,
NETWORK_CIVILIAN_WEST,
NETWORK_COMMAND,
NETWORK_ENGINE,
NETWORK_ENGINEERING,
NETWORK_ENGINEERING_OUTPOST,
NETWORK_EXODUS,
NETWORK_MEDBAY,
NETWORK_MINE,
NETWORK_RESEARCH,
NETWORK_RESEARCH_OUTPOST,
NETWORK_PRISON,
NETWORK_SECURITY
@@ -26,10 +39,18 @@ var/global/list/engineering_networks = list(
"Atmosphere Alarms",
"Fire Alarms",
"Power Alarms")
/obj/machinery/camera/network/crescent
network = list(NETWORK_CRESCENT)
/obj/machinery/camera/network/civilian_east
network = list(NETWORK_CIVILIAN_EAST)
/obj/machinery/camera/network/civilian_west
network = list(NETWORK_CIVILIAN_WEST)
/obj/machinery/camera/network/command
network = list(NETWORK_COMMAND)
/obj/machinery/camera/network/engine
network = list(NETWORK_ENGINE)
@@ -39,12 +60,36 @@ var/global/list/engineering_networks = list(
/obj/machinery/camera/network/engineering_outpost
network = list(NETWORK_ENGINEERING_OUTPOST)
/obj/machinery/camera/network/ert
network = list(NETWORK_ERT)
/obj/machinery/camera/network/exodus
network = list(NETWORK_EXODUS)
/obj/machinery/camera/network/mining
network = list(NETWORK_MINE)
/obj/machinery/camera/network/prison
network = list(NETWORK_PRISON)
/obj/machinery/camera/network/medbay
network = list(NETWORK_MEDBAY)
/obj/machinery/camera/network/research
network = list(NETWORK_RESEARCH)
/obj/machinery/camera/network/research_outpost
network = list(NETWORK_RESEARCH_OUTPOST)
/obj/machinery/camera/network/security
network = list(NETWORK_SECURITY)
/obj/machinery/camera/network/telecom
network = list(NETWORK_TELECOM)
/obj/machinery/camera/network/thunder
network = list(NETWORK_THUNDER)
// EMP
/obj/machinery/camera/emp_proof/New()
@@ -56,6 +101,15 @@ var/global/list/engineering_networks = list(
/obj/machinery/camera/xray
icon_state = "xraycam" // Thanks to Krutchen for the icons.
/obj/machinery/camera/xray/security
network = list(NETWORK_SECURITY)
/obj/machinery/camera/xray/medbay
network = list(NETWORK_MEDBAY)
/obj/machinery/camera/xray/research
network = list(NETWORK_RESEARCH)
/obj/machinery/camera/xray/New()
..()
upgradeXRay()
@@ -68,6 +122,10 @@ var/global/list/engineering_networks = list(
// ALL UPGRADES
/obj/machinery/camera/all/command
network = list(NETWORK_COMMAND)
/obj/machinery/camera/all/New()
..()
upgradeEmpProof()
@@ -75,28 +133,6 @@ var/global/list/engineering_networks = list(
upgradeMotion()
// AUTONAME
/obj/machinery/camera/autoname/civilian_west
network = list(NETWORK_CIVILIAN_WEST)
/obj/machinery/camera/autoname/engine
network = list(NETWORK_ENGINE)
/obj/machinery/camera/autoname/engineering
network = list(NETWORK_ENGINEERING)
/obj/machinery/camera/autoname/engineering_outpost
network = list(NETWORK_ENGINEERING_OUTPOST)
/obj/machinery/camera/autoname/mining_outpost
network = list(NETWORK_MINE)
/obj/machinery/camera/autoname/research_outpost
network = list(NETWORK_RESEARCH_OUTPOST)
/obj/machinery/camera/autoname/security
network = list(NETWORK_SECURITY)
/obj/machinery/camera/autoname
var/number = 0 //camera number in area
@@ -156,11 +192,20 @@ var/global/list/engineering_networks = list(
mult++
active_power_usage = mult*initial(active_power_usage)
#undef NETWORK_CENTRAL_CRESCENT
#undef NETWORK_CIVILIAN_EAST
#undef NETWORK_CIVILIAN_WEST
#undef NETWORK_COMMAND
#undef NETWORK_ENGINE
#undef NETWORK_ENGINEERING
#undef NETWORK_ENGINEERING_OUTPOST
#undef NETWORK_ERT
#undef NETWORK_EXODUS
#undef NETWORK_MEDBAY
#undef NETWORK_MINE
#undef NETWORK_RESEARCH
#undef NETWORK_RESEARCH_OUTPOST
#undef NETWORK_PRISON
#undef NETWORK_SECURITY
#undef NETWORK_TELECOM
#undef NETWORK_THUNDER

6
code/game/machinery/camera/tracking.dm
View File

@@ -15,7 +15,6 @@
cameranet.process_sort()
var/list/T = list()
T["Cancel"] = "Cancel"
for (var/obj/machinery/camera/C in cameranet.cameras)
var/list/tempnetwork = C.network&src.network
if (tempnetwork.len)
@@ -30,11 +29,10 @@
set category = "AI Commands"
set name = "Show Camera List"
if(src.stat == 2)
src << "You can't list the cameras because you are dead!"
if(check_unable())
return
if (!camera || camera == "Cancel")
if (!camera)
return 0
var/obj/machinery/camera/C = track.cameras[camera]

4
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -46,7 +46,7 @@ var/list/ai_verbs_default = list(
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
shouldnt_see = list(/obj/effect/rune)
var/list/network = list("SS13")
var/list/network = list("Exodus")
var/obj/machinery/camera/camera = null
var/list/connected_robots = list()
var/aiRestorePowerRoutine = 0
@@ -530,6 +530,8 @@ var/list/ai_verbs_default = list(
view_core()
return
src.network = network
for(var/obj/machinery/camera/C in cameranet.cameras)
if(!C.can_use())
continue