Area Refactor + Var-edit Cleanup
This commit is contained in:
@@ -8,13 +8,12 @@
|
||||
announceWhen = 50
|
||||
endWhen = 20
|
||||
var/list/area/areasToOpen = list()
|
||||
var/list/potential_areas = list(/area/atmos,
|
||||
/area/bridge,
|
||||
var/list/potential_areas = list(/area/bridge,
|
||||
/area/engine,
|
||||
/area/medical,
|
||||
/area/security,
|
||||
/area/quartermaster,
|
||||
/area/toxins)
|
||||
/area/science)
|
||||
var/severity = 1
|
||||
|
||||
|
||||
|
||||
@@ -809,13 +809,13 @@
|
||||
if(T.title == "Chief Medical Officer" || T.title == "Medical Doctor" || T.title == "Chemist" || T.title == "Virologist" || T.title == "Geneticist")
|
||||
return /area/medical
|
||||
if(T.title == "Research Director" || T.title == "Scientist" || T.title == "Roboticist")
|
||||
return /area/toxins
|
||||
return /area/science
|
||||
if(T.title == "Head of Security" || T.title == "Warden" || T.title == "Security Officer" || T.title == "Detective")
|
||||
return /area/security
|
||||
if(T.title == "Botanist")
|
||||
return /area/hydroponics
|
||||
else
|
||||
return pick(/area/hallway,/area/crew_quarters)
|
||||
return pick(/area/hallway,/area/crew_quarters/locker)
|
||||
|
||||
/mob/living/carbon/human/interactive/proc/target_filter(target)
|
||||
var/list/filtered_targets = list(/area, /turf, /obj/machinery/door, /atom/movable/light, /obj/structure/cable, /obj/machinery/atmospherics)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
|
||||
var/area/new_area = get_area(t)
|
||||
if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology ))
|
||||
if(new_area && new_area.name == allowed_area || istype(new_area, /area/science/xenobiology ))
|
||||
return ..()
|
||||
else
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user