This commit is contained in:
Ghommie
2020-05-24 04:00:51 +02:00
423 changed files with 6450 additions and 3566 deletions
@@ -476,7 +476,7 @@
},
/obj/item/storage/bag/plants/portaseeder,
/obj/item/seeds/cotton,
/obj/item/seeds/cotton,
/obj/item/seeds/cotton/durathread,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"bk" = (
+204 -221
View File
@@ -23646,7 +23646,10 @@
/area/crew_quarters/bar/atrium)
"aTH" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/coffee,
/obj/item/reagent_containers/food/drinks/coffee{
pixel_x = -4;
pixel_y = 2
},
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -60673,10 +60676,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -60691,10 +60690,6 @@
dir = 4
},
/obj/machinery/light,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -62744,43 +62739,36 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cct" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
/obj/structure/table/wood/fancy,
/obj/machinery/door/window{
name = "Secure Art Exhibition"
},
/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
/turf/open/floor/plasteel/dark,
/area/library)
"ccu" = (
/obj/machinery/light/small{
dir = 1
},
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
/obj/machinery/newscaster{
/obj/structure/sign/painting/library_secure{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
/turf/open/floor/carpet,
/area/library)
"ccu" = (
/obj/structure/table/wood/fancy,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
/obj/structure/window/reinforced,
/obj/structure/sign/painting/library_secure{
pixel_y = 32
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/carpet,
/area/library)
"ccv" = (
/obj/machinery/computer/libraryconsole,
/obj/structure/table/wood,
/turf/open/floor/plasteel/dark,
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/obj/machinery/camera{
c_tag = "Library - Aft";
dir = 2;
name = "library camera"
},
/turf/open/floor/wood,
/area/library)
"ccw" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -63922,7 +63910,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
/obj/effect/landmark/start/librarian,
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/dark,
/area/library)
"ceg" = (
@@ -63935,71 +63923,21 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/library)
"cei" = (
/obj/structure/chair/comfy/black{
dir = 8
},
/obj/machinery/newscaster{
pixel_x = 32
},
/obj/machinery/camera{
c_tag = "Library - Fore";
dir = 8;
name = "library camera"
},
/turf/open/floor/plasteel/dark,
/turf/open/floor/plasteel/grimy,
/area/library)
"cej" = (
/obj/machinery/photocopier,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/library)
"cek" = (
/obj/structure/chair/office/dark{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/dark,
/obj/effect/landmark/start/librarian,
/turf/open/floor/plasteel/grimy,
/area/library)
"cel" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/pen,
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
/obj/structure/chair/sofa/right{
icon_state = "sofaend_right";
dir = 8
},
/turf/open/floor/plasteel/dark,
/obj/structure/sign/painting/library{
pixel_x = 32
},
/turf/open/floor/wood,
/area/library)
"cem" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -65176,34 +65114,16 @@
},
/turf/open/floor/plasteel/grimy,
/area/library)
"cfY" = (
/obj/item/kirbyplants/random,
/obj/machinery/light/small{
dir = 4
"cfZ" = (
/obj/item/radio/intercom{
name = "Station Intercom";
pixel_x = -26
},
/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/wood,
/area/library)
"cfZ" = (
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall,
/area/library)
"cga" = (
/obj/machinery/door/morgue{
name = "Private Study"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/library)
"cgb" = (
/obj/structure/sign/plaques/kiddie/library{
pixel_x = -32
@@ -66351,61 +66271,28 @@
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
/area/library)
"chQ" = (
/obj/machinery/bookbinder,
/turf/open/floor/wood,
/area/library)
"chR" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/structure/bookcase/random,
/turf/open/floor/wood,
/area/library)
"chS" = (
/obj/structure/chair/comfy/brown,
/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/library)
"chT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/library)
"chU" = (
/obj/machinery/photocopier,
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"chV" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/newscaster{
pixel_y = 32
pixel_x = -32
},
/obj/structure/bookcase/manuals/research_and_development,
/obj/machinery/camera{
c_tag = "Library";
name = "library camera"
},
/turf/open/floor/wood,
/turf/open/floor/plasteel/dark,
/area/library)
"chW" = (
/obj/structure/chair/comfy/brown,
/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
/turf/open/floor/wood,
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/grimy,
/area/library)
"chX" = (
/obj/machinery/vending/coffee,
/turf/open/floor/wood,
/obj/structure/table/wood,
/obj/item/newspaper{
pixel_x = 3;
pixel_y = 3
},
/obj/item/reagent_containers/food/drinks/coffee{
pixel_x = -4;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/library)
"chY" = (
/obj/machinery/door/poddoor/shutters/preopen{
@@ -67294,10 +67181,6 @@
},
/turf/open/floor/plasteel/grimy,
/area/library)
"cju" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/grimy,
/area/library)
"cjv" = (
/obj/machinery/door/airlock/public/glass{
name = "Library Access"
@@ -68920,10 +68803,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
/area/library)
"cmv" = (
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/library)
"cmw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/extinguisher_cabinet{
@@ -69800,7 +69679,7 @@
/turf/open/floor/wood,
/area/library)
"cnP" = (
/obj/structure/bookcase/manuals/medical,
/obj/structure/bookcase/random,
/turf/open/floor/wood,
/area/library)
"cnQ" = (
@@ -74568,8 +74447,6 @@
/area/library)
"cwr" = (
/obj/structure/easel,
/obj/item/canvas/twentythreeXnineteen,
/obj/item/canvas/twentythreeXtwentythree,
/obj/item/canvas/twentythreeXtwentythree,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -78500,7 +78377,10 @@
pixel_x = 3;
pixel_y = 3
},
/obj/item/newspaper,
/obj/item/newspaper{
pixel_x = 3;
pixel_y = 3
},
/obj/machinery/status_display/evac{
pixel_x = -32
},
@@ -80213,7 +80093,10 @@
pixel_x = 7;
pixel_y = 11
},
/obj/item/newspaper,
/obj/item/newspaper{
pixel_x = 3;
pixel_y = 3
},
/obj/item/pen/red,
/turf/open/floor/wood{
icon_state = "wood-broken2"
@@ -110110,7 +109993,10 @@
pixel_x = 3;
pixel_y = 3
},
/obj/item/newspaper,
/obj/item/newspaper{
pixel_x = 3;
pixel_y = 3
},
/turf/open/floor/plating,
/area/security/detectives_office/private_investigators_office)
"dFu" = (
@@ -110973,7 +110859,10 @@
/area/crew_quarters/theatre/abandoned)
"dGH" = (
/obj/structure/table/wood,
/obj/item/newspaper,
/obj/item/newspaper{
pixel_x = 3;
pixel_y = 3
},
/obj/item/clothing/head/bowler,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -125489,6 +125378,17 @@
/obj/structure/closet/crate/coffin,
/turf/open/floor/plating,
/area/chapel/office)
"gjg" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"gmj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
@@ -125557,6 +125457,12 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"gOM" = (
/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/wood,
/area/library)
"gPv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -125856,6 +125762,12 @@
/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"jqs" = (
/obj/structure/sign/painting/library{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"jqM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -125974,6 +125886,17 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/mixing)
"jVB" = (
/obj/structure/table/wood/fancy,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/sign/painting/library_secure{
pixel_y = 32
},
/turf/open/floor/carpet,
/area/library)
"kam" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
@@ -126386,6 +126309,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/research)
"mRS" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/wood,
/area/library)
"mWZ" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -126425,6 +126354,17 @@
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"oek" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/camera{
c_tag = "Library - Aft";
dir = 2;
name = "library camera"
},
/turf/open/floor/plasteel/grimy,
/area/library)
"oHk" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126640,6 +126580,10 @@
},
/turf/open/floor/plating,
/area/science/research/abandoned)
"pLF" = (
/obj/machinery/light,
/turf/open/floor/wood,
/area/library)
"pQm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
@@ -126929,6 +126873,15 @@
"tCh" = (
/turf/closed/wall,
/area/science/misc_lab)
"tDx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/library)
"tMk" = (
/turf/open/floor/plasteel/white/side{
dir = 10
@@ -127085,6 +127038,16 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
"vLX" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/structure/sign/plaques/kiddie/library{
pixel_x = 32;
pixel_y = 32
},
/turf/open/floor/plasteel/grimy,
/area/library)
"wei" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -127104,6 +127067,19 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"wEg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"wFu" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -127292,6 +127268,13 @@
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
/area/space)
"yin" = (
/obj/structure/chair/sofa/left{
icon_state = "sofaend_left";
dir = 8
},
/turf/open/floor/wood,
/area/library)
"yiv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -158292,7 +158275,7 @@ ccq
ceg
ccq
chO
ceg
vLX
ckQ
cmr
ccq
@@ -158545,11 +158528,11 @@ bUt
bWD
bYM
caH
ccr
cwq
ceh
cfY
chP
cjt
caG
caG
oek
ckR
cms
cnO
@@ -158800,12 +158783,12 @@ bDl
bDl
bUu
bWE
bYO
gjg
caG
ccs
cei
mRS
cxV
cfZ
chQ
caG
cjt
ckR
cms
@@ -159059,11 +159042,11 @@ bUv
bWC
bYR
caG
jqs
cxV
gOM
caG
caG
caG
chR
cjt
tDx
ckR
cmt
cmt
@@ -159316,10 +159299,10 @@ bUq
bWI
bYM
caG
cct
cej
jqs
cxV
gOM
caG
chS
cjt
ckR
cms
@@ -159573,11 +159556,11 @@ bUq
bWD
bYM
caG
ccu
cek
cga
chT
cju
jqs
cxV
gOM
caG
cjt
ckR
cms
cnQ
@@ -159831,9 +159814,9 @@ bWD
bYM
caG
ccv
cel
cxV
pLF
caG
chU
cjt
ckR
xuu
@@ -160087,9 +160070,9 @@ bUq
bWD
bYS
caG
caG
caG
caG
jVB
cxV
cmt
chV
cjt
ckT
@@ -160346,7 +160329,7 @@ bYM
caG
cct
cej
caG
cxV
chW
cjt
ckR
@@ -160602,12 +160585,12 @@ bWD
bYM
caG
ccu
cek
cga
chT
cju
cmt
cmt
ccr
cjt
ckR
cmv
cmt
cnU
cpy
cqT
@@ -160856,11 +160839,11 @@ bQu
bQv
bUr
bWD
bYM
wEg
caG
ccv
chP
cel
caG
yin
chX
cjt
ckR
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -3807,7 +3807,8 @@
movement_type = 1;
name = "Sergeant Araneus";
real_name = "Sergeant Araneus";
response_help = "pets";
response_help_continuous = "pets";
response_help_simple = "pet";
turns_per_move = 10
},
/turf/open/floor/carpet,
+1 -3
View File
@@ -2367,9 +2367,7 @@
/obj/item/seeds/cotton{
yield = 5
},
/obj/item/seeds/cotton{
yield = 5
},
/obj/item/seeds/cotton/durathread,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"Vj" = (