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

Merge pull request #8778 from PsiOmegaDelta/CivilianWest

Browse Source 
Area/Camera network refactor - Part 2
This commit is contained in:
Chinsky
2015-04-10 12:28:33 +03:00
parent e6f83f8fa2 b52e3168c2
commit 05da117d10
3 changed files with 173 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1420,7 +1420,7 @@ area/space/atmosalert()
icon_state = "checkpoint1"
/area/security/checkpoint2
name = "\improper Security Checkpoint"
name = "\improper Security - Arrival Checkpoint"
icon_state = "security"
/area/security/checkpoint/supply
@@ -1451,14 +1451,6 @@ area/space/atmosalert()
name = "\improper Quartermasters"
icon_state = "quart"
///////////WORK IN PROGRESS//////////
/area/quartermaster/sorting
name = "\improper Delivery Office"
icon_state = "quartstorage"
////////////WORK IN PROGRESS//////////
/area/quartermaster/office
name = "\improper Cargo Office"
icon_state = "quartoffice"
@@ -1468,21 +1460,13 @@ area/space/atmosalert()
icon_state = "quartstorage"
/area/quartermaster/qm
name = "\improper Quartermaster's Office"
name = "\improper Cargo - Quartermaster's Office"
icon_state = "quart"
/area/quartermaster/miningdock
name = "\improper Mining Dock"
name = "\improper Cargo Mining Dock"
icon_state = "mining"
/area/quartermaster/miningstorage
name = "\improper Mining Storage"
icon_state = "green"
/area/quartermaster/mechbay
name = "\improper Mech Bay"
icon_state = "yellow"
/area/janitor/
name = "\improper Custodial Closet"
icon_state = "janitor"

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

@@ -1,5 +1,8 @@
// PRESETS
var/global/list/station_networks = list("SS13","Engineering Outpost","MINE","Research Outpost","Prison","Security")
var/global/list/station_networks = list("SS13","Civilian West","Engineering Outpost","MINE","Research Outpost","Prison","Security")
/obj/machinery/camera/network/civilian_west
network = list("Civilian West")
/obj/machinery/camera/network/prison
network = list("Prison")
@@ -38,6 +41,9 @@ var/global/list/station_networks = list("SS13","Engineering Outpost","MINE","Res
// AUTONAME
/obj/machinery/camera/autoname/civilian_west
network = list("Civilian West")
/obj/machinery/camera/autoname/engineering_outpost
network = list("Engineering Outpost")