Merge pull request #48 from Miniature/master

Made security able to be traitors (AI and cyborg still can't)
This commit is contained in:
headswe
2011-11-30 16:07:01 -08:00
3 changed files with 13 additions and 4 deletions
+11 -3
View File
@@ -66,7 +66,7 @@
for(var/obj/machinery/camera/c in cameras)
var/lum = c.luminosity
c.luminosity = 6
c.luminosity = 7
for(var/turf/t in view(7, c))
if(t in turfs)
newDimTurfs += t
@@ -153,7 +153,7 @@
for(var/obj/machinery/camera/c in cameras)
var/lum = c.luminosity
c.luminosity = 6
c.luminosity = 7
for(var/turf/t in view(7, c))
if(t in turfs)
dimTurfs += t
@@ -177,6 +177,7 @@
if(!(t in visibleTurfs))
if(!t.dim)
t.dim = image('cameravis.dmi', t, "dim", TURF_LAYER)
t.dim.mouse_opacity = 0
dim += t.dim
@@ -307,4 +308,11 @@ var/datum/cameranet/cameranet = new()
/obj/machinery/camera/New()
..()
cameranet.addCamera(src)
cameranet.addCamera(src)
/proc/checkcameravis(atom/A)
for(var/obj/machinery/camera/C in view(A,7))
if(!C.status)
continue
return 1
return 0
+1 -1
View File
@@ -5,7 +5,7 @@
/datum/game_mode/traitor
name = "traitor"
config_tag = "traitor"
restricted_jobs = list("Cyborg", "AI", "Security Officer", "Warden", "Detective", "Head of Security")//Approved by headmins for a week test, if you see this it would be nice if you didn't spread it everywhere
restricted_jobs = list("Cyborg", "AI")//Approved by headmins for a week test, if you see this it would be nice if you didn't spread it everywhere
required_players = 0
required_enemies = 1