diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_eden.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_eden.dmm index 8ba52d962b5..eec18f1abc9 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_eden.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_eden.dmm @@ -203,7 +203,7 @@ /area/ruin/unpowered/misc_lavaruin) "nb" = ( /obj/structure/table/wood, -/obj/effect/spawner/random/book, +/obj/effect/spawner/random/reference_book, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/grass/jungle/lavaland_air, /area/ruin/unpowered/misc_lavaruin) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm index 8e9b4f09279..30f3c194194 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm @@ -3705,7 +3705,7 @@ /obj/structure/closet, /obj/effect/spawner/random/maintenance, /obj/item/stack/marker_beacon/ten, -/obj/item/book/random, +/obj/effect/spawner/random/library_book, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "vV" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroidmine_skullakin.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmine_skullakin.dmm index b1570b6f8cd..96393ddadd0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/asteroidmine_skullakin.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmine_skullakin.dmm @@ -2139,7 +2139,7 @@ /area/ruin/skullakin_mine/temple) "RJ" = ( /obj/structure/table/glass, -/obj/effect/spawner/random/book, +/obj/effect/spawner/random/reference_book, /turf/simulated/floor/plasteel, /area/ruin/skullakin_mine/arrivals) "RL" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm index 518ebb78ee6..0b29a767fd4 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm @@ -336,10 +336,8 @@ /area/ruin/space/powered) "As" = ( /obj/structure/table/wood, -/obj/item/book/manual/random, -/obj/effect/spawner/random/book{ - pixel_x = -7 - }, +/obj/effect/spawner/random/manual, +/obj/effect/spawner/random/reference_book, /obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small, /turf/simulated/floor/wood, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm index b5e5deb9c10..7815631b744 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm @@ -687,9 +687,7 @@ /area/template_noop) "oV" = ( /obj/structure/table/wood, -/obj/item/book/random{ - pixel_y = 2 - }, +/obj/effect/spawner/random/library_book, /turf/simulated/floor/wood, /area/template_noop) "pb" = ( diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index f627050aa4b..f0014eaa60f 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -45737,7 +45737,7 @@ /area/station/science/misc_lab) "dUv" = ( /obj/structure/table/wood, -/obj/item/book/random, +/obj/effect/spawner/random/library_book, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint) "dUM" = ( @@ -80287,7 +80287,7 @@ dir = 4 }, /obj/structure/closet, -/obj/item/book/random/triple, +/obj/effect/spawner/random/library_book/triple, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "uDn" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 05a8e3caa13..461f09c28fb 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -48052,7 +48052,7 @@ pixel_x = -6; pixel_y = 10 }, -/obj/item/storage/fancy/cigarettes{ +/obj/item/storage/fancy/cigarettes/cigpack_robust{ pixel_y = 2 }, /obj/item/lighter{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 9b9395be7f0..5f0a1ada896 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -9927,7 +9927,7 @@ "aOp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /turf/simulated/floor/wood, /area/station/maintenance/library) "aOq" = ( @@ -36637,10 +36637,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/book/random{ - pixel_x = 2; - pixel_y = 4 - }, +/obj/effect/spawner/random/library_book, /obj/effect/turf_decal/tiles/department/medical/corner{ dir = 1 }, @@ -38415,10 +38412,7 @@ /area/station/science/lobby) "cSs" = ( /obj/structure/table/glass, -/obj/item/book/random{ - pixel_x = 2; - pixel_y = 4 - }, +/obj/effect/spawner/random/library_book, /turf/simulated/floor/plasteel/white, /area/station/medical/reception) "cSt" = ( @@ -65248,7 +65242,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "kKW" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /turf/simulated/floor/wood, /area/station/maintenance/library) "kLd" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 49a3b226b6d..5248e2e88d5 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -1961,7 +1961,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "aub" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, @@ -3848,7 +3848,7 @@ /area/station/engineering/hardsuitstorage) "aHI" = ( /obj/structure/table, -/obj/effect/spawner/random/book, +/obj/effect/spawner/random/reference_book, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "aHM" = ( @@ -5952,7 +5952,7 @@ "aSP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/random/book, +/obj/effect/spawner/random/reference_book, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "aST" = ( @@ -9337,7 +9337,6 @@ /obj/structure/shelf, /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/bureaucracy, -/obj/effect/spawner/random/book, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bjD" = ( @@ -17503,7 +17502,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "bVL" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -23850,7 +23849,7 @@ /area/station/maintenance/apmaint) "cCr" = ( /obj/structure/table/wood, -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/item/paicard, /obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood, @@ -29899,15 +29898,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/execution) -"dvC" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/station/service/library) "dvJ" = ( /obj/structure/cable/yellow, /obj/machinery/power/solar{ @@ -32424,6 +32414,18 @@ /obj/effect/spawner/airlock/w_to_e/long/square, /turf/simulated/wall/r_wall, /area/station/maintenance/fsmaint2) +"epa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/station/service/library) "epy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/extra_insulated{ @@ -35642,6 +35644,11 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/medical/virology) +"foE" = ( +/obj/structure/table, +/obj/item/instrument/harmonica, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "foV" = ( /obj/effect/turf_decal/tiles/department/science/side{ dir = 4 @@ -40873,10 +40880,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/exit) "hdc" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/machinery/light/small{ dir = 8 }, +/obj/effect/spawner/random/manual, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "hdi" = ( @@ -43084,7 +43092,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "hTl" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/machinery/light/small, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, @@ -54143,13 +54151,6 @@ "lyc" = ( /turf/simulated/floor/plating/airless, /area/station/hallway/secondary/exit) -"lyf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/fore2) "lyp" = ( /obj/structure/extinguisher_cabinet{ name = "west bump"; @@ -55618,11 +55619,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"lZT" = ( -/obj/structure/table, -/obj/item/instrument/harmonica, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "lZU" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -56839,6 +56835,14 @@ /obj/effect/turf_decal/tiles/department/cargo/corner, /turf/simulated/floor/plasteel, /area/station/hallway/supply/aft) +"mwe" = ( +/obj/structure/shelf/service, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, +/obj/item/storage/bible, +/turf/simulated/floor/wood, +/area/station/service/library) "mwn" = ( /obj/structure/table, /obj/item/storage/bag/ore, @@ -59345,18 +59349,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) -"nmV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/station/service/library) "nnh" = ( /obj/machinery/light_switch{ dir = 4; @@ -60771,8 +60763,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "nOE" = ( -/obj/item/book/manual/random, +/obj/effect/spawner/random/manual, /obj/effect/spawner/random/cobweb/right/frequent, +/obj/effect/spawner/random/manual, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -63488,6 +63481,12 @@ /obj/structure/shelf/security, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) +"oKH" = ( +/obj/structure/bookcase, +/turf/simulated/floor/plasteel{ + icon_state = "cult" + }, +/area/station/maintenance/starboard) "oKS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable/extra_insulated{ @@ -74882,12 +74881,6 @@ /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/service/janitor) -"sEQ" = ( -/obj/structure/bookcase, -/turf/simulated/floor/plasteel{ - icon_state = "cult" - }, -/area/station/maintenance/starboard) "sES" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -79475,15 +79468,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) -"ukl" = ( -/obj/structure/shelf/service, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/item/storage/bible, -/turf/simulated/floor/wood, -/area/station/service/library) "ukm" = ( /obj/structure/cable/extra_insulated{ icon_state = "4-8" @@ -81169,6 +81153,14 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"uQc" = ( +/obj/structure/shelf/service, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, +/obj/structure/shelf/service, +/turf/simulated/floor/wood, +/area/station/service/library) "uQj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -87369,6 +87361,15 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"wOG" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/station/service/library) "wOI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -89426,6 +89427,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/station/maintenance/port) +"xvH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tiles/department/security/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/fore2) "xvR" = ( /obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, @@ -90780,11 +90788,9 @@ /area/station/security/permabrig) "xVF" = ( /obj/structure/shelf/service, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, -/obj/effect/spawner/random/book, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, +/obj/effect/spawner/random/reference_book, /turf/simulated/floor/wood, /area/station/service/library) "xVJ" = ( @@ -113416,7 +113422,7 @@ adi adi gZJ jeE -lZT +foE jzA wXi adi @@ -115506,7 +115512,7 @@ awF gYO aty shX -lyf +xvH aKs mtd mtd @@ -116540,8 +116546,8 @@ aND jRH plb plb -nmV -ukl +epa +mwe xVF bFw bcI @@ -117568,8 +117574,8 @@ aNJ qks plb plb -dvC -xVF +wOG +uQc xVF bcI bOs @@ -130966,7 +130972,7 @@ asJ oMd mTj dSv -sEQ +oKH hwF nOU aoG diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm index 9201cdb0fd1..9e4122601d3 100644 --- a/code/_globalvars/lists/maint_loot_tables.dm +++ b/code/_globalvars/lists/maint_loot_tables.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_INIT(maintenance_loot_tier_0, list( // Spawners for easily found items /obj/effect/spawner/random/bureaucracy, /obj/effect/spawner/random/dice, - /obj/effect/spawner/random/book, + /obj/effect/spawner/random/library_book, // Other worthless/easily found items /obj/item/camera_film, diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index af01e37d12c..c5f9a8ff1cb 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -23,7 +23,7 @@ CONTENTS: /obj/item/abductor name = "generic abductor item" icon = 'icons/obj/abductor.dmi' - desc = "You are not supposed to be able to see this. If you can see this, please make an issue report on GitHub." + desc = ABSTRACT_TYPE_DESC /obj/item/abductor/proc/AbductorCheck(user) if(isabductor(user)) diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index a0022251765..1d6daca7cc7 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -35,7 +35,7 @@ /obj/structure/forcefield name = "ain't supposed to see this" - desc = "file a github report if you do!" + desc = ABSTRACT_TYPE_DESC icon = 'icons/effects/effects.dmi' density = TRUE anchored = TRUE diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index 8053e3e21d9..1928ea3855c 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -30,9 +30,10 @@ ) record_spawn = TRUE -/obj/effect/spawner/random/book +/obj/effect/spawner/random/manual icon_state = "book" - name = "book spawner" + name = "manual spawner" + record_spawn = TRUE loot = list( /obj/item/book/manual/atmospipes, /obj/item/book/manual/barman_recipes, @@ -45,6 +46,15 @@ /obj/item/book/manual/research_and_development, /obj/item/book/manual/ripley_build_and_repair, /obj/item/book/manual/supermatter_engine, + /obj/item/book/manual/zombie_manual, + ) + +/obj/effect/spawner/random/manual/record_item(type_path_to_make) + SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book/manual]") + +/obj/effect/spawner/random/manual/wiki + name = "wiki manual spawner" + loot = list( /obj/item/book/manual/wiki/botanist, /obj/item/book/manual/wiki/engineering_construction, /obj/item/book/manual/wiki/engineering_guide, @@ -63,13 +73,32 @@ /obj/item/book/manual/wiki/sop_security, /obj/item/book/manual/wiki/sop_service, /obj/item/book/manual/wiki/sop_supply, - /obj/item/book/manual/zombie_manual, ) - record_spawn = TRUE -/obj/effect/spawner/random/book/record_item(type_path_to_make) +/obj/effect/spawner/random/library_book + name = "random library book" + icon_state = "book" + +/obj/effect/spawner/random/library_book/generate_loot_list() + return GLOB.library_catalog.get_random_book(spawn_loot_count) + +/obj/effect/spawner/random/library_book/make_item(spawn_loc, cached_book) + . = new /obj/item/book(spawn_loc, cached_book, TRUE, FALSE) SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book]") +/obj/effect/spawner/random/library_book/triple + spawn_loot_count = 3 + spawn_loot_split = TRUE + spawn_loot_split_pixel_offsets = 4 + +/obj/effect/spawner/random/reference_book + name = "random reference book" + icon_state = "book" + loot = list( + /obj/effect/spawner/random/manual, + /obj/effect/spawner/random/manual/wiki, + ) + /obj/effect/spawner/random/mod_maint name = "maint MOD module spawner" loot = list( diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm index f5857cb4b51..55e17f8fd58 100644 --- a/code/game/objects/items/robot/ai_upgrades.dm +++ b/code/game/objects/items/robot/ai_upgrades.dm @@ -2,7 +2,7 @@ /obj/item/ai_upgrade name = "parent ai upgrade" - desc = "A base rootkit for ai upgrades. If you are seeing this, report where you found it on the github issues." + desc = ABSTRACT_TYPE_DESC icon = 'icons/obj/module.dmi' icon_state = "datadisk3" inhand_icon_state = "card-id" diff --git a/code/game/objects/items/salvage.dm b/code/game/objects/items/salvage.dm index 1770d5dc9cc..bc79bd1a7b4 100644 --- a/code/game/objects/items/salvage.dm +++ b/code/game/objects/items/salvage.dm @@ -1,6 +1,6 @@ /obj/item/salvage name = "salvage" - desc = "A tonne of salvage looted from bad mapping practices. Who spawned the base type? Report this on the github." + desc = ABSTRACT_TYPE_DESC icon = 'icons/obj/sellable.dmi' force = 5 throwforce = 5 @@ -17,9 +17,7 @@ . += SPAN_NOTICE("You can bring this back to Cargo to sell to Central Command onboard the 'NTV Arion' Supply shuttle.") /// Ruin Salvage, misc loot gained from looking around ruins. - /obj/item/salvage/ruin - desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on the github." /obj/item/salvage/ruin/pirate name = "rum keg" @@ -74,10 +72,6 @@ drop_sound = sound('sound/hallucinations/look_up2.ogg', 10) /// Loot salvage, gained from fighting space simplemobs. - -/obj/item/salvage/loot - desc = "If you can see this forbidden salvage, report it on GitHub." - /obj/item/salvage/loot/pirate name = "stolen jewellery" desc = "A collection of stolen jewellery and gemstones. Gold, silver, sapphire, amethyst, and more, this bounty will surely fetch a good price on the market." diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 85273a2af55..d6a4c5f785a 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -212,7 +212,7 @@ // MARK: Cigarette Pack /obj/item/storage/fancy/cigarettes name = "generic cigarette packet" - desc = "An abstract brand of cigarette that should not exist. Make a GitHub report if you see this." + desc = ABSTRACT_TYPE_DESC icon = 'icons/obj/cigarettes.dmi' icon_state = "robust_packet" inhand_icon_state = "robust_packet" diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 57867177153..d8a5f3a65fa 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -10,7 +10,7 @@ */ /obj/item/storage/firstaid name = "generic first-aid kit" - desc = "If you can see this, make a bug report on GitHub, something went wrong!" + desc = ABSTRACT_TYPE_DESC icon_state = "firstaid_generic" throw_range = 8 req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots. diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 8845025fdbc..ff66b9a3292 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -155,7 +155,7 @@ /obj/item/trash/spentcasing icon = 'icons/obj/bullet.dmi' name = "arbitrary spent casing item" - desc = "If you can see this and didn't spawn it, make an issue report on GitHub." + desc = ABSTRACT_TYPE_DESC icon_state = "pistol_brass" scatter_distance = 10 materials = list(MAT_METAL = 100) diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index c817e604543..77d42756978 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -19,7 +19,7 @@ //Bottles for borg liquid squirters. PSSH PSSH /obj/item/reagent_containers/spray/alien name = "generic chemical synthesizer" - desc = "If you can see this, make an issue report on GitHub. Something has gone wrong!" + desc = ABSTRACT_TYPE_DESC icon = 'icons/mob/alien.dmi' icon_state = "borg-default" spray_maxrange = 3 diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index f43c1f3febd..72f65eb7f88 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -21,7 +21,7 @@ //While piracy is a heinious deed, we don't want people uploading programmatic books into the player book DB for obvious reasons copyright = TRUE name = "Book Manual" - desc = "Please make a report on the github if you somehow get ahold of one of these in-game." + desc = ABSTRACT_TYPE_DESC summary = "This is a manual procured by Nanotrasen, it contains important information!" //Pages has to be a list of strings, it will break the book otherwise pages = list({"How did we get here? Anyway, if you are reading this please make a report on the Github as you should not diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index 3eae0ee766c..26d104f47f4 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -12,7 +12,7 @@ ////////////////////////////// /obj/item/melee/energy name = "generic energy blade" - desc = "If you can see this and didn't spawn it in as an admin, make an issue report on GitHub." + desc = ABSTRACT_TYPE_DESC icon = 'icons/obj/weapons/energy_melee.dmi' /// Damage done when active. Does not stack with force_off. var/force_on = 30 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b5526739b77..5e349740d69 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -754,7 +754,7 @@ /obj/item/storage/belt/sheath name = "sword sheath" - desc = "Can hold swords. If you see this, it is a bug. Please report this on GitHub." + desc = ABSTRACT_TYPE_DESC icon_state = "sheath" storage_slots = 1 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 918ee89f41b..156b6b9a359 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -1,6 +1,6 @@ /turf/simulated/wall/mineral name = "mineral wall" - desc = "If you can see this, please make an issue report on GitHub." + desc = ABSTRACT_TYPE_DESC icon_state = "" canSmoothWith = null var/last_event = 0 diff --git a/code/modules/cooking/machines/cooking_machine.dm b/code/modules/cooking/machines/cooking_machine.dm index 2e1ba1d9a3a..3efbe6152d2 100644 --- a/code/modules/cooking/machines/cooking_machine.dm +++ b/code/modules/cooking/machines/cooking_machine.dm @@ -2,7 +2,7 @@ RESTRICT_TYPE(/obj/machinery/cooking) /obj/machinery/cooking name = "Default Cooking Appliance" - desc = "You shouldn't be seeing this. Please report this as an issue on GitHub." + desc = ABSTRACT_TYPE_DESC icon = 'icons/obj/cooking/machines.dmi' density = TRUE anchored = TRUE diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm index 82ee712b010..a93fea41f62 100644 --- a/code/modules/library/book.dm +++ b/code/modules/library/book.dm @@ -377,24 +377,6 @@ return TRUE - //* Book Spawners n'stuff *// -/obj/item/book/random - icon_state = "random_book" - var/amount = 1 - -/obj/item/book/random/Initialize(mapload) - . = ..() - END_OF_TICK(CALLBACK(src, PROC_REF(spawn_books))) - -/obj/item/book/random/proc/spawn_books() - var/list/books = GLOB.library_catalog.get_random_book(amount) - for(var/datum/cachedbook/book as anything in books) - new /obj/item/book(loc, book, TRUE, FALSE) - qdel(src) - -/obj/item/book/random/triple - amount = 3 - //* Codex Gigas *// //This book used to have its own dm file, due to devil code removal, it is now only a cosmetic item for the time being //this will be its resting place until it is used for something else eventually. diff --git a/code/modules/mob/living/basic/basic_mob.dm b/code/modules/mob/living/basic/basic_mob.dm index c2f85a7f75b..0ee47fd70a5 100644 --- a/code/modules/mob/living/basic/basic_mob.dm +++ b/code/modules/mob/living/basic/basic_mob.dm @@ -17,7 +17,7 @@ RESTRICT_TYPE(/mob/living/basic) /// code. /mob/living/basic name = "basic mob" - desc = "If you can see this, make an issue report on GitHub." + desc = ABSTRACT_TYPE_DESC healable = TRUE icon = 'icons/mob/animal.dmi' hud_type = /datum/hud/simple_animal diff --git a/code/modules/mob/living/basic/hostile/demons/demon.dm b/code/modules/mob/living/basic/hostile/demons/demon.dm index a6e8c90fe86..add797bdd83 100644 --- a/code/modules/mob/living/basic/hostile/demons/demon.dm +++ b/code/modules/mob/living/basic/hostile/demons/demon.dm @@ -1,6 +1,5 @@ /mob/living/basic/demon name = "a generic demon" - desc = "you shouldnt be reading this, file a github report." speak_emote = list("gurgles", "wails", "screeches") response_help_continuous = "thinks better of touching" response_help_simple = "thinks better of touching" diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 74bd3d9b983..366aa0bf6c3 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -1,6 +1,6 @@ /obj/item/organ/internal/cyberimp/arm name = "arm-mounted implant" - desc = "You shouldn't see this! Adminhelp and report this as an issue on github!" + desc = ABSTRACT_TYPE_DESC parent_organ = "r_arm" slot = "r_arm_device" icon_state = "toolkit_generic" diff --git a/tools/UpdatePaths/Scripts/31409_generic_spawners.txt b/tools/UpdatePaths/Scripts/31409_generic_spawners.txt new file mode 100644 index 00000000000..b39c9198158 --- /dev/null +++ b/tools/UpdatePaths/Scripts/31409_generic_spawners.txt @@ -0,0 +1,5 @@ +/obj/effect/spawner/random/book : /obj/effect/spawner/random/reference_book +/obj/item/book/random : /obj/effect/spawner/random/library_book +/obj/item/book/random/triple : /obj/effect/spawner/random/library_book/triple +/obj/item/book/manual/random : /obj/effect/spawner/random/manual +/obj/item/storage/fancy/cigarettes : /obj/item/storage/fancy/cigarettes/cigpack_robust{@OLD}