mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 05:38:15 +01:00
Merge pull request #2368 from CHOMPStationBot/upstream-merge-10831
[MIRROR] Further Map Changes
This commit is contained in:
Razgriz
@@ -79,8 +79,10 @@
|
||||
new /datum/stack_recipe("conveyor switch", /obj/machinery/conveyor_switch, 2, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("floor light fixture frame", /obj/machinery/light_construct/floortube, 2, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("floor lamp fixture frame", /obj/machinery/light_construct/flamp, 2, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("big floor lamp fixture frame", /obj/machinery/light_construct/bigfloorlamp, 3, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"),
|
||||
new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]")
|
||||
|
||||
@@ -49,3 +49,82 @@
|
||||
|
||||
nightshift_range = 6
|
||||
nightshift_power = 0.45
|
||||
|
||||
// Floor tube lights
|
||||
|
||||
/obj/machinery/light/floortube
|
||||
icon_state = "floortube1"
|
||||
base_state = "floortube"
|
||||
desc = "A tube light set into a floor fixture."
|
||||
shows_alerts = FALSE
|
||||
plane = TURF_PLANE
|
||||
layer = ABOVE_TURF_LAYER
|
||||
construct_type = /obj/machinery/light_construct/floortube
|
||||
|
||||
/obj/machinery/light/floortube/flicker
|
||||
auto_flicker = TRUE
|
||||
|
||||
/obj/machinery/light_construct/floortube
|
||||
name = "floor light fixture frame"
|
||||
desc = "A floor light fixture under construction."
|
||||
icon = 'icons/obj/lighting_vr.dmi'
|
||||
icon_state = "floortube-construct-stage1"
|
||||
stage = 1
|
||||
anchored = 0
|
||||
fixture_type = /obj/machinery/light/floortube
|
||||
sheets_refunded = 2
|
||||
|
||||
/obj/machinery/light_construct/floortube/verb/rotate_clockwise()
|
||||
set name = "Rotate Fixture Clockwise"
|
||||
set category = "Object"
|
||||
set src in view(1)
|
||||
|
||||
if (usr.stat || usr.restrained() || anchored)
|
||||
return
|
||||
|
||||
src.set_dir(turn(src.dir, 270))
|
||||
|
||||
/obj/machinery/light_construct/floortube/update_icon()
|
||||
switch(stage)
|
||||
if(1)
|
||||
icon_state = "floortube-construct-stage1"
|
||||
if(2)
|
||||
icon_state = "floortube-construct-stage2"
|
||||
if(3)
|
||||
icon_state = "floortube-empty"
|
||||
|
||||
// Big Flamp
|
||||
|
||||
/obj/machinery/light/bigfloorlamp
|
||||
icon = 'icons/obj/lighting32x64.dmi'
|
||||
icon_state = "big_flamp1"
|
||||
base_state = "big_flamp"
|
||||
desc = "A set of tube lights on a raised, solid fixture"
|
||||
shows_alerts = FALSE
|
||||
density = 1
|
||||
anchored = 1
|
||||
plane = MOB_PLANE
|
||||
layer = ABOVE_MOB_LAYER
|
||||
construct_type = /obj/machinery/light_construct/bigfloorlamp
|
||||
|
||||
/obj/machinery/light/bigfloorlamp/flicker
|
||||
auto_flicker = TRUE
|
||||
|
||||
/obj/machinery/light_construct/bigfloorlamp
|
||||
name = "big floor light fixture frame"
|
||||
desc = "A big floor light fixture under construction."
|
||||
icon = 'icons/obj/lighting32x64.dmi'
|
||||
icon_state = "big_flamp-construct-stage1"
|
||||
stage = 1
|
||||
anchored = 0
|
||||
fixture_type = /obj/machinery/light/bigfloorlamp
|
||||
sheets_refunded = 3
|
||||
|
||||
/obj/machinery/light_construct/bigfloorlamp/update_icon()
|
||||
switch(stage)
|
||||
if(1)
|
||||
icon_state = "big_flamp-construct-stage1"
|
||||
if(2)
|
||||
icon_state = "big_flamp-construct-stage2"
|
||||
if(3)
|
||||
icon_state = "big_flamp-empty"
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@@ -1006,7 +1006,7 @@
|
||||
/area/gateway/arynthilake/engine)
|
||||
"pa" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/monster,
|
||||
/turf/simulated/floor/tiled/eris/white/brown_platform{
|
||||
/turf/simulated/floor/tiled/eris/dark/brown_platform{
|
||||
outdoors = 1
|
||||
},
|
||||
/area/gateway/arynthilake/dome)
|
||||
@@ -1238,6 +1238,11 @@
|
||||
"tN" = (
|
||||
/turf/simulated/floor/outdoors/grass,
|
||||
/area/gateway/arynthilake/caves)
|
||||
"tS" = (
|
||||
/turf/simulated/floor/tiled/eris/dark/brown_platform{
|
||||
outdoors = 1
|
||||
},
|
||||
/area/gateway/arynthilake/dome)
|
||||
"tU" = (
|
||||
/obj/structure/table/steel_reinforced,
|
||||
/obj/machinery/reagentgrinder,
|
||||
@@ -2256,10 +2261,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/cafe,
|
||||
/area/gateway/arynthilake/dome)
|
||||
"TI" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/monster,
|
||||
/turf/simulated/floor/tiled/eris/dark/monofloor,
|
||||
/area/gateway/arynthilake/dome)
|
||||
"TR" = (
|
||||
/turf/unsimulated/wall/planetary/normal{
|
||||
desc = "Why would you want to go this way??!?";
|
||||
@@ -5623,7 +5624,7 @@ qM
|
||||
bc
|
||||
bc
|
||||
bc
|
||||
pb
|
||||
tS
|
||||
yY
|
||||
hw
|
||||
fo
|
||||
@@ -5765,7 +5766,7 @@ aZ
|
||||
bc
|
||||
wm
|
||||
bc
|
||||
pb
|
||||
tS
|
||||
yY
|
||||
hw
|
||||
fo
|
||||
@@ -6333,7 +6334,7 @@ qM
|
||||
At
|
||||
Rm
|
||||
Er
|
||||
pb
|
||||
tS
|
||||
yY
|
||||
Nm
|
||||
Nm
|
||||
@@ -6475,7 +6476,7 @@ qM
|
||||
zQ
|
||||
zQ
|
||||
Er
|
||||
pb
|
||||
tS
|
||||
yY
|
||||
Nm
|
||||
Nm
|
||||
@@ -6611,7 +6612,7 @@ Qr
|
||||
Qr
|
||||
qM
|
||||
vG
|
||||
TI
|
||||
aY
|
||||
Vo
|
||||
qM
|
||||
AQ
|
||||
|
||||
@@ -29,10 +29,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/white/brown_platform,
|
||||
/area/gateway/arynthilake/dome)
|
||||
"bb" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/monster/d,
|
||||
/turf/simulated/floor/tiled/eris/dark/monofloor,
|
||||
/area/gateway/arynthilake/dome)
|
||||
"bj" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -978,6 +974,11 @@
|
||||
outdoors = 1
|
||||
},
|
||||
/area/gateway/arynthilake)
|
||||
"tC" = (
|
||||
/turf/simulated/floor/tiled/eris/dark/brown_platform{
|
||||
outdoors = 1
|
||||
},
|
||||
/area/gateway/arynthilake/dome)
|
||||
"uj" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/humanoid,
|
||||
/turf/simulated/floor/carpet/sblucarpet,
|
||||
@@ -18089,7 +18090,7 @@ Qm
|
||||
Xz
|
||||
Xz
|
||||
HN
|
||||
Kw
|
||||
tC
|
||||
Ia
|
||||
lQ
|
||||
lQ
|
||||
@@ -18225,13 +18226,13 @@ ek
|
||||
ek
|
||||
Qm
|
||||
JT
|
||||
bb
|
||||
JT
|
||||
mq
|
||||
Qm
|
||||
kv
|
||||
kv
|
||||
Fi
|
||||
Kw
|
||||
tC
|
||||
Ia
|
||||
lQ
|
||||
lQ
|
||||
@@ -18373,7 +18374,7 @@ Qm
|
||||
qy
|
||||
RK
|
||||
Fi
|
||||
Kw
|
||||
tC
|
||||
Ia
|
||||
lQ
|
||||
lQ
|
||||
@@ -18941,7 +18942,7 @@ Dk
|
||||
nP
|
||||
nP
|
||||
nP
|
||||
Kw
|
||||
tC
|
||||
Ia
|
||||
nC
|
||||
iG
|
||||
@@ -19083,7 +19084,7 @@ Qm
|
||||
nP
|
||||
nP
|
||||
HN
|
||||
Kw
|
||||
tC
|
||||
Ia
|
||||
nC
|
||||
iG
|
||||
|
||||
@@ -139,10 +139,6 @@
|
||||
/area/gateway/arynthilake/underground/intocave{
|
||||
enter_message = "There is some light filtering from the center of this patch of sand. You could probably climb up from there."
|
||||
})
|
||||
"ni" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/robot,
|
||||
/turf/simulated/floor/tiled/eris/steel/danger,
|
||||
/area/gateway/arynthilake/engine)
|
||||
"oL" = (
|
||||
/turf/simulated/floor/tiled/eris/steel/techfloor,
|
||||
/area/gateway/arynthilake/engine)
|
||||
@@ -197,10 +193,6 @@
|
||||
"wi" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/gateway/arynthilake/underground/maintenance)
|
||||
"wG" = (
|
||||
/obj/random/mob/semirandom_mob_spawner/robot,
|
||||
/turf/simulated/floor/tiled/eris/steel/techfloor,
|
||||
/area/gateway/arynthilake/engine)
|
||||
"xl" = (
|
||||
/obj/random/awayloot,
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
@@ -442,7 +434,6 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/mob/semirandom_mob_spawner/robot,
|
||||
/turf/simulated/floor/tiled/eris/steel/techfloor,
|
||||
/area/gateway/arynthilake/engine)
|
||||
"ZX" = (
|
||||
@@ -915,7 +906,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
cE
|
||||
oZ
|
||||
oZ
|
||||
wi
|
||||
oZ
|
||||
@@ -2026,9 +2017,9 @@ bL
|
||||
bL
|
||||
bL
|
||||
kb
|
||||
ni
|
||||
fM
|
||||
Zl
|
||||
ni
|
||||
fM
|
||||
kb
|
||||
bL
|
||||
bL
|
||||
@@ -3480,7 +3471,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
cE
|
||||
oZ
|
||||
cH
|
||||
Oe
|
||||
wi
|
||||
@@ -4162,7 +4153,7 @@ hy
|
||||
kb
|
||||
gk
|
||||
oL
|
||||
wG
|
||||
oL
|
||||
va
|
||||
kb
|
||||
bL
|
||||
@@ -4882,16 +4873,6 @@ oZ
|
||||
oZ
|
||||
wi
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
cE
|
||||
oZ
|
||||
oZ
|
||||
@@ -4900,6 +4881,16 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
Ej
|
||||
wi
|
||||
bL
|
||||
@@ -5040,7 +5031,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
cE
|
||||
oZ
|
||||
Oe
|
||||
wi
|
||||
@@ -5174,7 +5165,7 @@ wi
|
||||
wi
|
||||
wi
|
||||
wi
|
||||
cE
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
@@ -6057,7 +6048,7 @@ oZ
|
||||
wi
|
||||
oZ
|
||||
oZ
|
||||
ID
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
wi
|
||||
@@ -6471,7 +6462,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
ID
|
||||
oZ
|
||||
Vj
|
||||
oZ
|
||||
oZ
|
||||
@@ -7431,7 +7422,7 @@ wi
|
||||
Mg
|
||||
oZ
|
||||
oZ
|
||||
cE
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
@@ -12571,7 +12562,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
LQ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
@@ -12865,7 +12856,7 @@ oZ
|
||||
oZ
|
||||
Vj
|
||||
oZ
|
||||
LQ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
@@ -14277,7 +14268,7 @@ oZ
|
||||
oZ
|
||||
wi
|
||||
wi
|
||||
LQ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
wi
|
||||
@@ -15390,7 +15381,7 @@ oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
LQ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
wi
|
||||
@@ -19999,7 +19990,7 @@ oZ
|
||||
oZ
|
||||
Vj
|
||||
oZ
|
||||
LQ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
oZ
|
||||
|
||||
+8035
-8048
File diff suppressed because it is too large
Load Diff
+1065
-499
File diff suppressed because it is too large
Load Diff
+240
-218
@@ -1450,15 +1450,9 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acb" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/book/manual/resleeving,
|
||||
/obj/structure/sign/nosmoking_1{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/item/device/sleevemate,
|
||||
/obj/machinery/alarm{
|
||||
pixel_y = 28
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
@@ -1468,6 +1462,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/vending/loadout/uniform,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acc" = (
|
||||
@@ -1480,6 +1475,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/clonepod/transhuman,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acd" = (
|
||||
@@ -1495,6 +1491,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/transhuman/resleever,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"ace" = (
|
||||
@@ -1507,11 +1504,12 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/transhuman/resleever,
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/book/manual/resleeving,
|
||||
/obj/item/device/sleevemate,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acf" = (
|
||||
/obj/machinery/clonepod/transhuman,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
@@ -1521,6 +1519,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/computer/transhuman/resleeving,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acg" = (
|
||||
@@ -1633,9 +1632,6 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acr" = (
|
||||
/obj/machinery/computer/transhuman/resleeving{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
@@ -1648,11 +1644,15 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acs" = (
|
||||
/obj/structure/bed/chair/office/light{
|
||||
dir = 8
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"act" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
@@ -1671,6 +1671,9 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/bed/chair/office/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acv" = (
|
||||
@@ -1791,6 +1794,10 @@
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/flora/pottedplant/decorative,
|
||||
/obj/machinery/alarm{
|
||||
dir = 4;
|
||||
pixel_x = -23
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"acI" = (
|
||||
@@ -2643,7 +2650,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/loadout/uniform,
|
||||
/obj/machinery/organ_printer/flesh,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"adZ" = (
|
||||
@@ -2659,15 +2666,7 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/organ_printer/flesh,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"aea" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/reagent_containers/glass/bottle/biomass{
|
||||
pixel_x = 4;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/glass/bottle/biomass{
|
||||
pixel_x = -4;
|
||||
pixel_y = 8
|
||||
@@ -2680,10 +2679,17 @@
|
||||
pixel_x = 6;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/glass/bottle/biomass{
|
||||
pixel_x = 4;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/device/flashlight/pen{
|
||||
pixel_x = -3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"aea" = (
|
||||
/obj/item/device/radio/intercom{
|
||||
pixel_y = -28
|
||||
},
|
||||
@@ -2694,6 +2700,9 @@
|
||||
/obj/effect/floor_decal/corner/paleblue/border,
|
||||
/obj/effect/floor_decal/borderfloorwhite/corner2,
|
||||
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"aeb" = (
|
||||
@@ -2807,7 +2816,6 @@
|
||||
/turf/simulated/wall,
|
||||
/area/tether/surfacebase/medical/patient_a)
|
||||
"aen" = (
|
||||
/obj/machinery/vending/loadout/uniform,
|
||||
/obj/machinery/camera/network/medbay{
|
||||
dir = 10
|
||||
},
|
||||
@@ -2822,6 +2830,9 @@
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/cable/green,
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/resleeving)
|
||||
"aeo" = (
|
||||
@@ -3853,17 +3864,8 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/outfitting/storage)
|
||||
"afP" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/item/clothing/mask/gas{
|
||||
pixel_x = 3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/clothing/mask/gas,
|
||||
/obj/item/clothing/mask/gas{
|
||||
pixel_x = -3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/machinery/vending/security,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/outfitting/storage)
|
||||
"afQ" = (
|
||||
@@ -4780,11 +4782,20 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/outfitting/storage)
|
||||
"ahw" = (
|
||||
/obj/machinery/vending/security,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/item/clothing/mask/gas{
|
||||
pixel_x = 3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/clothing/mask/gas,
|
||||
/obj/item/clothing/mask/gas{
|
||||
pixel_x = -3;
|
||||
pixel_y = -3
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/outfitting/storage)
|
||||
"ahx" = (
|
||||
@@ -6257,39 +6268,47 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/tether/surfacebase/medical/morgue)
|
||||
"ajK" = (
|
||||
/obj/structure/window/reinforced{
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/vending/snack,
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
/obj/machinery/vending/cigarette,
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/rnd/research)
|
||||
"ajL" = (
|
||||
/obj/machinery/vending/cola/soft,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/coffee,
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/rnd/research)
|
||||
"ajM" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/weeb,
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/rnd/research)
|
||||
"ajN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 8
|
||||
@@ -6690,7 +6709,7 @@
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/machinery/vending/cola,
|
||||
/obj/machinery/vending/cola/soft,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/breakroom)
|
||||
"akx" = (
|
||||
@@ -6709,18 +6728,32 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/breakroom)
|
||||
"akA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vending/coffee,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akB" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/vending/sol,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akC" = (
|
||||
@@ -6826,11 +6859,11 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akI" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
dir = 1
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
@@ -6977,15 +7010,17 @@
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"akS" = (
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/vending/fitness{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/medical,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akT" = (
|
||||
@@ -6996,9 +7031,11 @@
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/vending/coffee{
|
||||
dir = 1
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tetheraid,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akU" = (
|
||||
@@ -7764,7 +7801,6 @@
|
||||
"ama" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/random/mre,
|
||||
/obj/random/coin,
|
||||
/obj/random/maintenance/medical,
|
||||
/obj/random/medical,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
@@ -15262,8 +15298,8 @@
|
||||
/turf/simulated/wall,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"azt" = (
|
||||
/obj/structure/closet/hydrant,
|
||||
/turf/simulated/wall,
|
||||
/obj/machinery/vending/fishing,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"azu" = (
|
||||
/obj/item/clothing/gloves/boxing/blue,
|
||||
@@ -15569,7 +15605,9 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"aAd" = (
|
||||
/obj/machinery/vending/fishing,
|
||||
/obj/structure/closet/hydrant{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"aAe" = (
|
||||
@@ -22945,8 +22983,19 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/rnd/lockers)
|
||||
"aOs" = (
|
||||
/turf/simulated/mineral,
|
||||
/area/tether/surfacebase/emergency_storage/atmos)
|
||||
/obj/structure/bed/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/landmark/start{
|
||||
name = "Scientist"
|
||||
},
|
||||
/obj/machinery/computer/security/telescreen/entertainment{
|
||||
desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?";
|
||||
icon_state = "frame";
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aOt" = (
|
||||
/obj/machinery/portable_atmospherics/powered/pump/filled,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -23585,35 +23634,11 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aPP" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aPQ" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aPR" = (
|
||||
/obj/machinery/computer/security/telescreen/entertainment{
|
||||
desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?";
|
||||
icon_state = "frame";
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aPS" = (
|
||||
/obj/machinery/alarm{
|
||||
dir = 8;
|
||||
@@ -23882,39 +23907,10 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aQC" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aQD" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aQE" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/effect/landmark/start{
|
||||
name = "Roboticist"
|
||||
},
|
||||
@@ -24770,6 +24766,46 @@
|
||||
/obj/random/maintenance/clean,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/lower/south)
|
||||
<<<<<<< HEAD
|
||||
||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR
|
||||
"aSr" = (
|
||||
/obj/machinery/door/airlock{
|
||||
id_tag = "bathroomlock7";
|
||||
name = "Restroom"
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"aSs" = (
|
||||
/obj/structure/toilet,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/button/remote/airlock{
|
||||
id = "bathroomlock9";
|
||||
name = "Surface Security Toilet Lock";
|
||||
pixel_x = -20;
|
||||
pixel_y = -10;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/security/brig/bathroom)
|
||||
=======
|
||||
"aSs" = (
|
||||
/obj/structure/toilet,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/button/remote/airlock{
|
||||
id = "bathroomlock9";
|
||||
name = "Surface Security Toilet Lock";
|
||||
pixel_x = -20;
|
||||
pixel_y = -10;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/security/brig/bathroom)
|
||||
>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR
|
||||
"aSt" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-4"
|
||||
@@ -25244,6 +25280,15 @@
|
||||
/obj/machinery/camera/network/research{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aTx" = (
|
||||
@@ -25254,6 +25299,11 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aTy" = (
|
||||
@@ -25634,53 +25684,11 @@
|
||||
/obj/structure/bookcase/manuals/research_and_development,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aUp" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/cigarette{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/rnd/breakroom)
|
||||
"aUq" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
/obj/machinery/camera/network/research{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/coffee{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/rnd/breakroom)
|
||||
"aUr" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/weeb{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/breakroom)
|
||||
"aUs" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
@@ -43969,9 +43977,9 @@ ann
|
||||
aux
|
||||
ahn
|
||||
ajE
|
||||
awD
|
||||
awD
|
||||
awD
|
||||
aAA
|
||||
aAA
|
||||
aAA
|
||||
awD
|
||||
awY
|
||||
awY
|
||||
@@ -44002,7 +44010,7 @@ aNz
|
||||
aOp
|
||||
aPb
|
||||
aPM
|
||||
aQC
|
||||
aRn
|
||||
aRn
|
||||
aRO
|
||||
aSC
|
||||
@@ -44112,9 +44120,9 @@ auy
|
||||
auA
|
||||
ajE
|
||||
aAA
|
||||
awD
|
||||
aAA
|
||||
awD
|
||||
aAA
|
||||
aAA
|
||||
awD
|
||||
awY
|
||||
aAa
|
||||
@@ -44144,7 +44152,7 @@ aNA
|
||||
aOq
|
||||
aMo
|
||||
aPN
|
||||
aQD
|
||||
aRm
|
||||
aRm
|
||||
aPN
|
||||
aSD
|
||||
@@ -44257,7 +44265,7 @@ aAA
|
||||
axe
|
||||
aAA
|
||||
aAA
|
||||
awD
|
||||
ajE
|
||||
azs
|
||||
aAb
|
||||
aAx
|
||||
@@ -44286,7 +44294,7 @@ aNB
|
||||
aOr
|
||||
aMo
|
||||
aPO
|
||||
aQD
|
||||
aRm
|
||||
aRm
|
||||
aPN
|
||||
aSE
|
||||
@@ -44399,7 +44407,7 @@ aAA
|
||||
aAA
|
||||
aAA
|
||||
aod
|
||||
aAA
|
||||
ajE
|
||||
azt
|
||||
aAc
|
||||
aAy
|
||||
@@ -44541,7 +44549,7 @@ anV
|
||||
aAA
|
||||
aAA
|
||||
aAA
|
||||
awD
|
||||
ajE
|
||||
azs
|
||||
aAd
|
||||
aAz
|
||||
@@ -44567,15 +44575,15 @@ aJO
|
||||
aJO
|
||||
aJO
|
||||
aNC
|
||||
aOs
|
||||
aPc
|
||||
aPQ
|
||||
aND
|
||||
ajK
|
||||
aRm
|
||||
aQF
|
||||
aQF
|
||||
aQF
|
||||
aQF
|
||||
aRm
|
||||
aUp
|
||||
aRm
|
||||
aPJ
|
||||
aYd
|
||||
aWH
|
||||
@@ -44709,9 +44717,9 @@ aKo
|
||||
aKo
|
||||
aJO
|
||||
aNC
|
||||
aOs
|
||||
aPc
|
||||
aPR
|
||||
aND
|
||||
ajL
|
||||
aRm
|
||||
aQF
|
||||
aQF
|
||||
aQF
|
||||
@@ -44851,15 +44859,15 @@ aKo
|
||||
aKo
|
||||
aJO
|
||||
aNC
|
||||
aOs
|
||||
aPc
|
||||
aND
|
||||
ajM
|
||||
aPS
|
||||
aQG
|
||||
aRp
|
||||
aQG
|
||||
aOs
|
||||
aQG
|
||||
aTC
|
||||
aUr
|
||||
aRm
|
||||
aQH
|
||||
aVQ
|
||||
aWJ
|
||||
@@ -45134,7 +45142,7 @@ aKo
|
||||
aKo
|
||||
aKo
|
||||
aJO
|
||||
aND
|
||||
aNC
|
||||
aOt
|
||||
asQ
|
||||
aPT
|
||||
@@ -45276,7 +45284,7 @@ aKo
|
||||
aKo
|
||||
aMr
|
||||
aJO
|
||||
aND
|
||||
aNC
|
||||
aso
|
||||
asR
|
||||
atc
|
||||
@@ -47070,7 +47078,7 @@ aab
|
||||
aab
|
||||
abN
|
||||
acc
|
||||
acs
|
||||
aiV
|
||||
aiV
|
||||
adr
|
||||
adZ
|
||||
@@ -50072,11 +50080,25 @@ aar
|
||||
aar
|
||||
aiK
|
||||
aiK
|
||||
<<<<<<< HEAD
|
||||
akH
|
||||
akR
|
||||
akR
|
||||
akR
|
||||
akR
|
||||
||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR
|
||||
aSr
|
||||
aiK
|
||||
aiK
|
||||
aiK
|
||||
aiK
|
||||
=======
|
||||
aiK
|
||||
aiK
|
||||
aiK
|
||||
aiK
|
||||
aiK
|
||||
>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR
|
||||
aiK
|
||||
auX
|
||||
asV
|
||||
@@ -50212,7 +50234,7 @@ ajR
|
||||
aar
|
||||
abF
|
||||
aer
|
||||
ajK
|
||||
aiK
|
||||
akA
|
||||
akI
|
||||
akS
|
||||
@@ -50354,9 +50376,9 @@ ajS
|
||||
aar
|
||||
abF
|
||||
aer
|
||||
ajL
|
||||
aiK
|
||||
akB
|
||||
akJ
|
||||
acs
|
||||
akT
|
||||
akW
|
||||
akJ
|
||||
@@ -50496,7 +50518,7 @@ akE
|
||||
aar
|
||||
abH
|
||||
agP
|
||||
ajM
|
||||
aiK
|
||||
akC
|
||||
akK
|
||||
akJ
|
||||
@@ -51908,7 +51930,7 @@ abn
|
||||
adt
|
||||
adt
|
||||
abn
|
||||
aab
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
bgU
|
||||
@@ -52045,12 +52067,12 @@ adt
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
bgU
|
||||
@@ -52188,12 +52210,12 @@ aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aab
|
||||
aeG
|
||||
aeG
|
||||
aeG
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
abn
|
||||
bgU
|
||||
bhI
|
||||
|
||||
+2916
-1823
File diff suppressed because it is too large
Load Diff
+3238
-12
File diff suppressed because it is too large
Load Diff
+160
-139
@@ -2659,7 +2659,7 @@
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/closet/emcloset,
|
||||
/obj/machinery/vending/cigarette,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/station/docks)
|
||||
"afG" = (
|
||||
@@ -3927,12 +3927,8 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/engine_airlock)
|
||||
"aiA" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor,
|
||||
/obj/structure/sign/department/mail,
|
||||
/turf/simulated/wall,
|
||||
/area/maintenance/cargo)
|
||||
"aiC" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -7117,9 +7113,7 @@
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"apX" = (
|
||||
/obj/machinery/vending/snack{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/snack,
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/break_room)
|
||||
@@ -7407,9 +7401,6 @@
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/engineering/break_room)
|
||||
"aqH" = (
|
||||
/obj/machinery/vending/coffee{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/break_room)
|
||||
@@ -7977,10 +7968,8 @@
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/vending/cigarette{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/obj/structure/table/reinforced,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/break_room)
|
||||
"asv" = (
|
||||
@@ -8198,19 +8187,10 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/engineering/break_room)
|
||||
"ate" = (
|
||||
/obj/machinery/door/airlock/maintenance/cargo{
|
||||
req_access = list(50);
|
||||
req_one_access = list(48)
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/quartermaster/delivery)
|
||||
/obj/machinery/vending/cigarette,
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/break_room)
|
||||
"atf" = (
|
||||
/obj/machinery/atmospherics/binary/pump{
|
||||
dir = 1
|
||||
@@ -8278,17 +8258,12 @@
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/engineering/workshop)
|
||||
"atm" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/camera/network/cargo,
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 1
|
||||
},
|
||||
@@ -8298,12 +8273,18 @@
|
||||
/obj/structure/sign/poster{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 1;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
"atn" = (
|
||||
/obj/structure/disposalpipe/sortjunction/untagged/flipped{
|
||||
dir = 1
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/machinery/camera/network/cargo,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
"atr" = (
|
||||
@@ -8855,7 +8836,11 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/engine_eva)
|
||||
"avt" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/disposalpipe/sortjunction/flipped{
|
||||
dir = 1;
|
||||
name = "Sorting Office";
|
||||
sortType = "Sorting Office"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
"avv" = (
|
||||
@@ -10361,10 +10346,6 @@
|
||||
/turf/simulated/wall,
|
||||
/area/quartermaster/delivery)
|
||||
"aAF" = (
|
||||
/obj/structure/disposalpipe/junction{
|
||||
dir = 2;
|
||||
icon_state = "pipe-j2"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
@@ -10375,13 +10356,15 @@
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
"aAG" = (
|
||||
/obj/structure/disposalpipe/sortjunction/flipped{
|
||||
dir = 1;
|
||||
name = "Sorting Office";
|
||||
sortType = "Sorting Office"
|
||||
/obj/structure/disposalpipe/sortjunction/untagged/flipped{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
@@ -18307,15 +18290,9 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/hallway)
|
||||
"ejO" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/obj/machinery/camera/network/civilian,
|
||||
/obj/machinery/vending/tool,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"ekh" = (
|
||||
@@ -19327,6 +19304,24 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/excursion/general)
|
||||
"fmg" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/camera/network/tether{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/maintenance/cargo)
|
||||
"fpk" = (
|
||||
/turf/simulated/floor/airless,
|
||||
/area/tether/outpost/solars_outside{
|
||||
@@ -19526,20 +19521,24 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/office)
|
||||
"fxR" = (
|
||||
/obj/machinery/alarm{
|
||||
dir = 4;
|
||||
pixel_x = -23
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/vending/coffee{
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 9
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 9
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/obj/machinery/vending/coffee,
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/quartermaster/foyer)
|
||||
"fyF" = (
|
||||
/obj/machinery/power/apc{
|
||||
@@ -20632,7 +20631,7 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/excursion/general)
|
||||
"gKa" = (
|
||||
/obj/structure/reagent_dispensers/foam,
|
||||
/obj/machinery/lapvend,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"gKH" = (
|
||||
@@ -20884,10 +20883,10 @@
|
||||
/area/tether/exploration)
|
||||
"gWp" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 1
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 1
|
||||
@@ -20895,10 +20894,12 @@
|
||||
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 4
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/foyer)
|
||||
"gWD" = (
|
||||
@@ -23265,9 +23266,6 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/storage)
|
||||
"iPR" = (
|
||||
/obj/machinery/lapvend{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"iRq" = (
|
||||
@@ -25382,26 +25380,10 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/tcomms)
|
||||
"kSd" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/camera/network/tether{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vending/fitness{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vending/coffee,
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/foyer)
|
||||
/area/engineering/break_room)
|
||||
"kSu" = (
|
||||
/obj/structure/closet,
|
||||
/obj/random/tool,
|
||||
@@ -25810,6 +25792,7 @@
|
||||
layer = 3.3;
|
||||
pixel_x = 26
|
||||
},
|
||||
/obj/random/tech_supply,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"ljB" = (
|
||||
@@ -27194,9 +27177,18 @@
|
||||
/turf/simulated/mineral/vacuum,
|
||||
/area/maintenance/station/cargo)
|
||||
"mtI" = (
|
||||
/obj/machinery/vending/tool{
|
||||
dir = 4
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/structure/cable/green{
|
||||
d2 = 2;
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/random/tech_supply,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"mtR" = (
|
||||
@@ -29505,6 +29497,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"oFh" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/maintenance/cargo{
|
||||
req_access = list(50);
|
||||
req_one_access = list(48)
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/quartermaster/delivery)
|
||||
"oFl" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 8
|
||||
@@ -30564,8 +30565,14 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/belterdock/gear)
|
||||
"qfK" = (
|
||||
/obj/structure/sign/department/mail,
|
||||
/turf/simulated/wall,
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/closet/emcloset,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/maintenance/cargo)
|
||||
"qgB" = (
|
||||
/obj/structure/cable/green{
|
||||
@@ -33145,6 +33152,19 @@
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/hallway)
|
||||
"sZb" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/disposalpipe/junction{
|
||||
dir = 2;
|
||||
icon_state = "pipe-j2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/delivery)
|
||||
"tal" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/ai_monitored/storage/eva)
|
||||
@@ -33468,17 +33488,12 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/hallway)
|
||||
"tqt" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey/border{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/vending/cigarette{
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/foyer)
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/cargo)
|
||||
"trn" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
@@ -33548,11 +33563,24 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/station/atrium)
|
||||
"tvd" = (
|
||||
/obj/machinery/light/small{
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/simulated/floor,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/vending/fitness,
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/maintenance/cargo)
|
||||
"txf" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -34325,6 +34353,7 @@
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/item/weapon/storage/box/lights/mixed,
|
||||
/obj/random/tech_supply,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"uuz" = (
|
||||
@@ -35423,12 +35452,15 @@
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/tether/exploration)
|
||||
"vLU" = (
|
||||
/obj/machinery/vending/assist{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"vMe" = (
|
||||
@@ -36325,6 +36357,7 @@
|
||||
dir = 8;
|
||||
pixel_x = 25
|
||||
},
|
||||
/obj/random/tech_supply,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"xbp" = (
|
||||
@@ -36406,23 +36439,17 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ai_server_room)
|
||||
"xeo" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_y = 28
|
||||
},
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/structure/cable/green{
|
||||
d2 = 2;
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/machinery/vending/assist,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"xeG" = (
|
||||
@@ -36512,13 +36539,7 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/station/cargo)
|
||||
"xjc" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/random/tech_supply,
|
||||
/obj/structure/reagent_dispensers/foam,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/storage/tools)
|
||||
"xjm" = (
|
||||
@@ -45959,7 +45980,7 @@ aJs
|
||||
anZ
|
||||
any
|
||||
apg
|
||||
apQ
|
||||
ate
|
||||
ajF
|
||||
asp
|
||||
atJ
|
||||
@@ -46101,7 +46122,7 @@ aJs
|
||||
afq
|
||||
tpV
|
||||
apg
|
||||
apQ
|
||||
kSd
|
||||
apQ
|
||||
asx
|
||||
apQ
|
||||
@@ -47121,13 +47142,13 @@ lLv
|
||||
bVP
|
||||
ain
|
||||
tUh
|
||||
wBw
|
||||
wBw
|
||||
axE
|
||||
aAD
|
||||
tqt
|
||||
kLG
|
||||
cFG
|
||||
oFh
|
||||
atm
|
||||
aAF
|
||||
avM
|
||||
sZb
|
||||
mKD
|
||||
avM
|
||||
awj
|
||||
@@ -47263,10 +47284,10 @@ ago
|
||||
jjR
|
||||
aCq
|
||||
tUh
|
||||
tvd
|
||||
kLG
|
||||
tUh
|
||||
tUh
|
||||
aiA
|
||||
ate
|
||||
aAD
|
||||
atn
|
||||
aAG
|
||||
avt
|
||||
@@ -47405,8 +47426,8 @@ agw
|
||||
air
|
||||
aAw
|
||||
tUh
|
||||
tUh
|
||||
tUh
|
||||
tvd
|
||||
fmg
|
||||
qfK
|
||||
aAD
|
||||
oUP
|
||||
@@ -47548,8 +47569,8 @@ tmf
|
||||
ioz
|
||||
hLg
|
||||
fxR
|
||||
kSd
|
||||
tqt
|
||||
wnV
|
||||
aVY
|
||||
kUL
|
||||
atr
|
||||
atV
|
||||
|
||||
Reference in New Issue
Block a user