map edits

shiptest-ss13 · Jan 25, 2024 · 5a23e14 · 5a23e14
1 parent 774d5fd
commit 5a23e14
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 104 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -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
 	},
@@ -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
 	},
@@ -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" = (

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -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
 	},
@@ -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)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -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" = (
@@ -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
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
@@ -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
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -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{
@@ -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
 	},
@@ -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
 	},
@@ -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
 	},
@@ -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
 	},
@@ -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
 	},
@@ -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
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -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,
@@ -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
 	},
@@ -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
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -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
 	},
@@ -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" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm
@@ -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"
 	},

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -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
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -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,

diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -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
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -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/ghetto_chemistry,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav)
 "gH" = (

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -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
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -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" = (

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -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" = (

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -1504,7 +1504,6 @@
 /area/centcom/ferry)
 "arZ" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder,
 /turf/open/floor/plasteel/grimy,
 /area/centcom/ferry)
@@ -4435,7 +4434,7 @@
 "aOO" = (
 /obj/item/reagent_containers/food/condiment/enzyme,
 /obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
 /obj/structure/closet/crate,
 /turf/open/floor/plasteel,
 /area/centcom/holding)
@@ -6205,7 +6204,6 @@
 "bbL" = (
 /obj/structure/table/wood,
 /obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/restraints/handcuffs,
 /obj/item/assembly/flash/handheld,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -6528,7 +6526,6 @@
 /area/centcom/control)
 "bRK" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -8155,7 +8152,6 @@
 /turf/open/floor/plasteel/dark,
 /area/centcom/supply)
 "fsQ" = (
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder,
 /obj/structure/table/wood,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -9011,7 +9007,6 @@
 "hzR" = (
 /obj/structure/table/wood,
 /obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/restraints/handcuffs,
 /obj/item/assembly/flash/handheld,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -10115,7 +10110,6 @@
 /area/centcom/evac)
 "kel" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -10774,7 +10768,6 @@
 "lDl" = (
 /obj/structure/table/wood,
 /obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/restraints/handcuffs,
 /obj/item/assembly/flash/handheld,
 /obj/machinery/airalarm/directional/south,
@@ -12606,7 +12599,7 @@
 /area/centcom/holding)
 "pDx" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/book/manual/wiki/drinks,
 /obj/item/reagent_containers/food/drinks/shaker,
 /obj/item/reagent_containers/glass/rag,
 /obj/machinery/newscaster/directional/north{
@@ -13002,7 +12995,6 @@
 /area/centcom/control)
 "qHN" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -13786,7 +13778,6 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "sow" = (
-/obj/item/book/manual/wiki/security_space_law,
 /obj/structure/table/wood,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -7054,10 +7054,6 @@
 	pixel_y = 4;
 	pixel_x = 5
 	},
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = -6;
-	pixel_y = -10
-	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/security)
 "yI" = (
@@ -14782,10 +14778,6 @@
 /area/outpost/crew/dorm)
 "ZD" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = 4;
-	pixel_y = 2
-	},
 /obj/machinery/door/window/brigdoor/southright{
 	req_access_txt = "101"
 	},