Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Wiki Books #2670

Merged
merged 8 commits into from
Feb 10, 2024
Merged

Updates Wiki Books #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
774d5fd
init commit
meemofcourse Jan 25, 2024
5a23e14
map edits
meemofcourse Jan 25, 2024
6e108bf
sigh
meemofcourse Jan 25, 2024
392b3e6
Merge branch 'master' into wiki-books
meemofcourse Jan 25, 2024
5105132
Merge branch 'master' into wiki-books
meemofcourse Jan 26, 2024
862a718
frdfffdfd
meemofcourse Jan 26, 2024
fa23cb6
Merge branch 'wiki-books' of https://github.com/meemofcourse/Shiptest…
meemofcourse Jan 26, 2024
bd50c4a
sigh
meemofcourse Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"kH" = (
/obj/item/book/manual/wiki/engineering_construction,
/obj/item/book/manual/wiki/construction,
/turf/open/floor/plating/beach/sand{
light_range = 2
},
Expand Down Expand Up @@ -453,7 +453,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/unpowered)
"sB" = (
/obj/item/book/manual/wiki/engineering_guide,
/obj/item/book/manual/wiki/engineering,
/turf/open/floor/plating/beach/sand{
light_range = 2
},
Expand Down Expand Up @@ -858,7 +858,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Kl" = (
/obj/effect/radiation,
/obj/item/book/manual/wiki/engineering_singulo_tesla,
/obj/item/book/manual/wiki/engineering,
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ko" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3308,7 +3308,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"MY" = (
/obj/structure/table,
/obj/item/book/manual/wiki/barman_recipes,
/obj/item/book/manual/wiki/drinks,
/turf/open/floor/wood{
light_range = 2
},
Expand All @@ -3321,7 +3321,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"Ni" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/medical_cloning,
/obj/item/book/manual/wiki/medicine,
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/ruin/beach/oceantown)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
/obj/item/book/manual/wiki/engineering_singulo_tesla,
/obj/item/book/manual/wiki/engineering,
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"bE" = (
Expand Down Expand Up @@ -828,7 +828,7 @@
/turf/open/floor/plasteel/icemoon,
/area/ruin)
"cc" = (
/obj/item/book/manual/wiki/atmospherics,
/obj/item/book/manual/wiki/engineering,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,6 @@
"ex" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
},
Expand Down
16 changes: 8 additions & 8 deletions _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/medical_cloning{
/obj/item/book/manual/wiki/medicine{
pixel_x = 14
},
/obj/structure/fluff/paper/stack{
Expand Down Expand Up @@ -1305,7 +1305,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/engineering_guide{
/obj/item/book/manual/wiki/engineering{
pixel_x = -6;
pixel_y = 9
},
Expand Down Expand Up @@ -1581,7 +1581,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/plumbing{
/obj/item/book/manual/wiki/piloting{
pixel_y = 7;
pixel_x = 5
},
Expand Down Expand Up @@ -2058,7 +2058,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/telescience{
/obj/item/book/manual/wiki/surgery{
pixel_y = 11;
pixel_x = -4
},
Expand Down Expand Up @@ -2760,7 +2760,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/robotics_cyborgs{
/obj/item/book/manual/wiki/robotics{
pixel_x = -5;
pixel_y = 4
},
Expand Down Expand Up @@ -2929,7 +2929,7 @@
/turf/open/floor/wood,
/area/ruin/jungle)
"SN" = (
/obj/item/book/manual/wiki/research_and_development{
/obj/item/book/manual/wiki/command{
pixel_y = 5;
pixel_x = -5
},
Expand Down Expand Up @@ -2980,7 +2980,7 @@
/turf/closed/mineral/random/jungle,
/area/ruin/jungle)
"TE" = (
/obj/structure/bookcase/manuals/research_and_development,
/obj/structure/bookcase/manuals/chemistry,
/turf/open/floor/wood,
/area/ruin/jungle)
"TH" = (
Expand Down Expand Up @@ -3254,7 +3254,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/item/book/manual/wiki/infections{
/obj/item/book/manual/wiki/piloting{
pixel_x = 2;
pixel_y = 10
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"dZ" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/engineering_guide,
/obj/item/book/manual/wiki/engineering,
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/wood,
/area/ruin/jungle/starport)
Expand Down Expand Up @@ -1939,7 +1939,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"nI" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/toxins,
/obj/item/book/manual/wiki/chemistry,
/obj/machinery/light/small/broken/directional/east,
/turf/open/floor/wood{
icon_state = "wood-broken3"
Expand Down
12 changes: 4 additions & 8 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2332,14 +2332,10 @@
dir = 1
},
/obj/effect/turf_decal/siding/wood/corner,
/obj/item/book/manual/wiki/engineering_guide{
/obj/item/book/manual/wiki/engineering{
pixel_x = 5;
pixel_y = -7
},
/obj/item/book/manual/wiki/grenades{
pixel_x = -3;
pixel_y = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/wrapping,
/turf/open/floor/wood,
Expand Down Expand Up @@ -2818,11 +2814,11 @@
dir = 1
},
/obj/effect/turf_decal/siding/wood,
/obj/item/book/manual/wiki/engineering_hacking{
/obj/item/book/manual/wiki/hacking{
pixel_x = -8;
pixel_y = 6
},
/obj/item/book/manual/wiki/cooking_to_serve_man{
/obj/item/book/manual/wiki/cooking{
pixel_x = 5;
pixel_y = -6
},
Expand Down Expand Up @@ -3782,7 +3778,7 @@
color = "#66b266";
dir = 4
},
/obj/item/book/manual/wiki/experimentor{
/obj/item/book/manual/wiki/surgery{
pixel_x = 10;
pixel_y = -5
},
Expand Down
6 changes: 1 addition & 5 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5802,7 +5802,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"Lv" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/tcomms{
/obj/item/book/manual/wiki/construction{
pixel_x = -7;
pixel_y = 4
},
Expand Down Expand Up @@ -6376,10 +6376,6 @@
/obj/item/radio/intercom/directional/south{
name = "Station Intercom (General)"
},
/obj/item/book/manual/wiki/security_space_law{
pixel_x = -4;
pixel_y = 4
},
/turf/open/floor/mineral/plastitanium/red/brig,
/area/overmap_encounter/planetoid/cave/explored)
"OC" = (
Expand Down
5 changes: 0 additions & 5 deletions _maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,6 @@
/area/overmap_encounter/planetoid/jungle/explored)
"wK" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/grenades{
desc = "Some kind of manual about making hellish grenades and explosives. Completely unreadable, but you feel as though you've gained a level in explosives.";
name = "Pete's Lesson";
pixel_y = 3
},
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/codelab/storage)
"gz" = (
/obj/structure/bookcase/manuals/research_and_development,
/obj/structure/bookcase/manuals/chemistry,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/codelab/reception)
"gC" = (
Expand Down
4 changes: 0 additions & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,10 +1608,6 @@
/area/ruin/powered)
"AY" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law{
pixel_x = 12;
pixel_y = 2
},
/obj/item/flashlight/lamp{
pixel_y = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"hj" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/barman_recipes{
/obj/item/book/manual/wiki/drinks{
pixel_x = -2;
pixel_y = 12
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/astraeus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@
name = "paper - Munitions Inventory";
pixel_x = 7
},
/obj/item/book/manual/wiki/engineering_hacking{
/obj/item/book/manual/wiki/hacking{
pixel_x = -6
},
/turf/open/floor/plasteel/airless,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/clericden.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered/no_grav)
"Cb" = (
/obj/item/book/manual/wiki/barman_recipes,
/obj/item/book/manual/wiki/drinks,
/obj/structure/fluff/paper/stack{
dir = 5
},
Expand Down Expand Up @@ -650,7 +650,7 @@
/turf/open/floor/carpet/airless,
/area/ruin/unpowered/no_grav)
"Fz" = (
/obj/item/book/manual/wiki/engineering_construction,
/obj/item/book/manual/wiki/construction,
/obj/structure/fluff/paper/stack{
dir = 9
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/dangerous_research.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"gC" = (
/obj/structure/table,
/obj/effect/turf_decal/corner/opaque/green/border,
/obj/item/book/manual/wiki/infections,
/obj/item/book/manual/wiki/chemistry,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav)
"gH" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,6 @@
"ex" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7011,7 +7011,7 @@
"Cb" = (
/obj/structure/table,
/obj/structure/spacevine,
/obj/item/book/manual/wiki/engineering_guide,
/obj/item/book/manual/wiki/engineering,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 6
},
Expand Down Expand Up @@ -11252,7 +11252,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/book/manual/wiki/engineering_singulo_tesla,
/obj/item/book/manual/wiki/engineering,
/turf/open/space/basic,
/area/space/nearstation)
"Rp" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@
/area/ruin/space/has_grav/spacemall/dorms)
"eb" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/engineering_hacking,
/obj/item/book/manual/wiki/hacking,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"ed" = (
Expand Down
Loading
Loading