From 12b909e5368c7316b642cd063cd2e04ce1d71b6d Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Fri, 22 Oct 2021 18:57:55 +0000 Subject: [PATCH] [MIRROR] Misc runtime fixes --- code/game/objects/random/guns_and_ammo.dm | 6 +- code/modules/food/food/snacks.dm | 10 +-- .../xenoarcheaology/effects/vampire.dm | 3 +- .../surface_submaps/wilderness/borglab.dmm | 73 +++++++++++++++++-- 4 files changed, 78 insertions(+), 14 deletions(-) diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index cb8362879d..184ea6689a 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -161,7 +161,7 @@ icon_state = "clusterbang_segment" /obj/random/grenade/item_to_spawn() - return pick( prob(15);/obj/item/weapon/grenade/concussion, + return pick(prob(15);/obj/item/weapon/grenade/concussion, prob(5);/obj/item/weapon/grenade/empgrenade, prob(15);/obj/item/weapon/grenade/empgrenade/low_yield, prob(5);/obj/item/weapon/grenade/chem_grenade/metalfoam, @@ -186,7 +186,7 @@ icon_state = "clusterbang_segment" /obj/random/grenade/less_lethal/item_to_spawn() - return pick( prob(20);/obj/item/weapon/grenade/concussion, + return pick(prob(20);/obj/item/weapon/grenade/concussion, prob(15);/obj/item/weapon/grenade/empgrenade/low_yield, prob(15);/obj/item/weapon/grenade/chem_grenade/metalfoam, prob(20);/obj/item/weapon/grenade/chem_grenade/teargas, @@ -203,7 +203,7 @@ icon_state = "clusterbang_segment" /obj/random/grenade/box/item_to_spawn() - return pick( prob(20);/obj/item/weapon/storage/box/flashbangs, + return pick(prob(20);/obj/item/weapon/storage/box/flashbangs, prob(10);/obj/item/weapon/storage/box/emps, prob(20);/obj/item/weapon/storage/box/empslite, prob(15);/obj/item/weapon/storage/box/smokes, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 27deb4a79f..00f4dec912 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6343,7 +6343,7 @@ desc = "Space squid tentacles, Carefully removed (from the squid) then dried into strips of delicious rubbery goodness!" trash = /obj/item/trash/squid filling_color = "#c0a9d7" - center_of_mass = list("x"=15, "y"=9) + center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("fish" = 1, "salt" = 1) nutriment_amt = 2 bitesize = 1 @@ -6359,7 +6359,7 @@ desc = "Fried bread cubes. Popular in Terran territories." trash = /obj/item/trash/croutons filling_color = "#c6b17f" - center_of_mass = list("x"=15, "y"=9) + center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("bread" = 1, "salt" = 1) nutriment_amt = 3 bitesize = 1 @@ -6371,7 +6371,7 @@ desc = "Pig fat. Salted. Just as good as it sounds." trash = /obj/item/trash/salo filling_color = "#e0bcbc" - center_of_mass = list("x"=15, "y"=9) + center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("fat" = 1, "salt" = 1) nutriment_amt = 2 bitesize = 2 @@ -6387,7 +6387,7 @@ desc = "Dried salted beer snack fish." trash = /obj/item/trash/driedfish filling_color = "#c8a5bb" - center_of_mass = list("x"=15, "y"=9) + center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("fish" = 1, "salt" = 1) nutriment_amt = 2 bitesize = 1 @@ -6694,7 +6694,7 @@ /obj/item/weapon/reagent_containers/food/snacks/old name = "master old-food" desc = "they're all inedible and potentially dangerous items" - center_of_mass = list("x"=15,"y"=12) + center_of_mass = list ("x"=15, "y"=9) nutriment_desc = list("rot" = 5, "mold" = 5) nutriment_amt = 10 bitesize = 3 diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index cf0ae9a246..e5a069b935 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -30,7 +30,8 @@ DoEffectAura() /datum/artifact_effect/vampire/DoEffectAura() - nearby_mobs.Cut() + if (nearby_mobs.len) + nearby_mobs.Cut() var/turf/T = get_turf(holder) diff --git a/maps/submaps/surface_submaps/wilderness/borglab.dmm b/maps/submaps/surface_submaps/wilderness/borglab.dmm index df69eb11da..37194f6374 100644 --- a/maps/submaps/surface_submaps/wilderness/borglab.dmm +++ b/maps/submaps/surface_submaps/wilderness/borglab.dmm @@ -1,5 +1,15 @@ -"ac" = (/obj/machinery/light_construct{dir = 1},/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) +"aa" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/random/maintenance,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"ab" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/random/energy,/turf/simulated/floor/plating,/area/submap/BorgLab) +"ac" = (/obj/machinery/light_construct{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/plating,/area/submap/BorgLab) "ad" = (/obj/effect/floor_decal/sign/c,/turf/simulated/wall/r_wall,/area/submap/BorgLab) +"ae" = (/obj/effect/floor_decal/rust/mono_rusted3,/obj/random/maintenance/research,/mob/living/simple_mob/humanoid/merc/ranged/ionrifle{health = 15; maxHealth = 15},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"af" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/decal/cleanable/generic,/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"ag" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/melee/sword/poi{health = 15; maxHealth = 15},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"ah" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small/emergency/flicker,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/contraband,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"ai" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"aj" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/random/energy/highend,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"ak" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"al" = (/obj/effect/floor_decal/techfloor/orange,/obj/random/contraband,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "bj" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "bz" = (/obj/random/trash,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "bE" = (/obj/structure/closet/secure_closet/chemical{locked = 0},/obj/item/weapon/storage/box/pillbottles,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/tool/screwdriver,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -22,7 +32,6 @@ "gf" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/weapon/cell/super/empty,/turf/simulated/floor/tiled,/area/submap/BorgLab) "gh" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/mob/living/simple_mob/vore/aggressive/corrupthound,/obj/machinery/light_construct{dir = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab) "gN" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) -"gS" = (/obj/effect/floor_decal/rust/mono_rusted3,/mob/living/simple_mob/humanoid/merc/ranged/ionrifle{health = 15; maxHealth = 15},/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab) "he" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "hW" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/tiled/techmaint,/area/submap/BorgLab) "ic" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -38,7 +47,6 @@ "lz" = (/obj/machinery/light_switch,/turf/simulated/wall/r_wall,/area/submap/BorgLab) "lJ" = (/obj/effect/floor_decal/rust,/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/light/small/emergency/flicker{dir = 1},/turf/simulated/floor/plating,/area/submap/BorgLab) "lU" = (/obj/machinery/chem_master,/obj/effect/floor_decal/rust/mono_rusted3,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"lZ" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/mob/living/simple_mob/humanoid/merc/melee/sword/poi{health = 15; maxHealth = 15},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "ma" = (/obj/effect/floor_decal/sign/b,/turf/simulated/wall/r_wall,/area/submap/BorgLab) "mf" = (/obj/machinery/door/airlock/maintenance/common,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/submap/BorgLab) "mi" = (/obj/structure/closet/radiation,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance,/obj/effect/floor_decal/rust/color_rustedcee,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -50,7 +58,6 @@ "ne" = (/obj/machinery/door/window/brigdoor/westright{dir = 1; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "nk" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) "ny" = (/obj/structure/curtain/open/shower,/obj/effect/floor_decal/borderfloor/cee{dir = 4},/obj/effect/floor_decal/rust,/obj/machinery/shower{dir = 4; pixel_x = 5},/turf/simulated/floor/tiled,/area/submap/BorgLab) -"nV" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small/emergency/flicker,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "nW" = (/obj/effect/floor_decal/rust,/obj/structure/table,/obj/effect/floor_decal/rust/mono_rusted3,/turf/simulated/floor/tiled,/area/submap/BorgLab) "oa" = (/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/tiled,/area/submap/BorgLab) "op" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/reinforced,/area/submap/BorgLab) @@ -112,7 +119,14 @@ "GA" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/plating,/area/submap/BorgLab) "GC" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "GS" = (/obj/item/stack/material/gold{amount = 25},/turf/simulated/floor/reinforced,/area/submap/BorgLab) +<<<<<<< HEAD "HA" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +"HA" = (/obj/effect/floor_decal/techfloor/orange,/obj/random/single,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"Ic" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mecha/ripley/deathripley,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +======= +"Ic" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mecha/ripley/deathripley,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 "Jd" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Jh" = (/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard,/obj/effect/floor_decal/rust/mono_rusted3,/obj/random/trash,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Jm" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -121,11 +135,25 @@ "Jr" = (/obj/effect/landmark/loot_spawn/low,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/BorgLab) "JZ" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/railing{dir = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab) "KH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/material/shard{pixel_y = 10},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) +<<<<<<< HEAD "KX" = (/mob/living/simple_mob/vore/aggressive/corrupthound,/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/reinforced,/area/submap/BorgLab) +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +"KX" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/random/single,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +======= +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 "Lr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard{pixel_y = 10},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "Lz" = (/obj/structure/table/standard,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/trash,/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab) +<<<<<<< HEAD "LB" = (/obj/structure/table/rack/shelf/steel,/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/plating,/area/submap/BorgLab) "LC" = (/obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito,/turf/simulated/floor/plating,/area/submap/BorgLab) +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/turf/simulated/floor/plating,/area/submap/BorgLab) +"LC" = (/obj/effect/gibspawner/human,/mob/living/simple_mob/mechanical/mecha/odysseus/murdysseus{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"LL" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/single,/turf/simulated/floor/plating,/area/submap/BorgLab) +======= +"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/turf/simulated/floor/plating,/area/submap/BorgLab) +"LC" = (/obj/effect/gibspawner/human,/mob/living/simple_mob/mechanical/mecha/odysseus/murdysseus{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab) +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 "MT" = (/obj/machinery/space_heater,/obj/effect/floor_decal/rust,/obj/machinery/light/small/emergency/flicker{dir = 4},/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nb" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nj" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) @@ -141,9 +169,17 @@ "OH" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) "OW" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/broken_gun/laserrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Pf" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) +<<<<<<< HEAD "Pk" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) "PW" = (/obj/effect/floor_decal/industrial/warning,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Qe" = (/obj/effect/floor_decal/stairs{dir = 8},/obj/effect/map_effect/interval/sound_emitter/energy_gunfight,/turf/simulated/floor/plating,/area/submap/BorgLab) +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +"Pk" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/random/single,/turf/simulated/floor/plating,/area/submap/BorgLab) +"PW" = (/obj/effect/floor_decal/industrial/warning,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Qe" = (/obj/effect/map_effect/interval/sound_emitter/energy_gunfight,/turf/simulated/floor/plating,/area/submap/BorgLab) +======= +"Qe" = (/obj/effect/map_effect/interval/sound_emitter/energy_gunfight,/turf/simulated/floor/plating,/area/submap/BorgLab) +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 "Qg" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) "Qn" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Qs" = (/obj/effect/floor_decal/industrial/warning,/mob/living/simple_mob/vore/aggressive/corrupthound,/obj/machinery/light/small/emergency/flicker,/turf/simulated/floor/plating,/area/submap/BorgLab) @@ -158,7 +194,6 @@ "SZ" = (/mob/living/simple_mob/vore/aggressive/corrupthound,/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Tj" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/full,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Tp" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) -"Tt" = (/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Tv" = (/obj/effect/floor_decal/sign/a,/turf/simulated/wall/r_wall,/area/submap/BorgLab) "TD" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "TN" = (/obj/structure/closet/l3closet/virology,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) @@ -201,6 +236,7 @@ DFDFsrQgWQWQWQWQWQWQQgQgQgQgQgDFQgQgQgDFQgQgQgiYbLbLbLRPDqsrDFDF DFDFsrQgWQpYtrYyLBWQQgQgQgQgQgQgQgQgQgQgQgQgQgRGRGRGDqDqDqDFDFDF DFsrQgQgWQVHTUOqCzWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGDqRPDFDFDF DFDFQgWQWQWQWQGAWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGDqDFDFDF +<<<<<<< HEAD DFDFQgWQmiUjQWQnDvWQKXxzOWWQuXTDNjWQTDTDbYWQpeWKKXWQWQRGRGDFDFDF DFQgQgWQrPZayISycCWQjfTWnkWQTWGzuQWQTUyBtxWQtxxONjWQWQWQRGQgDFDF srQgQgWQtagfbjicUzWQVcJpPkWQUVVcUMWQVcODVcWQyzVcubWQsKWQWQQgDFDF @@ -208,10 +244,37 @@ DFQgQgWQNsZOCAgNWQWQbIugOHWqYDwtyqWQYDmBYDWqJomBYDlzWQWQWQWQWQDF srQgWQWQZtmfNCWQWQeVRLejPfghyRrarOiiAsAsAsacGCVriSNtmwnylJmwZcsr QgQgWQTjlUCANqOzhWzkNjXGnWLzFvgSJhTttyCSCXththBlYkNvkIYZWRmsQesr QgQgWQDjkjktdTUyZtJZlZnbYZnVFtJmYkPWddoaNbQsFjqWVhSGWQTNDsWQgcDF +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +DFDFQgWQmiUjQWQnDvWQKXxzOWWQuXTDNjWQmwTDbYWQpeWKJrWQWQRGRGDFDFDF +DFQgQgWQrPZayISycCWQjfLCnkWQTWGzuQWQTUyBtxWQWhxOWqWQWQWQRGQgDFDF +srQgQgWQtagfbjicUzWQVcJpPkWQUVVcUMWQVcODVcWQyzububWQsKWQWQQgDFDF +DFQgQgWQNsZOCAgNWQWQbIugOHWQYDwtyqWQYDmBYDWQJomBYDlzWQWQWQWQWQDF +srQgWQWQZtmfNCWQWQeVRLejPfghyRrarOiiAsAsifacGCVriSNtWQnylJWQZcsr +QgQgWQTjlUCANqOzhWzkNjXGnWLzFvgSJhTttyCSCXththBlYkNvkIYZWRmsQesr +QgQgWQDjkjktdTUyZtJZlZnbLLnVFtJmYkPWddoaNbQsFjqWVhSGWQTNDsWQgcDF +======= +DFDFQgWQmiUjQWQnDvWQaaxzOWWQuXTDNjWQmwTDbYWQpeWKJrWQWQRGRGDFDFDF +DFQgQgWQrPZayISycCWQjfLCnkWQTWGzuQWQTUyBtxWQWhxOWqWQWQWQRGQgDFDF +srQgQgWQtagfbjicUzWQVcJpabWQUVVcUMWQVcODVcWQyzububWQsKWQWQQgDFDF +DFQgQgWQNsZOCAgNWQWQbIugOHWQYDwtyqWQYDmBYDWQJomBYDlzWQWQWQWQWQDF +srQgWQWQZtmfNCWQWQeVRLejPfghyRrarOiiAsAsifacGCVriSNtWQnylJWQZcsr +QgQgWQTjlUCANqOzhWzkNjXGnWLzFvaeJhaftyCSCXththBlYkNvkIYZWRmsQesr +QgQgWQDjkjktdTUyZtJZagnbYZahFtJmYkaiddoaNbQsFjqWVhSGWQTNDsWQgcDF +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 QgWQxkCfYkfhGyMTWQWQYDneYDcALrneheadUWdKOHmaKHZqtXTvWQWQWQWQWQDF +<<<<<<< HEAD QgWQjzRtFuZyDWxUqaWQJdJdVUWQJdRLopWQgaTpopWQNBopJdWQLCWQWQQgDFDF QgWQxkxubNdebEZnwqWQtxyBtxWQGSBqtxWQbzAItxWQNjxhtxWQWQWQQgDFDFDF QgQgWQWQWQWQWQWQWQWQSuNjjRWQSZNjcZWQHANjmEWQNjHAHAWQWQRGQgDFDFDF +||||||| parent of 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 +QgWQjzRtFuZyDWxUqaWQJdXDVUWQJdRLopWQgaTpopWQNBopJdWQqWWQWQQgDFDF +QgWQxkxubNdebEZnwqWQtxIctxWQGSBqtxWQbzAItxWQNjxhtxWQWQWQQgDFDFDF +QgQgWQWQWQWQWQWQWQWQSuNjjRWQSZNjcZWQHANjmEWQQzSZHAWQWQRGQgDFDFDF +======= +QgWQjzRtFuZyDWxUqaWQJdajVUWQJdRLopWQgaTpopWQNBopJdWQqWWQWQQgDFDF +QgWQxkxubNdebEZnwqWQtxIctxWQGSBqtxWQbzAItxWQNjxhtxWQWQWQQgDFDFDF +QgQgWQWQWQWQWQWQWQWQSuNjjRWQSZNjcZWQakNjmEWQQzSZalWQWQRGQgDFDFDF +>>>>>>> 41f0031ae6... Merge pull request #11578 from VOREStation/upstream-merge-8281 DFQgQgRGRGRGRGRGRGWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGDFsrDFDF DFsrQgRGRGRGRGRGRGRGWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGRGRPDFsrDF DFDFDFRGRGRGiYJrRGRGRGRGRGRGRGRGRGRGRGRGRGRGRGRGRGRGzebLRPDFDFDF