From 78a5a9d2e234b50ac8dd7bdfd0cf405bf004bf58 Mon Sep 17 00:00:00 2001 From: Erki Date: Sun, 20 Oct 2019 20:05:34 +0300 Subject: [PATCH] Skull re-adds SOP (#7152) SOP is re-added as a book. Reworked wiki-books to be easier to code and work with. Resprited corporate reg book to say "REG" instead of "LAW". --- code/controllers/subsystems/traumas.dm | 2 +- code/game/machinery/vending_types.dm | 4 +- code/game/objects/items/weapons/manuals.dm | 128 +++++++-------------- code/modules/library/lib_items.dm | 6 +- html/changelogs/skull132-books.yml | 6 + icons/obj/library.dmi | Bin 36266 -> 36568 bytes maps/aurora/aurora-4_mainlevel.dmm | 28 ++--- maps/aurora/aurora-5_interstitial.dmm | 2 +- maps/exodus/exodus-1_station.dmm | 18 +-- maps/exodus/exodus-2_centcomm.dmm | 2 +- maps/space_ruins/derelict.dmm | 2 +- 11 files changed, 82 insertions(+), 116 deletions(-) create mode 100644 html/changelogs/skull132-books.yml diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm index c437960495f..171969bdd5f 100644 --- a/code/controllers/subsystems/traumas.dm +++ b/code/controllers/subsystems/traumas.dm @@ -59,7 +59,7 @@ var/datum/controller/subsystem/traumas/SStraumas /obj/item/clothing/head/soft/sec, /obj/item/clothing/suit/armor/vest/security, /obj/item/clothing/suit/bio_suit/security, /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/navyofficer, /obj/item/clothing/suit/space/void/security, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/device/magnetic_lock/security,/obj/item/toy/figure/secofficer, - /obj/item/weapon/gun/bang/sec, /obj/item/weapon/gun/projectile/sec, /obj/item/weapon/book/manual/security_space_law)), + /obj/item/weapon/gun/bang/sec, /obj/item/weapon/gun/projectile/sec, /obj/item/weapon/book/manual/wiki/security_space_law)), "clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes, /obj/item/clothing/mask/gas/clown_hat, /obj/item/weapon/bananapeel, diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 067349b2372..bccf04a65c4 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -877,7 +877,7 @@ icon_state = "battlemonsters" vend_id = "battlemonsters" products = list( - /obj/item/weapon/book/manual/battlemonsters = 10, + /obj/item/weapon/book/manual/wiki/battlemonsters = 10, /obj/item/battle_monsters/wrapped = 10, /obj/item/battle_monsters/wrapped/pro = 10, /obj/item/battle_monsters/wrapped/species = 4, //Human monsters @@ -887,7 +887,7 @@ /obj/item/battle_monsters/wrapped/rare = 4 ) prices = list( - /obj/item/weapon/book/manual/battlemonsters = 12, + /obj/item/weapon/book/manual/wiki/battlemonsters = 12, /obj/item/battle_monsters/wrapped = 100, /obj/item/battle_monsters/wrapped/pro = 75, /obj/item/battle_monsters/wrapped/species = 100, diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index c911b96eb52..70c1e1aa73b 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -5,27 +5,29 @@ due_date = 0 // Game time in 1/10th seconds unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified +/obj/item/weapon/book/manual/wiki + var/sub_page = "" -/obj/item/weapon/book/manual/engineering_construction +/obj/item/weapon/book/manual/wiki/Initialize() + . = ..() + + dat = {" + + + + + + + + + "} + +/obj/item/weapon/book/manual/wiki/engineering_construction name = "Station Repairs and Construction" icon_state ="bookEngineering" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Station Repairs and Construction" - -/obj/item/weapon/book/manual/engineering_construction/New() - ..() - dat = {" - - - - - - - - - - - "} + sub_page = "Guide_to_construction" /obj/item/weapon/book/manual/engineering_particle_accelerator name = "Particle Accelerator User's Guide" @@ -33,8 +35,8 @@ author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" -/obj/item/weapon/book/manual/engineering_particle_accelerator/New() - ..() +/obj/item/weapon/book/manual/engineering_particle_accelerator/Initialize() + . = ..() dat = {"