Merge pull request #361 from alex-gh/vox_mutiny

is_in_brig() fixes
This commit is contained in:
alex-gh
2014-08-06 23:45:13 +02:00
+1 -1
View File
@@ -818,7 +818,7 @@ var/list/slot_equipment_priority = list( \
// They should be in a cell or the Brig portion of the shuttle.
var/area/A = loc.loc
if(!istype(A, /area/security/brig))
if(!istype(A, /area/security/prison) && !istype(A, /area/prison))
if(!istype(A, /area/shuttle/escape) || loc.name != "Brig floor")
return 0