Area Refactor + Var-edit Cleanup
This commit is contained in:
CitadelStationBot
+1484
-1680
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,161 @@
|
||||
diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
|
||||
@@ -8756,7 +8756,7 @@
|
||||
/turf/closed/wall/r_wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"arL" = (
|
||||
/obj/machinery/vending/cigarette{
|
||||
extended_inventory = 1
|
||||
@@ -9169,7 +9169,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asG" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = 25
|
||||
@@ -9177,26 +9177,26 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asH" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/modular_computer/laptop/preset/civillian,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asI" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/paper_bin,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asJ" = (
|
||||
/turf/closed/wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asK" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/turf/open/floor/carpet{
|
||||
@@ -9739,12 +9739,12 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atO" = (
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atP" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
@@ -9752,14 +9752,14 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atQ" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atR" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/closed/wall{
|
||||
@@ -10213,7 +10213,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -10221,7 +10221,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -10229,7 +10229,7 @@
|
||||
/turf/closed/wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auP" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
@@ -10937,13 +10937,13 @@
|
||||
/turf/open/floor/plating{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awa" = (
|
||||
/obj/structure/dresser,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awb" = (
|
||||
/obj/structure/closet{
|
||||
icon_door = "blue";
|
||||
@@ -10958,7 +10958,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awc" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump{
|
||||
@@ -10968,7 +10968,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awd" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
@@ -10976,7 +10976,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awe" = (
|
||||
/obj/machinery/door/airlock/medical{
|
||||
name = "Chief Medical Officer's Personal Quarters";
|
||||
@@ -10988,7 +10988,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awf" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/black{
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1650
-2276
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,22 @@
|
||||
diff a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm (rejected hunks)
|
||||
@@ -19704,17 +19704,17 @@
|
||||
/turf/open/floor/plasteel/neutral/corner{
|
||||
dir = 1
|
||||
},
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJf" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/neutral/corner{
|
||||
dir = 2
|
||||
},
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJh" = (
|
||||
/turf/closed/wall,
|
||||
/area/hydroponics/garden)
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,36 @@
|
||||
diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm (rejected hunks)
|
||||
@@ -7901,7 +7901,7 @@
|
||||
/area/chapel/main/monastery)
|
||||
"aqa" = (
|
||||
/turf/open/floor/plating,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aqb" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
@@ -8760,14 +8760,14 @@
|
||||
/area/chapel/main/monastery)
|
||||
"arM" = (
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"arN" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"arO" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/fulltile,
|
||||
@@ -12924,7 +12924,7 @@
|
||||
"aAv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aAw" = (
|
||||
/turf/closed/wall,
|
||||
/area/crew_quarters/toilet/restrooms)
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,101 @@
|
||||
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
|
||||
@@ -26775,17 +26763,17 @@
|
||||
/turf/open/floor/plasteel/whitepurple/side{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biV" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/landmark/start/scientist,
|
||||
/turf/open/floor/plasteel/whitepurple/side{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biW" = (
|
||||
/turf/open/floor/plasteel/white,
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biX" = (
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Research and Development";
|
||||
@@ -26804,7 +26792,7 @@
|
||||
/turf/open/floor/plasteel/whitepurple/corner{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biY" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
@@ -31498,17 +31452,13 @@
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 5
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bsA" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 9
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bsB" = (
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/turf/open/floor/mineral/plastitanium,
|
||||
@@ -33607,9 +33493,7 @@
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 9
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bwP" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/weapon/storage/box/donkpockets{
|
||||
@@ -37035,7 +36889,7 @@
|
||||
},
|
||||
/mob/living/simple_animal/mouse,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
-/area/toxins/storage)
|
||||
+/area/science/storage)
|
||||
"bDY" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -39989,17 +39807,17 @@
|
||||
},
|
||||
/obj/structure/window/reinforced/fulltile,
|
||||
/turf/open/floor/engine,
|
||||
-/area/toxins/xenobiology)
|
||||
+/area/science/xenobiology)
|
||||
"bJN" = (
|
||||
/turf/closed/wall,
|
||||
-/area/toxins/xenobiology)
|
||||
+/area/science/xenobiology)
|
||||
"bJO" = (
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Testing Lab";
|
||||
req_access_txt = "47"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/toxins/misc_lab)
|
||||
+/area/science/misc_lab)
|
||||
"bJP" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/turf/open/floor/plasteel/bar,
|
||||
@@ -54609,7 +54415,7 @@
|
||||
pipe_type = 14
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
-/area/toxins/misc_lab)
|
||||
+/area/science/misc_lab)
|
||||
"coU" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/weapon/surgicaldrill,
|
||||
@@ -2,16 +2,16 @@
|
||||
"aa" = (/turf/open/space/basic,/area/space)
|
||||
"ab" = (/obj/structure/lattice,/turf/open/space,/area/space)
|
||||
"ac" = (/turf/open/space,/area/space/nearstation)
|
||||
"ad" = (/turf/closed/wall/r_wall,/area/maintenance/maintcentral)
|
||||
"ad" = (/turf/closed/wall/r_wall,/area/maintenance/department/bridge)
|
||||
"ae" = (/obj/structure/lattice,/obj/structure/grille,/turf/open/space,/area/space/nearstation)
|
||||
"af" = (/turf/open/floor/plating,/area/maintenance/maintcentral)
|
||||
"af" = (/turf/open/floor/plating,/area/maintenance/department/bridge)
|
||||
"ag" = (/obj/structure/lattice,/turf/open/space,/area/space/nearstation)
|
||||
"ah" = (/turf/closed/wall/r_wall,/area/atmos)
|
||||
"ah" = (/turf/closed/wall/r_wall,/area/engine/atmos)
|
||||
"ai" = (/obj/machinery/power/rtg/advanced,/turf/open/floor/plating/airless,/area/space/nearstation)
|
||||
"aj" = (/turf/closed/wall/r_wall,/area/engine/engineering)
|
||||
"ak" = (/turf/closed/wall/r_wall,/area/engine/gravity_generator)
|
||||
"al" = (/obj/machinery/airalarm{frequency = 1439;locked = 0;pixel_y = 23},/obj/structure/closet/secure_closet/atmospherics,/turf/open/floor/plating,/area/atmos)
|
||||
"am" = (/obj/machinery/atmospherics/components/unary/tank/air,/turf/open/floor/plating,/area/atmos)
|
||||
"al" = (/obj/machinery/airalarm{frequency = 1439;locked = 0;pixel_y = 23},/obj/structure/closet/secure_closet/atmospherics,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"am" = (/obj/machinery/atmospherics/components/unary/tank/air,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"an" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4"},/turf/open/space,/area/space/nearstation)
|
||||
"ao" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/open/space,/area/space/nearstation)
|
||||
"ap" = (/obj/machinery/airalarm{frequency = 1439;locked = 0;pixel_y = 23},/obj/machinery/power/apc{dir = 8;pixel_x = -24},/obj/structure/closet/secure_closet/engineering_electrical,/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/open/floor/plating,/area/engine/engineering)
|
||||
@@ -21,10 +21,10 @@
|
||||
"at" = (/obj/machinery/power/apc{dir = 1;name = "Gravity Generator APC";pixel_x = 0;pixel_y = 25},/obj/structure/cable{icon_state = "0-8";d2 = 8},/obj/structure/cable{icon_state = "0-2";d2 = 2},/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 5},/area/engine/gravity_generator)
|
||||
"au" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'";icon_state = "radiation";name = "RADIOACTIVE AREA";pixel_x = 0;pixel_y = 32},/turf/open/floor/plating,/area/engine/gravity_generator)
|
||||
"av" = (/turf/open/floor/plasteel/black,/area/engine/gravity_generator)
|
||||
"aw" = (/turf/open/floor/plating,/area/atmos)
|
||||
"ax" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plating,/area/atmos)
|
||||
"ay" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plating,/area/atmos)
|
||||
"az" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/meter,/turf/open/floor/plating,/area/atmos)
|
||||
"aw" = (/turf/open/floor/plating,/area/engine/atmos)
|
||||
"ax" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"ay" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"az" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/meter,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"aA" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0},/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4"},/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/open/space,/area/space/nearstation)
|
||||
"aB" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0},/turf/open/space,/area/space/nearstation)
|
||||
"aC" = (/obj/machinery/door/airlock,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0},/turf/open/floor/plating,/area/engine/engineering)
|
||||
@@ -37,10 +37,10 @@
|
||||
"aJ" = (/turf/open/floor/plasteel/vault{dir = 1},/area/engine/gravity_generator)
|
||||
"aK" = (/turf/open/floor/plasteel/vault{dir = 8},/area/engine/gravity_generator)
|
||||
"aL" = (/turf/open/floor/plasteel/vault{dir = 4},/area/engine/gravity_generator)
|
||||
"aM" = (/obj/machinery/suit_storage_unit/ce,/turf/open/floor/plating,/area/atmos)
|
||||
"aN" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/open/floor/plasteel{dir = 2},/obj/effect/turf_decal/bot{dir = 2},/area/atmos)
|
||||
"aO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4;on = 1},/turf/open/floor/plasteel,/area/atmos)
|
||||
"aP" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plating,/area/atmos)
|
||||
"aM" = (/obj/machinery/suit_storage_unit/ce,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"aN" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/open/floor/plasteel{dir = 2},/obj/effect/turf_decal/bot{dir = 2},/area/engine/atmos)
|
||||
"aO" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4;on = 1},/turf/open/floor/plasteel,/area/engine/atmos)
|
||||
"aP" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"aQ" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/open/space,/area/space/nearstation)
|
||||
"aR" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/open/space,/area/space/nearstation)
|
||||
"aS" = (/obj/structure/table,/obj/item/device/flashlight{pixel_y = 5},/obj/item/weapon/airlock_painter,/turf/open/floor/plating,/area/engine/engineering)
|
||||
@@ -50,33 +50,33 @@
|
||||
"aW" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 4},/area/engine/gravity_generator)
|
||||
"aX" = (/obj/machinery/door/airlock/glass_engineering{name = "Gravity Generator";req_access_txt = "11";req_one_access_txt = "0"},/turf/open/floor/plasteel/black,/area/engine/gravity_generator)
|
||||
"aY" = (/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/black,/area/engine/gravity_generator)
|
||||
"aZ" = (/obj/structure/tank_dispenser{pixel_x = -1},/turf/open/floor/plating,/area/atmos)
|
||||
"ba" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/open/floor/plating,/area/atmos)
|
||||
"bb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/open/floor/plasteel{dir = 2},/obj/effect/turf_decal/bot{dir = 2},/area/atmos)
|
||||
"bc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8;on = 1},/turf/open/floor/plasteel,/area/atmos)
|
||||
"aZ" = (/obj/structure/tank_dispenser{pixel_x = -1},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"ba" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bb" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/open/floor/plasteel{dir = 2},/obj/effect/turf_decal/bot{dir = 2},/area/engine/atmos)
|
||||
"bc" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8;on = 1},/turf/open/floor/plasteel,/area/engine/atmos)
|
||||
"bd" = (/obj/structure/table,/obj/item/weapon/weldingtool/experimental,/turf/open/floor/plating,/area/engine/engineering)
|
||||
"be" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/open/floor/plating,/area/engine/engineering)
|
||||
"bf" = (/obj/structure/closet/secure_closet/engineering_chief,/turf/open/floor/plating,/area/engine/engineering)
|
||||
"bg" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 8},/area/engine/gravity_generator)
|
||||
"bh" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 4},/area/engine/gravity_generator)
|
||||
"bi" = (/obj/machinery/gravity_generator/main/station,/turf/open/floor/plasteel/vault{dir = 8},/area/engine/gravity_generator)
|
||||
"bj" = (/obj/machinery/power/apc{dir = 8;pixel_x = -24},/obj/structure/cable{icon_state = "0-2";pixel_y = 1;d2 = 2},/obj/machinery/light,/obj/structure/table,/obj/item/device/analyzer,/obj/item/weapon/wrench,/turf/open/floor/plating,/area/atmos)
|
||||
"bk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plating,/area/atmos)
|
||||
"bl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/meter,/turf/open/floor/plating,/area/atmos)
|
||||
"bm" = (/obj/machinery/atmospherics/components/binary/valve/open{icon_state = "mvalve_map";dir = 4},/turf/open/floor/plating,/area/atmos)
|
||||
"bn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9;pixel_y = 0},/obj/machinery/light,/turf/open/floor/plating,/area/atmos)
|
||||
"bj" = (/obj/machinery/power/apc{dir = 8;pixel_x = -24},/obj/structure/cable{icon_state = "0-2";pixel_y = 1;d2 = 2},/obj/machinery/light,/obj/structure/table,/obj/item/device/analyzer,/obj/item/weapon/wrench,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/meter,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bm" = (/obj/machinery/atmospherics/components/binary/valve/open{icon_state = "mvalve_map";dir = 4},/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9;pixel_y = 0},/obj/machinery/light,/turf/open/floor/plating,/area/engine/atmos)
|
||||
"bo" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/obj/structure/table,/obj/item/weapon/screwdriver/power,/obj/item/weapon/wirecutters/power,/turf/open/floor/plating,/area/engine/engineering)
|
||||
"bp" = (/obj/machinery/light,/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/lightreplacer,/turf/open/floor/plating,/area/engine/engineering)
|
||||
"bq" = (/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 10},/area/engine/gravity_generator)
|
||||
"br" = (/obj/structure/closet/radiation,/turf/open/floor/plasteel,/obj/effect/turf_decal/stripes/line{dir = 6},/area/engine/gravity_generator)
|
||||
"bs" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/closed/wall/r_wall,/area/hallway/primary/central)
|
||||
"bt" = (/obj/machinery/door/airlock,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/atmos)
|
||||
"bt" = (/obj/machinery/door/airlock,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/engine/atmos)
|
||||
"bu" = (/turf/closed/wall/r_wall,/area/bridge)
|
||||
"bv" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/bridge)
|
||||
"bw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall/r_wall,/area/engine/engineering)
|
||||
"bx" = (/obj/machinery/door/airlock,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/open/floor/plating,/area/engine/engineering)
|
||||
"by" = (/turf/closed/wall/r_wall,/area/hallway/secondary/entry)
|
||||
"bz" = (/obj/machinery/light{dir = 8},/turf/open/floor/plating,/area/maintenance/maintcentral)
|
||||
"bz" = (/obj/machinery/light{dir = 8},/turf/open/floor/plating,/area/maintenance/department/bridge)
|
||||
"bA" = (/turf/closed/wall/r_wall,/area/hallway/primary/central)
|
||||
"bB" = (/obj/machinery/power/apc{dir = 8;pixel_x = -24},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2";pixel_y = 1;d2 = 2},/obj/machinery/airalarm{frequency = 1439;locked = 0;pixel_y = 23},/obj/structure/closet/jcloset,/turf/open/floor/plasteel,/area/hallway/primary/central)
|
||||
"bC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/central)
|
||||
@@ -101,7 +101,7 @@
|
||||
"bV" = (/obj/machinery/light{dir = 1},/obj/structure/closet/emcloset,/turf/open/floor/plasteel/arrival{dir = 1},/area/hallway/secondary/entry)
|
||||
"bW" = (/obj/structure/closet/secure_closet/hos,/turf/open/floor/plasteel/arrival{dir = 1},/area/hallway/secondary/entry)
|
||||
"bX" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/arrival{dir = 1},/area/hallway/secondary/entry)
|
||||
"bY" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/maintenance/maintcentral)
|
||||
"bY" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/maintenance/department/bridge)
|
||||
"bZ" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/hallway/primary/central)
|
||||
"ca" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4"},/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/open/floor/plasteel,/area/hallway/primary/central)
|
||||
"cb" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/hallway/primary/central)
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#define WIRE_AI "AI Connection"
|
||||
#define WIRE_ALARM "Alarm"
|
||||
#define WIRE_AVOIDANCE "Avoidance"
|
||||
#define WIRE_BACKUP1 "Auxillary Power 1"
|
||||
#define WIRE_BACKUP2 "Auxillary Power 2"
|
||||
#define WIRE_BACKUP1 "Auxiliary Power 1"
|
||||
#define WIRE_BACKUP2 "Auxiliary Power 2"
|
||||
#define WIRE_BEACON "Beacon"
|
||||
#define WIRE_BOLTS "Bolts"
|
||||
#define WIRE_BOOM "Boom"
|
||||
|
||||
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(events)
|
||||
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
|
||||
var/list/danger_areas = list(
|
||||
/area/engine/break_room,
|
||||
/area/engine/chiefs_office)
|
||||
/area/crew_quarters/heads/chief)
|
||||
|
||||
//Need to locate() as it's just a list of paths.
|
||||
return locate(pick((GLOB.the_station_areas - safe_areas) + danger_areas))
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
area_type = /area
|
||||
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
|
||||
/area/ai_monitored/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/shuttle)
|
||||
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
|
||||
target_z = ZLEVEL_STATION
|
||||
|
||||
immunity_type = "rad"
|
||||
|
||||
@@ -97,12 +97,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
|
||||
//STATION13
|
||||
|
||||
/area/atmos
|
||||
name = "Atmospherics"
|
||||
icon_state = "atmos"
|
||||
flags = NONE
|
||||
|
||||
//Maintenance
|
||||
|
||||
/area/maintenance
|
||||
ambientsounds = list('sound/ambience/ambimaint1.ogg',
|
||||
'sound/ambience/ambimaint2.ogg',
|
||||
@@ -220,15 +216,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
/area/hallway/primary/aft
|
||||
name = "Aft Primary Hallway"
|
||||
icon_state = "hallA"
|
||||
|
||||
|
||||
/area/hallway/primary/port
|
||||
name = "Port Primary Hallway"
|
||||
icon_state = "hallP"
|
||||
|
||||
|
||||
/area/hallway/primary/central
|
||||
name = "Central Primary Hallway"
|
||||
icon_state = "hallC"
|
||||
|
||||
|
||||
/area/hallway/secondary/exit
|
||||
name = "Escape Shuttle Hallway"
|
||||
icon_state = "escape"
|
||||
@@ -291,7 +287,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
|
||||
//Crew
|
||||
|
||||
/area/crew_quarters
|
||||
/area/crew_quarters/dorms
|
||||
// /area/crew_quarters
|
||||
name = "Dormitories"
|
||||
icon_state = "Sleep"
|
||||
safe = 1
|
||||
@@ -498,7 +495,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
|
||||
//MedBay
|
||||
|
||||
/area/medical/medbay
|
||||
/area/medical
|
||||
name = "Medical"
|
||||
icon_state = "medbay3"
|
||||
|
||||
/area/medical/abandoned
|
||||
// /area/medical/abandoned_medbay
|
||||
name = "Abandoned Medbay"
|
||||
icon_state = "medbay3"
|
||||
music = 'sound/ambience/signal.ogg'
|
||||
|
||||
/area/medical/medbay/central
|
||||
// /area/medical/medbay
|
||||
name = "Medbay Central"
|
||||
icon_state = "medbay"
|
||||
music = 'sound/ambience/signal.ogg'
|
||||
@@ -588,7 +596,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Genetics Lab"
|
||||
icon_state = "genetics"
|
||||
|
||||
/area/medical/genetics_cloning
|
||||
/area/medical/genetics/cloning
|
||||
// /area/medical/genetics_cloning
|
||||
name = "Cloning Lab"
|
||||
icon_state = "cloning"
|
||||
|
||||
@@ -596,8 +605,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Medbay Treatment Center"
|
||||
icon_state = "exam_room"
|
||||
|
||||
|
||||
//Security
|
||||
|
||||
/area/security
|
||||
name = "Security"
|
||||
icon_state = "security"
|
||||
|
||||
/area/security/main
|
||||
name = "Security Office"
|
||||
icon_state = "security"
|
||||
@@ -605,6 +619,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
/area/security/brig
|
||||
name = "Brig"
|
||||
icon_state = "brig"
|
||||
|
||||
/area/security/courtroom
|
||||
// /area/crew_quarters/courtroom
|
||||
name = "Courtroom"
|
||||
icon_state = "courtroom"
|
||||
|
||||
/area/security/prison
|
||||
name = "Prison Wing"
|
||||
@@ -657,7 +676,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Security Checkpoint"
|
||||
icon_state = "checkpoint1"
|
||||
|
||||
/area/security/checkpoint2
|
||||
/area/security/checkpoint/checkpoint2
|
||||
// /area/security/checkpoint2
|
||||
name = "Security Checkpoint"
|
||||
icon_state = "security"
|
||||
|
||||
@@ -672,7 +692,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
/area/security/checkpoint/medical
|
||||
name = "Security Post - Medbay"
|
||||
icon_state = "checkpoint1"
|
||||
|
||||
|
||||
/area/security/checkpoint/science
|
||||
name = "Security Post - Science"
|
||||
icon_state = "checkpoint1"
|
||||
@@ -799,9 +819,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Art Supply Storage"
|
||||
icon_state = "storage"
|
||||
|
||||
/area/storage/auxillary
|
||||
name = "Auxillary Storage"
|
||||
/area/storage/auxiliary
|
||||
// /area/storage/auxillary
|
||||
name = "Auxiliary Storage"
|
||||
icon_state = "auxstorage"
|
||||
|
||||
/area/storage/atmos
|
||||
// /area/maintenance/storage
|
||||
name = "Atmospherics Storage"
|
||||
icon_state = "atmos"
|
||||
valid_territory = 0
|
||||
|
||||
/area/storage/tcom
|
||||
// /area/maintenance/storage/tcom_storage
|
||||
name = "Telecoms Storage"
|
||||
icon_state = "green"
|
||||
valid_territory = 0
|
||||
|
||||
/area/storage/eva
|
||||
name = "EVA Storage"
|
||||
@@ -811,11 +844,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Secure Storage"
|
||||
icon_state = "storage"
|
||||
|
||||
/area/storage/emergency
|
||||
/area/storage/emergency/starboard
|
||||
// /area/storage/emergency
|
||||
name = "Starboard Emergency Storage"
|
||||
icon_state = "emergencystorage"
|
||||
|
||||
/area/storage/emergency2
|
||||
/area/storage/emergency/port
|
||||
// /area/storage/emergency2
|
||||
name = "Port Emergency Storage"
|
||||
icon_state = "emergencystorage"
|
||||
|
||||
@@ -867,9 +902,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Solar Panel Control"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/construction/Storage
|
||||
/area/construction/storage
|
||||
name = "Construction Site Storage"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/construction/storage/wing
|
||||
// /area/construction/Storage
|
||||
name = "Storage Wing"
|
||||
icon_state = "yellow"
|
||||
|
||||
|
||||
//AI
|
||||
/area/ai_monitored/security/armory
|
||||
@@ -987,14 +1028,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Telecommunications Satellite Lounge"
|
||||
icon_state = "tcomsatlounge"
|
||||
|
||||
/area/chapel/asteroid
|
||||
name = "Chapel Asteroid"
|
||||
icon_state = "explored"
|
||||
|
||||
/area/chapel/dock
|
||||
name = "Chapel Dock"
|
||||
icon_state = "construction"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
/*
|
||||
Lists of areas to be used with is_type_in_list.
|
||||
@@ -1003,28 +1036,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
|
||||
//SPACE STATION 13
|
||||
GLOBAL_LIST_INIT(the_station_areas, list (
|
||||
/area/atmos,
|
||||
/area/maintenance,
|
||||
/area/hallway,
|
||||
/area/bridge,
|
||||
/area/crew_quarters,
|
||||
/area/holodeck,
|
||||
/area/assembly,
|
||||
/area/bridge,
|
||||
/area/chapel,
|
||||
/area/construction,
|
||||
/area/crew_quarters,
|
||||
/area/engine,
|
||||
/area/hallway,
|
||||
/area/holodeck,
|
||||
/area/hydroponics,
|
||||
/area/janitor,
|
||||
/area/lawoffice,
|
||||
/area/library,
|
||||
/area/maintenance,
|
||||
/area/medical,
|
||||
// /area/mint, //not present on map
|
||||
/area/library,
|
||||
/area/chapel,
|
||||
/area/lawoffice,
|
||||
/area/engine,
|
||||
/area/solar,
|
||||
/area/assembly,
|
||||
/area/teleporter,
|
||||
/area/medical,
|
||||
/area/security,
|
||||
/area/quartermaster,
|
||||
/area/janitor,
|
||||
/area/hydroponics,
|
||||
/area/toxins,
|
||||
/area/storage,
|
||||
/area/construction,
|
||||
/area/quartermaster,
|
||||
/area/science, // /area/toxins/
|
||||
/area/security,
|
||||
/area/solar,
|
||||
/area/storage,
|
||||
/area/teleporter,
|
||||
/area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0
|
||||
// /area/ai_monitored/storage/secure, //not present on map
|
||||
// /area/ai_monitored/storage/emergency, //not present on map
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm (rejected hunks)
|
||||
@@ -513,10 +513,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
|
||||
/area/crew_quarters/dorms
|
||||
// /area/crew_quarters
|
||||
+// /area/crew_quarters/sleep
|
||||
name = "Dormitories"
|
||||
icon_state = "Sleep"
|
||||
safe = 1
|
||||
|
||||
+/area/crew_quarters/dorms/male
|
||||
+// /area/crew_quarters/sleep_male
|
||||
+ name = "Male Dorm"
|
||||
+ icon_state = "Sleep"
|
||||
+
|
||||
+/area/crew_quarters/dorms/female
|
||||
+// /area/crew_quarters/sleep_female
|
||||
+ name = "Female Dorm"
|
||||
+ icon_state = "Sleep"
|
||||
+
|
||||
/area/crew_quarters/rehab_dome
|
||||
name = "Rehabilitation Dome"
|
||||
icon_state = "Sleep"
|
||||
@@ -534,28 +545,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "Locker Toilets"
|
||||
icon_state = "toilet"
|
||||
|
||||
-/area/crew_quarters/toilet/restrooms
|
||||
- name = "Restrooms"
|
||||
+/area/crew_quarters/toilet/female
|
||||
+// /area/crew_quarters/sleep_female/toilet_female
|
||||
+ name = "Female Toilets"
|
||||
icon_state = "toilet"
|
||||
-
|
||||
-/area/crew_quarters/sleep
|
||||
- name = "Dormitories"
|
||||
- icon_state = "Sleep"
|
||||
-
|
||||
-/area/crew_quarters/sleep_male
|
||||
- name = "Male Dorm"
|
||||
- icon_state = "Sleep"
|
||||
-
|
||||
-/area/crew_quarters/sleep_male/toilet_male
|
||||
+
|
||||
+/area/crew_quarters/toilet/male
|
||||
+// /area/crew_quarters/sleep_male/toilet_male
|
||||
name = "Male Toilets"
|
||||
icon_state = "toilet"
|
||||
-
|
||||
-/area/crew_quarters/sleep_female
|
||||
- name = "Female Dorm"
|
||||
- icon_state = "Sleep"
|
||||
-
|
||||
-/area/crew_quarters/sleep_female/toilet_female
|
||||
- name = "Female Toilets"
|
||||
+
|
||||
+/area/crew_quarters/toilet/restrooms
|
||||
+ name = "Restrooms"
|
||||
icon_state = "toilet"
|
||||
|
||||
/area/crew_quarters/locker
|
||||
@@ -565,11 +566,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
/area/crew_quarters/lounge
|
||||
name = "Lounge"
|
||||
icon_state = "yellow"
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
+
|
||||
/area/crew_quarters/fitness
|
||||
name = "Fitness Room"
|
||||
icon_state = "fitness"
|
||||
@@ -0,0 +1,22 @@
|
||||
diff a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm (rejected hunks)
|
||||
@@ -120,14 +120,17 @@
|
||||
name = "Prisoner Education Chamber"
|
||||
icon_state = "armory"
|
||||
|
||||
-/area/prison/cell_block/A
|
||||
+/area/prison/cell_block/a
|
||||
+// /area/prison/cell_block/A
|
||||
name = "Prison Cell Block A"
|
||||
icon_state = "brig"
|
||||
|
||||
-/area/prison/cell_block/B
|
||||
+/area/prison/cell_block/b
|
||||
+// /area/prison/cell_block/B
|
||||
name = "Prison Cell Block B"
|
||||
icon_state = "brig"
|
||||
|
||||
-/area/prison/cell_block/C
|
||||
+/area/prison/cell_block/c
|
||||
+// /area/prison/cell_block/C
|
||||
name = "Prison Cell Block C"
|
||||
icon_state = "brig"
|
||||
@@ -25,7 +25,7 @@
|
||||
//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
|
||||
|
||||
//high dirt - 1/3
|
||||
if(istype(A, /area/toxins/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
|
||||
if(istype(A, /area/science/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
|
||||
new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works
|
||||
return
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
new /obj/effect/decal/cleanable/dirt(src)
|
||||
return
|
||||
|
||||
if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/locker/locker_toilet))
|
||||
if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/toilet/locker))
|
||||
if(prob(40))
|
||||
if(prob(90))
|
||||
new /obj/effect/decal/cleanable/vomit/old(src)
|
||||
@@ -79,7 +79,7 @@
|
||||
new /obj/effect/decal/cleanable/flour(src)
|
||||
return
|
||||
|
||||
if(istype(A, /area/medical)) //Kept clean, but chance of blood
|
||||
if(istype(A, /area/medical) || !istype(A, /area/science/robotics)) //Kept clean, but chance of blood
|
||||
if(prob(66))
|
||||
if(prob(5))
|
||||
new /obj/effect/decal/cleanable/blood/gibs/old(src)
|
||||
@@ -92,7 +92,7 @@
|
||||
new /obj/effect/decal/cleanable/vomit/old(src)
|
||||
return
|
||||
|
||||
if(istype(A, /area/toxins))
|
||||
if(istype(A, /area/science) || istype(A, /area/crew_quarters/heads/hor))
|
||||
if(prob(20))
|
||||
new /obj/effect/decal/cleanable/greenglow(src) //this cleans itself up but it might startle you when you see it.
|
||||
return
|
||||
|
||||
@@ -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