Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3678,7 +3678,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" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
6 changes: 2 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/freighter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -45712,7 +45712,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" = (
Expand Down Expand Up @@ -79963,7 +79963,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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/stations/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -47857,7 +47857,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{
Expand Down
14 changes: 4 additions & 10 deletions _maps/map_files/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9904,7 +9904,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" = (
Expand Down Expand Up @@ -36616,10 +36616,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
},
Expand Down Expand Up @@ -38402,10 +38399,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" = (
Expand Down Expand Up @@ -65030,7 +65024,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" = (
Expand Down
28 changes: 14 additions & 14 deletions _maps/map_files/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,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
},
Expand Down Expand Up @@ -6462,7 +6462,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" = (
Expand Down Expand Up @@ -18097,7 +18097,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore2)
"bVL" = (
/obj/item/book/manual/random,
/obj/effect/spawner/random/manual,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
},
Expand Down Expand Up @@ -24516,7 +24516,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,
Expand Down Expand Up @@ -40872,7 +40872,7 @@
/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
},
Expand Down Expand Up @@ -43006,7 +43006,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,
Expand Down Expand Up @@ -60050,7 +60050,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/security/range)
"nOE" = (
/obj/item/book/manual/random,
/obj/effect/spawner/random/manual,
/obj/effect/spawner/random/cobweb/right/frequent,
/turf/simulated/floor/plasteel{
icon_state = "cult"
Expand Down Expand Up @@ -62601,7 +62601,7 @@
/area/station/hallway/primary/central/se)
"oKb" = (
/obj/structure/table,
/obj/effect/spawner/random/book,
/obj/effect/spawner/random/reference_book,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
Expand Down Expand Up @@ -73466,9 +73466,9 @@
/area/station/medical/paramedic)
"sEU" = (
/obj/structure/shelf/service,
/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,
/obj/machinery/light{
dir = 1
},
Expand Down Expand Up @@ -77865,9 +77865,9 @@
/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/reference_book,
/obj/effect/spawner/random/reference_book,
/obj/effect/spawner/random/reference_book,
/turf/simulated/floor/wood,
/area/station/service/library)
"ukm" = (
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maint_loot_tables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/miniantags/abduction/abduction_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/forcefields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
39 changes: 34 additions & 5 deletions code/game/objects/effects/spawners/random/misc_spawners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/robot/ai_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 1 addition & 7 deletions code/game/objects/items/salvage.dm
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/alien_specific.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/manuals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading