From 2ed62079b31e020a242ae01496443eb732bc8dc7 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Wed, 19 Apr 2023 23:12:04 -0700 Subject: [PATCH 1/9] more guidebook books --- .../Entities/Objects/Books/hyperlinks.yml | 78 ++++++++++++++----- 1 file changed, 59 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index 0e467cafb5..7694b74dac 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -1,6 +1,7 @@ - type: entity parent: BaseItem id: BaseHyperlinkBook + suffix: HyperlinkBook abstract: true components: - type: Sprite @@ -18,14 +19,18 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookSpaceLaw - name: space law + suffix: GuidebookBook + name: Space Law description: A big book of laws for space courts. components: - type: Sprite layers: - state: book_space_law - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Space_Law + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Space_Law + - type: GuidebookBook + guides: + - SpaceLaw - type: entity parent: BaseHyperlinkBook @@ -66,8 +71,11 @@ - type: Sprite layers: - state: book_chemistry - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Chemistry + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Chemistry + - type: GuidebookBook + guides: + - Chemistry - type: entity parent: BaseHyperlinkBook @@ -84,38 +92,50 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookCooking - name: cookbook + suffix: GuidebookBook + name: Master Chef's Cookbook description: A list of food recipes. components: - type: Sprite layers: - state: book_cooking - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Cooking + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Cooking + - type: GuidebookBook + guides: + - Chef - type: entity parent: BaseHyperlinkBook id: HyperlinkBookBotany - name: botanical field guide + suffix: GuidebookBook + name: Botanical field guide description: A guide to plants. components: - type: Sprite layers: - state: book_hydroponics_pod_people - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Hydroponics + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Hydroponics + - type: GuidebookBook + guides: + - Botany - type: entity parent: BaseHyperlinkBook id: HyperlinkBookShuttle - name: guide to shuttle construction - description: A guide to building shuttles. + suffix: GuidebookBook + name: Guide to construction + description: A guide to building. components: - type: Sprite layers: - state: book_engineering - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction + - type: GuidebookBook + guides: + - Construction - type: entity parent: BaseHyperlinkBook @@ -139,7 +159,7 @@ parent: BaseHyperlinkBook id: HyperlinkBookProcedure suffix: GuidebookBook - name: standard operating procedure + name: Standard Operating Procedure description: A guide to normal station function. components: - type: Sprite @@ -154,14 +174,18 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookPower - name: guide to power + suffix: GuidebookBook + name: Guide to power description: A guide to powering the station. components: - type: Sprite layers: - state: book_engineering2 - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Power + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Power + - type: GuidebookBook + guides: + - Power - type: entity parent: BaseHyperlinkBook @@ -202,3 +226,19 @@ - type: GuidebookBook guides: - Atmospherics + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookEngineering + suffix: GuidebookBook + name: The engineer's guide to the station + description: A guide on Engineering. A combination of various other engineering books and more! + components: + - type: Sprite + layers: + - state: book_engineering2 + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science + - type: GuidebookBook + guides: + - Engineering From 6430b4f76ede63af2339460c84a427c7b5fb8381 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sun, 23 Apr 2023 02:41:46 -0700 Subject: [PATCH 2/9] Apply suggestions from code review Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> --- .../Entities/Objects/Books/hyperlinks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index 7694b74dac..75f5ab6d0b 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -93,8 +93,8 @@ parent: BaseHyperlinkBook id: HyperlinkBookCooking suffix: GuidebookBook - name: Master Chef's Cookbook - description: A list of food recipes. + name: Cooking Al Dente + description: The only thing heavier than the weight of all that monkey genocide. components: - type: Sprite layers: @@ -109,8 +109,8 @@ parent: BaseHyperlinkBook id: HyperlinkBookBotany suffix: GuidebookBook - name: Botanical field guide - description: A guide to plants. + name: Botanical Field Guide + description: The most SFW guide on breeding you'll ever find. components: - type: Sprite layers: @@ -125,8 +125,8 @@ parent: BaseHyperlinkBook id: HyperlinkBookShuttle suffix: GuidebookBook - name: Guide to construction - description: A guide to building. + name: Building Upwards! + description: May not be the sharpest tool in the shed, but it's sure the densest! components: - type: Sprite layers: @@ -175,8 +175,8 @@ parent: BaseHyperlinkBook id: HyperlinkBookPower suffix: GuidebookBook - name: Guide to power - description: A guide to powering the station. + name: Commanding Power + description: A guide to powering the station. Sadly, nothing to do with increasing self confidence... components: - type: Sprite layers: From acb1f536e01f8eed364a2e914ae1bacaf421c0eb Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sun, 23 Apr 2023 02:43:17 -0700 Subject: [PATCH 3/9] Apply suggestions from code review --- .../Nyanotrasen/Entities/Objects/Books/hyperlinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index 75f5ab6d0b..ecdfc13e12 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -66,7 +66,7 @@ parent: BaseHyperlinkBook id: HyperlinkBookChemistry name: chemical recipe book - description: A list of chemical recipes. + description: The Chemist's guide to "cooking!" components: - type: Sprite layers: From 19f1b01a914294e337067c1b98b4fb369bddbe76 Mon Sep 17 00:00:00 2001 From: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Date: Sun, 23 Apr 2023 09:35:30 -0400 Subject: [PATCH 4/9] Rename chemist book. --- .../Nyanotrasen/Entities/Objects/Books/hyperlinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index ecdfc13e12..be4a5c348d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -65,7 +65,7 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookChemistry - name: chemical recipe book + name: The Cook Book description: The Chemist's guide to "cooking!" components: - type: Sprite From cd96854685c5b4959790f0367d2a9d015bd93b3c Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Tue, 25 Apr 2023 20:43:16 -0700 Subject: [PATCH 5/9] remove hyperlinks from unguidebooked books --- .../Entities/Objects/Books/hyperlinks.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index be4a5c348d..2d9985fe02 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -35,14 +35,14 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookSupernanny - name: book of unsanctioned space punishments + name: Book of Unsanctioned Space Punishments description: The ravings of a madman. components: - type: Sprite layers: - state: book_space_law - - type: HyperlinkBook - url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques + # - type: HyperlinkBook + # url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques - type: entity parent: BaseHyperlinkBook @@ -80,14 +80,14 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookBartending - name: bartender's guide + name: Bartender's Guide description: A list of drink recipes. components: - type: Sprite layers: - state: book_bar - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Drinks + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Drinks - type: entity parent: BaseHyperlinkBook @@ -190,26 +190,26 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookMedical - name: guide to medical + name: Guide to Medical description: A guide to the medical department. components: - type: Sprite layers: - state: book_infections - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Medical + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Medical - type: entity parent: BaseHyperlinkBook id: HyperlinkBookHacking - name: guide to hacking + name: Guide to Hacking description: For emergency use only. components: - type: Sprite layers: - state: book_hacking - - type: HyperlinkBook - url: https://wiki.nyanotrasen.moe/view/Hacking + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Hacking - type: entity parent: BaseHyperlinkBook @@ -231,7 +231,7 @@ parent: BaseHyperlinkBook id: HyperlinkBookEngineering suffix: GuidebookBook - name: The engineer's guide to the station + name: The Engineer's Guide to the Station description: A guide on Engineering. A combination of various other engineering books and more! components: - type: Sprite From 0b0dc06707489da1ae18ae353db8bea9abbae4ab Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Tue, 2 May 2023 22:42:39 -0700 Subject: [PATCH 6/9] update guidebookbooks --- .../Entities/Objects/Books/hyperlinks.yml | 21 ++++++++++++------- .../Entities/Objects/Books/guidebooks.yml | 1 - 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index 9ebe6d485a..e850370e84 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -28,7 +28,8 @@ - state: book_space_law # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Space_Law - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - SpaceLaw @@ -74,7 +75,8 @@ - state: book_chemistry # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Chemistry - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Chemistry @@ -102,7 +104,8 @@ - state: book_cooking # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Cooking - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Chef @@ -118,7 +121,8 @@ - state: book_hydroponics_pod_people # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Hydroponics - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Botany @@ -134,7 +138,8 @@ - state: book_engineering # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Construction @@ -186,7 +191,8 @@ - state: book_engineering2 # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Power - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Power @@ -243,6 +249,7 @@ - state: book_engineering2 # - type: HyperlinkBook # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science - - type: GuidebookBook + - type: GuideHelp + openOnActivation: true guides: - Engineering diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml index 099773d5a1..0c3e8215d4 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml @@ -14,4 +14,3 @@ guides: - AnomalousResearch - Xenoarchaeology - From e4edfaf642d7eeb748c767b71a51ec460be1ee27 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 16 Aug 2023 02:26:51 -0700 Subject: [PATCH 7/9] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Books/hyperlinks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index e850370e84..b93684a355 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -199,8 +199,8 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookMedical - name: Guide to Medical - description: A guide to the medical department. + name: The Hippocratic Oath and You + description: "There's a concerning number of times that this book refers to it as the 'Hippocratic Suggestion...'" components: - type: Sprite layers: From e81d394f7aa5decca0d0e416bd56a37cc4092a84 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Fri, 25 Aug 2023 04:59:08 -0700 Subject: [PATCH 8/9] Update guidebooks.yml --- .../SimpleStation14/Entities/Objects/Books/guidebooks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml index 0c3e8215d4..099773d5a1 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Books/guidebooks.yml @@ -14,3 +14,4 @@ guides: - AnomalousResearch - Xenoarchaeology + From 8d760665be5956ad7fea898fabb76474e31591a8 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Fri, 25 Aug 2023 05:58:57 -0700 Subject: [PATCH 9/9] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Books/hyperlinks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index b93684a355..f1565ba5f8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -83,8 +83,8 @@ - type: entity parent: BaseHyperlinkBook id: HyperlinkBookBartending - name: Bartender's Guide - description: A list of drink recipes. + name: Mixology 101 + description: This book mostly goes over which sodas taste good with which booze. components: - type: Sprite layers: