From 269253d5d28400db34b603a19ee9f2dbe595ebce Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 23 Nov 2014 08:23:52 +0100
Subject: [PATCH] SyndiBorg flash removed, CentCom access update

---
 code/game/jobs/access.dm                             | 12 +++++++++++-
 .../mob/living/silicon/robot/robot_modules.dm        |  4 ++--
 nano/debug.html                                      |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index c3757b65b6d..7d9f591c0d9 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -200,6 +200,10 @@
 			return list(access_cent_general, access_cent_living, access_cent_storage)
 		if("Thunderdome Overseer")
 			return list(access_cent_general, access_cent_thunder)
+		if("Emergency Response Team")
+			return list(access_cent_general, access_cent_living, access_cent_storage)
+		if("Emergency Response Team Leader")
+			return list(access_cent_general, access_cent_living, access_cent_storage, access_cent_teleporter)
 		if("Intel Officer")
 			return list(access_cent_general, access_cent_living)
 		if("Medical Officer")
@@ -210,6 +214,12 @@
 			return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage)
 		if("BlackOps Commander")
 			return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed)
+		if("Special Operations Officer")
+			return get_all_centcom_access()
+		if("NanoTrasen Navy Officer")
+			return get_all_centcom_access()
+		if("NanoTrasen Navy Captain")
+			return get_all_centcom_access()
 		if("Supreme Commander")
 			return get_all_centcom_access()
 
@@ -447,7 +457,7 @@
 	return all_jobs
 
 /proc/get_all_centcom_jobs()
-	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander","Emergency Response Team","Emergency Response Team Leader")
+	return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Special Operations Officer","NanoTrasen Navy Officer","NanoTrasen Navy Captain","Supreme Commander")
 
 //gets the actual job rank (ignoring alt titles)
 //this is used solely for sechuds
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 408a0316ced..0a122762b20 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -332,14 +332,14 @@
 	name = "syndicate robot module"
 
 /obj/item/weapon/robot_module/syndicate/New()
-	..()
+	src.modules += new /obj/item/device/flashlight(src)
 	src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
 	src.modules += new /obj/item/weapon/gun/energy/crossbow/cyborg(src)
 	src.modules += new /obj/item/weapon/card/emag(src)
 	src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src)
 	src.modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
-	emag = null
+	src.emag = null
 	return
 
 /obj/item/weapon/robot_module/combat
diff --git a/nano/debug.html b/nano/debug.html
index 988be0d012f..39f94c115fb 100644
--- a/nano/debug.html
+++ b/nano/debug.html
@@ -16,7 +16,7 @@
 		</script>
 		<script type='text/javascript' src='libraries.min.js'></script> <script type='text/javascript' src='nano_utility.js'></script> <script type='text/javascript' src='nano_template.js'></script> <script type='text/javascript' src='nano_state_manager.js'></script> <script type='text/javascript' src='nano_state.js'></script> <script type='text/javascript' src='nano_state_default.js'></script> <script type='text/javascript' src='nano_base_callbacks.js'></script> <script type='text/javascript' src='nano_base_helpers.js'></script> <link rel='stylesheet' type='text/css' href='shared.css'> <link rel='stylesheet' type='text/css' href='icons.css'> <link rel='stylesheet' type='text/css' href='layout_default.css'> 
 	</head>
-	<body scroll=auto data-template-data='{"main":"teleporter_console.tmpl","layout":"layout_default.tmpl"}' data-url-parameters='{"src":"[0x2100a0aa]"}' data-initial-data='{"config":{"title":"Teleporter Console UI","srcObject":{"name":"Teleporter Control Console"},"stateKey":"default","status":2,"autoUpdateLayout":0,"autoUpdateContent":1,"showMap":0,"mapZLevel":1,"user":{"name":"Unknown"}},"data":{"powerstation":"The station","teleporterhub":"The teleporter hub","calibrated":0,"accurate":1,"regime":"Teleporter","target":"The Telescience Lab","calibrating":null,"locked":null}}'>
+	<body scroll=auto data-template-data='{"main":"identification_computer.tmpl","layout":"layout_default.tmpl"}' data-url-parameters='{"src":"[0x2100a15e]"}' data-initial-data='{"config":{"title":"CentCom Identification Computer","srcObject":{"name":"CentCom Identification Computer"},"stateKey":"default","status":2,"autoUpdateLayout":0,"autoUpdateContent":1,"showMap":0,"mapZLevel":1,"user":{"name":"Juliet Archibald"}},"data":{"src":"[0x200c2a2]","station_name":"NCS Cyberiad","mode":0,"printing":null,"manifest":"<head><style>.manifest {border-collapse:collapse;}.manifest td, th {border:1px solid #DEF; background-color:white; color:black; padding:.25em}.manifest th {height: 2em; background-color: #48C; color:white}.manifest tr.head th { background-color: #488; }.manifest td:first-child {text-align:right}.manifest tr.alt td {background-color: #DEF}</style></head><table class=\"manifest\" width=`350px`><tr class=`head`><th>Name</th><th>Rank</th><th>Activity</th></tr><tr><th colspan=3>Miscellaneous</th></tr><tr><td>Juliet Archibald</td><td>Supreme Commander</td><td>Active</td></tr></table>","target_name":"Juliet Archibald`s ID Card (NanoTrasen Navy Officer)","target_owner":"Juliet Archibald","target_rank":"NanoTrasen Navy Officer","scan_name":"Juliet Archibald`s ID Card","authenticated":1,"has_modify":1,"account_number":0,"centcom_access":1,"all_centcom_access":[{"desc":"Code&nbspGrey","ref":101,"allowed":1},{"desc":"Code&nbspYellow","ref":102,"allowed":1},{"desc":"Code&nbspBlack","ref":103,"allowed":1},{"desc":"Code&nbspWhite","ref":104,"allowed":1},{"desc":"Code&nbspGreen","ref":105,"allowed":1},{"desc":"Code&nbspOrange","ref":106,"allowed":1},{"desc":"Code&nbspBlue","ref":107,"allowed":1},{"desc":"Code&nbspSilver","ref":108,"allowed":1},{"desc":"Code&nbspGold","ref":109,"allowed":1}],"regions":null,"engineering_jobs":[{"display_name":"Chief&nbspEngineer","target_rank":"NanoTrasen Navy Officer","job":"Chief Engineer"},{"display_name":"Station&nbspEngineer","target_rank":"NanoTrasen Navy Officer","job":"Station Engineer"},{"display_name":"Life&nbspSupport&nbspSpecialist","target_rank":"NanoTrasen Navy Officer","job":"Life Support Specialist"},{"display_name":"Mechanic","target_rank":"NanoTrasen Navy Officer","job":"Mechanic"}],"medical_jobs":[{"display_name":"Chief&nbspMedical&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Chief Medical Officer"},{"display_name":"Medical&nbspDoctor","target_rank":"NanoTrasen Navy Officer","job":"Medical Doctor"},{"display_name":"Geneticist","target_rank":"NanoTrasen Navy Officer","job":"Geneticist"},{"display_name":"Psychiatrist","target_rank":"NanoTrasen Navy Officer","job":"Psychiatrist"},{"display_name":"Chemist","target_rank":"NanoTrasen Navy Officer","job":"Chemist"},{"display_name":"Virologist","target_rank":"NanoTrasen Navy Officer","job":"Virologist"},{"display_name":"Paramedic","target_rank":"NanoTrasen Navy Officer","job":"Paramedic"}],"science_jobs":[{"display_name":"Research&nbspDirector","target_rank":"NanoTrasen Navy Officer","job":"Research Director"},{"display_name":"Scientist","target_rank":"NanoTrasen Navy Officer","job":"Scientist"},{"display_name":"Geneticist","target_rank":"NanoTrasen Navy Officer","job":"Geneticist"},{"display_name":"Roboticist","target_rank":"NanoTrasen Navy Officer","job":"Roboticist"},{"display_name":"Xenobiologist","target_rank":"NanoTrasen Navy Officer","job":"Xenobiologist"}],"security_jobs":[{"display_name":"Head&nbspof&nbspSecurity","target_rank":"NanoTrasen Navy Officer","job":"Head of Security"},{"display_name":"Warden","target_rank":"NanoTrasen Navy Officer","job":"Warden"},{"display_name":"Detective","target_rank":"NanoTrasen Navy Officer","job":"Detective"},{"display_name":"Security&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Security Officer"},{"display_name":"Customs&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Customs Officer"},{"display_name":"Blueshield","target_rank":"NanoTrasen Navy Officer","job":"Blueshield"},{"display_name":"Brig&nbspPhysician","target_rank":"NanoTrasen Navy Officer","job":"Brig Physician"},{"display_name":"Security&nbspPod&nbspPilot","target_rank":"NanoTrasen Navy Officer","job":"Security Pod Pilot"}],"support_jobs":[{"display_name":"Head&nbspof&nbspPersonnel","target_rank":"NanoTrasen Navy Officer","job":"Head of Personnel"},{"display_name":"Bartender","target_rank":"NanoTrasen Navy Officer","job":"Bartender"},{"display_name":"Botanist","target_rank":"NanoTrasen Navy Officer","job":"Botanist"},{"display_name":"Chef","target_rank":"NanoTrasen Navy Officer","job":"Chef"},{"display_name":"Janitor","target_rank":"NanoTrasen Navy Officer","job":"Janitor"},{"display_name":"Librarian","target_rank":"NanoTrasen Navy Officer","job":"Librarian"},{"display_name":"Quartermaster","target_rank":"NanoTrasen Navy Officer","job":"Quartermaster"},{"display_name":"Cargo&nbspTechnician","target_rank":"NanoTrasen Navy Officer","job":"Cargo Technician"},{"display_name":"Shaft&nbspMiner","target_rank":"NanoTrasen Navy Officer","job":"Shaft Miner"},{"display_name":"Internal&nbspAffairs&nbspAgent","target_rank":"NanoTrasen Navy Officer","job":"Internal Affairs Agent"},{"display_name":"Chaplain","target_rank":"NanoTrasen Navy Officer","job":"Chaplain"},{"display_name":"Clown","target_rank":"NanoTrasen Navy Officer","job":"Clown"},{"display_name":"Mime","target_rank":"NanoTrasen Navy Officer","job":"Mime"},{"display_name":"Barber","target_rank":"NanoTrasen Navy Officer","job":"Barber"},{"display_name":"Magistrate","target_rank":"NanoTrasen Navy Officer","job":"Magistrate"},{"display_name":"Nanotrasen&nbspRecruiter","target_rank":"NanoTrasen Navy Officer","job":"Nanotrasen Recruiter"}],"civilian_jobs":[{"display_name":"Civilian","target_rank":"NanoTrasen Navy Officer","job":"Civilian"}],"special_jobs":[{"display_name":"Blueshield","target_rank":"NanoTrasen Navy Officer","job":"Blueshield"},{"display_name":"Customs&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Customs Officer"},{"display_name":"Nanotrasen&nbspRepresentative","target_rank":"NanoTrasen Navy Officer","job":"Nanotrasen Representative"},{"display_name":"Barber","target_rank":"NanoTrasen Navy Officer","job":"Barber"},{"display_name":"Mechanic","target_rank":"NanoTrasen Navy Officer","job":"Mechanic"},{"display_name":"Brig&nbspPhysician","target_rank":"NanoTrasen Navy Officer","job":"Brig Physician"},{"display_name":"Magistrate","target_rank":"NanoTrasen Navy Officer","job":"Magistrate"},{"display_name":"Security&nbspPod&nbspPilot","target_rank":"NanoTrasen Navy Officer","job":"Security Pod Pilot"},{"display_name":"Nanotrasen&nbspRecruiter","target_rank":"NanoTrasen Navy Officer","job":"Nanotrasen Recruiter"}],"centcom_jobs":[{"display_name":"VIP&nbspGuest","target_rank":"NanoTrasen Navy Officer","job":"VIP Guest"},{"display_name":"Custodian","target_rank":"NanoTrasen Navy Officer","job":"Custodian"},{"display_name":"Thunderdome&nbspOverseer","target_rank":"NanoTrasen Navy Officer","job":"Thunderdome Overseer"},{"display_name":"Intel&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Intel Officer"},{"display_name":"Medical&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Medical Officer"},{"display_name":"Death&nbspCommando","target_rank":"NanoTrasen Navy Officer","job":"Death Commando"},{"display_name":"Research&nbspOfficer","target_rank":"NanoTrasen Navy Officer","job":"Research Officer"},{"display_name":"BlackOps&nbspCommander","target_rank":"NanoTrasen Navy Officer","job":"BlackOps Commander"},{"display_name":"Supreme&nbspCommander","target_rank":"NanoTrasen Navy Officer","job":"Supreme Commander"},{"display_name":"Emergency&nbspResponse&nbspTeam","target_rank":"NanoTrasen Navy Officer","job":"Emergency Response Team"},{"display_name":"Emergency&nbspResponse&nbspTeam&nbspLeader","target_rank":"NanoTrasen Navy Officer","job":"Emergency Response Team Leader"}]}}'>
 		<div id='uiLayout'>
 		</div>
 		<noscript>