From 3e6c82ad10afa6d85c7fe0f743cf01588355caa6 Mon Sep 17 00:00:00 2001 From: Manatee Date: Sat, 23 Apr 2022 17:42:01 -0500 Subject: [PATCH] Adds a book to xenobio --- .../EclipseStation/EclipseStation.dmm | 33 +++++++++-------- _maps/map_files/GaxStation/GaxStation.dmm | 17 +++++---- _maps/map_files/KiloStation/KiloStation.dmm | 29 ++++++++------- _maps/map_files/Omegastation/omegastation.dmm | 35 +++++++++--------- _maps/map_files/YogStation/YogStation.dmm | 27 +++++++------- _maps/map_files/YogsDelta/YogsDelta.dmm | 21 ++++++----- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 23 ++++++------ yogstation.dme | 1 + yogstation/code/game/objects/items/manuals.dm | 7 ++++ yogstation/icons/obj/library.dmi | Bin 383 -> 672 bytes 10 files changed, 104 insertions(+), 89 deletions(-) create mode 100644 yogstation/code/game/objects/items/manuals.dm diff --git a/_maps/map_files/EclipseStation/EclipseStation.dmm b/_maps/map_files/EclipseStation/EclipseStation.dmm index 53045d586da9..e16772cfbb36 100644 --- a/_maps/map_files/EclipseStation/EclipseStation.dmm +++ b/_maps/map_files/EclipseStation/EclipseStation.dmm @@ -74015,21 +74015,6 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) -"cWO" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plasteel, -/area/science/xenobiology) "cWP" = ( /obj/structure/cable{ icon_state = "4-8"; @@ -87851,6 +87836,22 @@ /obj/item/flashlight/lamp, /turf/open/floor/plasteel/grimy, /area/maintenance/department/bridge) +"qwu" = ( +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel, +/area/science/xenobiology) "qxm" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -128125,7 +128126,7 @@ bWj aqe cWI cWL -cWO +qwu jdw myc cWP diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index a0ca7841c0a7..830ed93dcfb8 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -2225,13 +2225,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"bdQ" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bdZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window{ @@ -9746,6 +9739,14 @@ /obj/item/stamp/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) +"faR" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel, +/area/science/xenobiology) "faT" = ( /obj/structure/rack, /obj/item/circuitboard/machine/telecomms/broadcaster, @@ -84901,7 +84902,7 @@ vUO vUO oBL tsz -bdQ +faR npU gad nkO diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a1dc224b21e0..757e2aa22a57 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -33140,19 +33140,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) -"bfj" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "bfk" = ( /obj/structure/transit_tube/horizontal{ dir = 1; @@ -86464,6 +86451,20 @@ }, /turf/open/floor/plasteel, /area/clerk) +"fSW" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "fTc" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/red, @@ -141704,7 +141705,7 @@ bfo aWN alB aeX -bfj +fSW pXw afF ars diff --git a/_maps/map_files/Omegastation/omegastation.dmm b/_maps/map_files/Omegastation/omegastation.dmm index 2f332fd0017c..f9de403f8dda 100644 --- a/_maps/map_files/Omegastation/omegastation.dmm +++ b/_maps/map_files/Omegastation/omegastation.dmm @@ -22566,22 +22566,6 @@ }, /turf/open/floor/plasteel/grimy, /area/chapel/main) -"bjQ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bjR" = ( /obj/machinery/computer/camera_advanced/xenobio{ dir = 1 @@ -35647,6 +35631,23 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/closed/wall/r_wall, /area/engine/atmos) +"oat" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology South"; + dir = 1 + }, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel, +/area/science/xenobiology) "oaV" = ( /obj/structure/grille, /obj/machinery/meter, @@ -91861,7 +91862,7 @@ aWb xJG aZQ gZr -bjQ +oat bfP aad aad diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 6bd206b93275..ebd543ea23ca 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -26646,6 +26646,19 @@ }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) +"dtY" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "duk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -60702,18 +60715,6 @@ /obj/effect/spawner/lootdrop/techstorage/security, /turf/open/floor/plasteel/white, /area/storage/tech) -"uOl" = ( -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "uOs" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -111960,7 +111961,7 @@ jXZ buu yeI dDE -uOl +dtY xrN pwx bDb diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index c3b0445a7e21..0ac58b174abf 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -124026,15 +124026,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/storage/locker) -"nWW" = ( -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/structure/table/reinforced, -/obj/item/extinguisher, -/obj/item/extinguisher, -/turf/open/floor/circuit/green, -/area/science/xenobiology) "nYG" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -124232,6 +124223,16 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"orV" = ( +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/structure/table/reinforced, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "oub" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -161912,7 +161913,7 @@ cMY cMY cTV cVT -nWW +orV cZb iMT dcu diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 41d7d5bf79cf..1b6f18aff5ff 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -67387,16 +67387,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plasteel, /area/engine/foyer) -"gwI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/table/glass, -/turf/open/floor/plasteel, -/area/science/xenobiology) "gxv" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -78898,6 +78888,17 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"sTv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/table/glass, +/obj/item/book/manual/wiki/xenobiology, +/turf/open/floor/plasteel, +/area/science/xenobiology) "sTD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -118159,7 +118160,7 @@ aaa aaf cqs cRS -gwI +sTv bXP cyn ery diff --git a/yogstation.dme b/yogstation.dme index 72b79585b99d..06b1569af877 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -3378,6 +3378,7 @@ #include "yogstation\code\game\objects\items\extinguisher.dm" #include "yogstation\code\game\objects\items\fryingpan.dm" #include "yogstation\code\game\objects\items\holy_weapons.dm" +#include "yogstation\code\game\objects\items\manuals.dm" #include "yogstation\code\game\objects\items\plushes.dm" #include "yogstation\code\game\objects\items\premadepapers.dm" #include "yogstation\code\game\objects\items\sharpener.dm" diff --git a/yogstation/code/game/objects/items/manuals.dm b/yogstation/code/game/objects/items/manuals.dm new file mode 100644 index 000000000000..10162d3958f6 --- /dev/null +++ b/yogstation/code/game/objects/items/manuals.dm @@ -0,0 +1,7 @@ +/obj/item/book/manual/wiki/xenobiology + name = "Crossbreeding: The Definitive Guide to Slimy Stuff" + icon = 'yogstation/icons/obj/library.dmi' + icon_state = "xenobook" + author = "Dr. S. Lime" + title = "Crossbreeding: The Definitive Guide to Slimy Stuff" + page_link = "Guide_to_xenobiology" diff --git a/yogstation/icons/obj/library.dmi b/yogstation/icons/obj/library.dmi index 79684fd6ef960018e0569fea613ca6445be91bbf..15fdba35c19557f06b577afc2ba6c8cde6d35ead 100644 GIT binary patch delta 587 zcmV-R0<``A0-yzdiBL{Q4GJ0x0000DNk~Le0000$0000W2m=5B0F^_Iwg3PC%uq~J zMZmzofPesIW&m*jaby5w^VN9w;h+BQy#N2qo0|ZD0D!Qt0E_^P%fUhP?S}E>P2A8! zd~1AXS7&2VV^>F4jed=#mZh?yvag`8nu?lsW_G%-5wxX$w3vRFlyj7lagwc`t$AsA zkB1d{YkH=arjc%ui)D+AYK@h8m6(Z`Ur%30Mn*U|IF@*pjA)FAU5Ju&l3Pk!NJvO& zT4}7DtdDMwh+l}Lm845LOM!8Lrjw?Xca@KPk6le&U0hs#Zhm`edv#@XYg%i`pk*rA zp}hbA00DFiQchCK)Y)!=P!ND&l}!N;)Lju5>h5uEackY*|DD7(2FN)xBy!`0|Lue?gfNpx zynCgRsZh*Z5JPdEmt@5&{T~AeVrb3+sbnw~5QSh|AmhgcR6hXF9sz*<2m`Wz#E1nD zlbG=UVqm~WE?+=_tYMf4P%M=z)fxs6Vp#+Pigmluv|DWiFfGS%AmFoOcYD45U^oJS zF}*kT0EGusCezt$I`1r0K>^-?(j}!D0DOJh?rP-@)*BemJV1j0b-Vj<-TCic$AAL@ z=%eH5eA(y-@b?X1!2gi|fG+Pg(dPkwnVtgz>numCvmA9$q=D>DzDM0Wlz ZMmM=uAGq{i!_@!)002ovPDHLkV1iM11mOSx delta 301 zcmV+|0n+}U1^)tniBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#sB~SJWxzj zMZmzofPesIW&rcmc=zF-{_ed0|IC}40I;wC%fUhP?S}E>P2A8!x~~zBhZRRgMmRV) zNJvOsTwKYZWh-fZG5`Po0d!JMQvg8b*k%9#0Bd?wSad{_4*^|&D=WDAxquA@0D12k z^`X3;I{*LxdPzh@(n}72APhxO6jUg`s{7xos4-%I=hS$oJpmFb#J}qLN0qr$ zLux!LLEq(7!F1OE`U(L<76NkQFdz$ovDQIAYE9%&Y;>31|!! z430Md!1ErXE3VHZs)Ovi)!V|z+REjv#r)H4tMCXENIB3B00000NkvXXu0mjfgk^iQ