From d6515078ddbfa8772e82864957fb6bd0247524ed Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:09:15 -0400 Subject: [PATCH] NFSD SOP's (#1297) * 04/28/2024 - SOP's Added NFSD SOP's as a book, overwritten Space Law spawn in PDA's. Space Law and SOP books are now available in the NFSDTech * Quick Fix --------- Co-authored-by: Dvir --- .../Entities/Objects/Devices/pda.yml | 1 + .../Entities/Objects/Books/hyperlinks.yml | 17 +++++++++++++++++ .../VendingMachines/Inventories/nfsdtec.yml | 2 ++ .../_NF/Entities/Objects/Devices/pda.yml | 18 ++++++++++++++---- Resources/Prototypes/_NF/tags.yml | 3 +++ .../Objects/Misc/books.rsi/meta.json | 3 +++ .../Objects/Misc/books.rsi/nfsd_sop.png | Bin 0 -> 387 bytes 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/nfsd_sop.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index e369d6ee1c4..123f3ea2c0d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -40,6 +40,7 @@ whitelist: tags: - BookSpaceLaw + - BookNfsdSop idSlot: name: access-id-card-component-default ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml index 6c119b4f43c..9b91f619039 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -29,6 +29,23 @@ - Book - BookSpaceLaw #Frontier +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookNfsdSop + name: nfsd sop's + description: A book defining nfsd standard operating procedures. + components: + - type: Sprite + sprite: Nyanotrasen/Objects/Misc/books.rsi + layers: + - state: nfsd_sop + - type: HyperlinkBook + url: https://frontierstation14.com/index.php/NFSDSOP #Frontier + - type: Tag + tags: + - Book + - BookNfsdSop #Frontier + #- type: entity # parent: BaseHyperlinkBook # id: HyperlinkBookSupernanny diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml index 69c03e03803..79a3c3da6da 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml @@ -1,6 +1,8 @@ - type: vendingMachineInventory id: NfsdTechInventory startingInventory: + HyperlinkBookSpaceLaw: 20 + HyperlinkBookNfsdSop: 20 Handcuffs: 10 Zipties: 10 GrenadeFlashBang: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 5a6ad7b0a7a..feab138ff02 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -123,6 +123,8 @@ - type: Pda id: ShriffIDCard state: pda-sheriff + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -151,6 +153,8 @@ - type: Pda id: CadetIDCard state: pda-cadet + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -179,6 +183,8 @@ - type: Pda id: DeputyIDCard state: pda-deputy + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -207,6 +213,8 @@ - type: Pda id: BrigmedicNFIDCard state: pda-brigmed + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -235,6 +243,8 @@ - type: Pda id: SergeantIDCard state: pda-sergeant + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -263,6 +273,8 @@ - type: Pda id: BailiffIDCard state: pda-bailiff + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -291,6 +303,8 @@ - type: Pda id: DetectiveNFIDCard state: pda-detective + bookSlot: # Frontier + startingItem: HyperlinkBookNfsdSop - type: PdaBorderColor borderColor: "#774705" - type: Icon @@ -307,10 +321,6 @@ state: pda-sr penSlot: startingItem: PenCentcom - priority: -1 - whitelist: - tags: - - Write - type: PdaBorderColor borderColor: "#789876" accentHColor: "#447987" diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 119bd41fc48..e8347041451 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -13,6 +13,9 @@ - type: Tag id: BookSpaceLaw +- type: Tag + id: BookNfsdSop + - type: Tag id: CrossbowBolt diff --git a/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/meta.json index edaf88fae40..43d50ef0fd1 100644 --- a/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/meta.json @@ -10,6 +10,9 @@ { "name" : "law_space" }, + { + "name" : "nfsd_sop" + }, { "name" : "law_trial" } diff --git a/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/nfsd_sop.png b/Resources/Textures/Nyanotrasen/Objects/Misc/books.rsi/nfsd_sop.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2371199a26aa981ef343080e99206c27b8024e GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qNb1AIbU zfwY{WqO!V%rmmi$sktcwLns47Br8Lshk zkL(bUTSq(v-v2uHY1g}W)hRJIvftE6cwdg=HSm;JseiK5uRzjz6@GGHU|)cz@=bNC^C4u`njxgN@xNA+1a5q literal 0 HcmV?d00001