cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

SyndiBorg flash removed, CentCom access update

Browse Source
This commit is contained in:
Markolie
2014-11-23 08:23:52 +01:00
parent 74e72cdad6
commit 269253d5d2
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/access.dm
+11 -1
View File
@@ -200,6 +200,10 @@
return list(access_cent_general, access_cent_living, access_cent_storage) return list(access_cent_general, access_cent_living, access_cent_storage)
if("Thunderdome Overseer") if("Thunderdome Overseer")
return list(access_cent_general, access_cent_thunder) 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") if("Intel Officer")
return list(access_cent_general, access_cent_living) return list(access_cent_general, access_cent_living)
if("Medical Officer") if("Medical Officer")
@@ -210,6 +214,12 @@
return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage) return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage)
if("BlackOps Commander") if("BlackOps Commander")
return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) 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") if("Supreme Commander")
return get_all_centcom_access() return get_all_centcom_access()
@@ -447,7 +457,7 @@
return all_jobs return all_jobs
/proc/get_all_centcom_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) //gets the actual job rank (ignoring alt titles)
//this is used solely for sechuds //this is used solely for sechuds
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -2
View File
@@ -332,14 +332,14 @@
name = "syndicate robot module" name = "syndicate robot module"
/obj/item/weapon/robot_module/syndicate/New() /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/melee/energy/sword/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/crossbow/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/card/emag(src)
src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(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/tank/jetpack/carbondioxide(src)
src.modules += new /obj/item/weapon/crowbar(src) src.modules += new /obj/item/weapon/crowbar(src)
emag = null src.emag = null
return return
/obj/item/weapon/robot_module/combat /obj/item/weapon/robot_module/combat
nano/debug.html
+1 -1
View File
File diff suppressed because one or more lines are too long