Merge remote-tracking branch 'origin/master' into hardsync-1.5

This commit is contained in:
Letter N
2021-02-23 11:01:42 +08:00
223 changed files with 1145 additions and 605 deletions

View File

@@ -14,7 +14,7 @@
"ai" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/closet/crate/secure/loot,
/obj/item/clothing/head/collectable/paper,
/obj/item/clothing/head/sombrero/shamebrero,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"ak" = (
@@ -51,6 +51,10 @@
/obj/machinery/jukebox,
/turf/open/floor/wood,
/area/awaymission/jungleresort)
"az" = (
/obj/structure/stone_tile/center,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"aA" = (
/obj/machinery/light,
/obj/structure/chair/wood{
@@ -199,7 +203,7 @@
/area/awaymission/jungleresort)
"cK" = (
/obj/structure/closet/crate,
/obj/item/clothing/head/collectable/tophat,
/obj/item/clothing/head/collectable/petehat/gang,
/turf/open/floor/plating/rust,
/area/awaymission/jungleresort)
"cT" = (
@@ -217,6 +221,11 @@
/obj/structure/flora/rock,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"cY" = (
/obj/structure/flora/grass/jungle/b,
/mob/living/simple_animal/hostile/gorilla/jungle,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"dm" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/beer,
@@ -274,7 +283,6 @@
dir = 9
},
/obj/structure/stone_tile/center/cracked,
/obj/item/ammo_casing/shotgun/buckshot,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"eB" = (
@@ -405,10 +413,14 @@
/obj/item/toy/figure/chef,
/turf/open/floor/wood,
/area/awaymission/jungleresort)
"gC" = (
/obj/item/clothing/head/rice_hat/cursed,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"gK" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot,
/obj/item/ammo_box/magazine/toy/m762/riot,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
/obj/item/ammo_box/magazine/toy/smgm45,
/turf/open/floor/wood,
/area/awaymission/jungleresort)
"gL" = (
@@ -580,6 +592,9 @@
dir = 1
},
/obj/structure/stone_tile/center/burnt,
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 6
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"iE" = (
@@ -660,6 +675,11 @@
},
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"jw" = (
/obj/structure/stone_tile/surrounding/cracked,
/obj/structure/stone_tile/center/burnt,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"jy" = (
/obj/structure/flora/grass/jungle/b,
/obj/effect/turf_decal/weather/dirt{
@@ -674,6 +694,16 @@
},
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"jD" = (
/obj/structure/stone_tile/surrounding_tile/cracked,
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 9
},
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 6
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"jF" = (
/obj/structure/flora/tree/jungle,
/obj/machinery/light,
@@ -798,6 +828,11 @@
},
/turf/open/floor/wood,
/area/awaymission/jungleresort)
"lF" = (
/obj/structure/flora/junglebush,
/mob/living/simple_animal/hostile/gorilla/jungle,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"lJ" = (
/obj/structure/flora/junglebush/c,
/obj/machinery/light{
@@ -869,6 +904,8 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/item/clothing/glasses/meson/engine,
/obj/item/storage/belt/utility,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"mE" = (
@@ -986,6 +1023,10 @@
/obj/item/toy/crayon/spraycan,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"ou" = (
/obj/item/clothing/glasses/meson,
/turf/open/floor/plating/asteroid,
/area/awaymission/jungleresort)
"ow" = (
/obj/structure/flora/tree/jungle,
/obj/effect/turf_decal/weather/dirt,
@@ -993,7 +1034,7 @@
/area/awaymission/jungleresort)
"oW" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/head/collectable/petehat/gang,
/obj/item/clothing/head/collectable/tophat,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"oX" = (
@@ -1075,7 +1116,7 @@
"qi" = (
/obj/effect/turf_decal/sand/plating,
/obj/structure/closet/crate/secure/loot,
/obj/item/clothing/head/collectable/beret,
/obj/item/clothing/head/rice_hat/cursed,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"qr" = (
@@ -1255,6 +1296,15 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"tm" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 9
},
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 1
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"tn" = (
/obj/structure/flora/rock/pile,
/obj/machinery/light{
@@ -1478,6 +1528,15 @@
/obj/effect/turf_decal/weather/dirt,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"vz" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 6
},
/obj/structure/stone_tile/surrounding/cracked{
dir = 1
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"vK" = (
/obj/structure/flora/ausbushes/stalkybush,
/turf/open/floor/grass,
@@ -1497,6 +1556,10 @@
},
/turf/open/floor/wood,
/area/awaymission/jungleresort)
"wd" = (
/obj/item/storage/bag/ore,
/turf/open/floor/plating/asteroid,
/area/awaymission/jungleresort)
"wj" = (
/obj/machinery/light{
dir = 1
@@ -1535,7 +1598,7 @@
/area/awaymission/jungleresort)
"ww" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/hooded/wintercoat/captain,
/obj/item/clothing/suit/hooded/wintercoat/captain/jungle,
/turf/open/floor/carpet/blue,
/area/awaymission/jungleresort)
"wF" = (
@@ -1655,6 +1718,10 @@
},
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"yw" = (
/obj/item/pickaxe/mini,
/turf/open/floor/plating/asteroid,
/area/awaymission/jungleresort)
"yx" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/effect/turf_decal/weather/dirt{
@@ -1814,6 +1881,13 @@
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"Ad" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 1
},
/obj/structure/stone_tile/surrounding_tile/cracked,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"Ag" = (
/obj/machinery/door/airlock/wood{
name = "Resort Office"
@@ -2016,6 +2090,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced,
/turf/open/floor/carpet,
/area/awaymission/jungleresort)
"CV" = (
@@ -2329,6 +2404,9 @@
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 9
},
/obj/structure/stone_tile/surrounding/cracked{
dir = 1
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"GN" = (
@@ -2368,6 +2446,10 @@
},
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"Hr" = (
/obj/structure/stone_tile/surrounding/cracked,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"Hs" = (
/obj/structure/flora/ausbushes/stalkybush,
/obj/machinery/light,
@@ -2410,6 +2492,10 @@
},
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"HT" = (
/mob/living/simple_animal/hostile/gorilla/jungle,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"Ih" = (
/turf/open/floor/plating,
/area/awaymission/jungleresort)
@@ -2897,6 +2983,15 @@
/obj/item/storage/book/bible,
/turf/open/floor/carpet,
/area/awaymission/jungleresort)
"ON" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/remains/human,
/obj/structure/stone_tile/burnt,
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 1
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"OU" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/floor/grass,
@@ -3030,7 +3125,7 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/structure/stone_tile/surrounding/cracked,
/obj/structure/stone_tile/center/burnt,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"QA" = (
@@ -3091,6 +3186,7 @@
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/uranium,
/obj/item/clothing/glasses/meson/engine,
/obj/item/storage/belt/utility,
/turf/open/floor/plating,
/area/awaymission/jungleresort)
"Rm" = (
@@ -3224,11 +3320,8 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/stone_tile/surrounding/cracked,
/obj/item/gun/ballistic/shotgun/sc_pump,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet,
/obj/item/ammo_casing/shotgun/buckshot,
/obj/item/ammo_casing/shotgun/buckshot,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"SV" = (
@@ -3246,6 +3339,7 @@
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 5
},
/obj/structure/stone_tile/burnt,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"Ta" = (
@@ -3290,6 +3384,7 @@
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 9
},
/obj/structure/stone_tile/center,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"TG" = (
@@ -3508,7 +3603,7 @@
/area/awaymission/jungleresort)
"WD" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/head/collectable/slime,
/obj/item/clothing/head/collectable/beret,
/turf/open/floor/plating/rust,
/area/awaymission/jungleresort)
"WE" = (
@@ -3573,6 +3668,11 @@
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"Xu" = (
/obj/structure/flora/junglebush/c,
/mob/living/simple_animal/hostile/gorilla/jungle,
/turf/open/floor/grass,
/area/awaymission/jungleresort)
"Xz" = (
/turf/open/floor/carpet/red,
/area/awaymission/jungleresort)
@@ -3639,6 +3739,7 @@
"Ye" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/toy/figure/syndie,
/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted,
/turf/open/floor/carpet/red,
/area/awaymission/jungleresort)
"Yf" = (
@@ -3748,6 +3849,9 @@
dir = 8
},
/obj/structure/stone_tile/surrounding_tile/burnt,
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 9
},
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/jungleresort)
"ZH" = (
@@ -6362,8 +6466,8 @@ AR
AR
AR
AR
AR
oZ
jD
aL
fy
Dr
@@ -6513,8 +6617,8 @@ AR
AR
AR
AR
AR
AR
oZ
Gk
AC
GD
oZ
@@ -6668,8 +6772,8 @@ AR
oZ
iv
Qz
AR
AR
tm
oZ
AR
AR
AR
@@ -6819,6 +6923,7 @@ AR
oZ
wS
SZ
Hr
oZ
AR
AR
@@ -6834,7 +6939,6 @@ AR
AR
AR
AR
AR
rd
AF
YQ
@@ -6967,11 +7071,11 @@ AR
AR
AR
AR
AR
AR
yJ
oZ
AR
aL
yJ
TD
oZ
AR
AR
AR
@@ -7122,6 +7226,8 @@ AR
AR
oZ
Yp
az
ON
oZ
AR
AR
@@ -7137,8 +7243,6 @@ AR
AR
AR
AR
AR
AR
YQ
YM
cn
@@ -7166,7 +7270,7 @@ YQ
YQ
CN
YQ
YQ
HT
rd
YQ
YQ
@@ -7274,6 +7378,8 @@ AR
AR
oZ
TD
Ad
jw
oZ
AR
AR
@@ -7289,8 +7395,6 @@ AR
AR
AR
AR
AR
AR
YQ
aP
Wl
@@ -7427,7 +7531,7 @@ AR
oZ
aL
Xs
AR
oZ
AR
AR
AR
@@ -7579,7 +7683,7 @@ AR
AR
oZ
tH
AR
vz
AR
AR
AR
@@ -8261,7 +8365,7 @@ YQ
YQ
MW
CN
AF
lF
Wl
YQ
YQ
@@ -9006,7 +9110,7 @@ YQ
CN
YQ
YQ
YQ
HT
Wl
aP
YQ
@@ -9807,7 +9911,7 @@ YQ
YQ
YQ
YQ
YQ
HT
YQ
YQ
YQ
@@ -10950,7 +11054,7 @@ YQ
YQ
Fz
wH
YQ
HT
YQ
YQ
VU
@@ -11390,9 +11494,9 @@ AR
AR
AR
io
uh
pQ
pQ
VJ
AV
AV
QA
dF
io
@@ -11544,8 +11648,8 @@ AR
AR
AR
AR
AR
pQ
io
VJ
AV
QA
QA
@@ -13724,7 +13828,7 @@ io
du
YF
io
io
gC
io
io
ia
@@ -14218,7 +14322,7 @@ YQ
cn
ZV
MW
YQ
HT
rd
aP
vK
@@ -15051,7 +15155,7 @@ Wl
YQ
YQ
YQ
YQ
HT
rd
YQ
YQ
@@ -18177,8 +18281,8 @@ YQ
YQ
YQ
AF
AR
AR
yw
ou
AR
AR
AR
@@ -18329,9 +18433,9 @@ YQ
YM
Wl
Pg
AR
AR
AR
wd
Qp
Qp
AR
AR
AR
@@ -20699,7 +20803,7 @@ YQ
YQ
YQ
MW
rd
cY
Wl
YQ
YQ
@@ -22732,7 +22836,7 @@ AF
ZV
YQ
YQ
cn
Xu
YQ
YQ
YQ
@@ -23322,7 +23426,7 @@ YQ
CN
VU
dY
YQ
HT
YQ
aP
YQ
@@ -23577,7 +23681,7 @@ YQ
YQ
YQ
vK
YQ
HT
kr
YQ
AF
@@ -26562,3 +26666,4 @@ bG
bG
bG
"}