From 9f2a8d37ef7fc80adfa387c98a2554379fa554ca Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 11 Aug 2025 13:38:24 -0700 Subject: [PATCH 01/34] this is a START. AAAAAAAAAAA --- Resources/Locale/en-US/job/job-names.ftl | 3 +- Resources/Prototypes/Datasets/ion_storm.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 4 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Roles/Jobs/Civilian/librarian.yml | 3 +- .../Roles/Jobs/Command/head_of_personnel.yml | 1 - .../Roles/Jobs/Science/research_director.yml | 1 + .../Prototypes/Roles/Jobs/departments.yml | 3 +- .../Entities/Objects/Misc/ancient_books.yml | 101 +++++++++ .../_DV/Entities/Objects/Misc/books.yml | 198 ++++++++++++++++++ .../Structures/Doors/Airlocks/access.yml | 2 +- .../Storage/DisplayCases/display_cases.yml | 43 ++++ .../Misc/job_icons.rsi/Librarian.png | Bin 415 -> 155 bytes .../Interface/Misc/job_icons.rsi/meta.json | 2 +- .../Objects/Misc/id_cards.rsi/idcurator.png | Bin 4750 -> 574 bytes .../Objects/Misc/id_cards.rsi/meta.json | 2 +- .../Storage/display_cases.rsi/bounty.png | Bin 0 -> 184 bytes .../display_cases.rsi/captains_paper.png | Bin 0 -> 180 bytes .../display_cases.rsi/display_case.png | Bin 0 -> 316 bytes .../display_cases.rsi/display_case_glass.png | Bin 0 -> 204 bytes .../display_cases.rsi/display_case_icon.png | Bin 0 -> 367 bytes .../display_cases.rsi/display_case_open.png | Bin 0 -> 204 bytes .../Storage/display_cases.rsi/invoice.png | Bin 0 -> 184 bytes .../Storage/display_cases.rsi/locked.png | Bin 0 -> 108 bytes .../Storage/display_cases.rsi/meta.json | 44 ++++ .../Storage/display_cases.rsi/paper.png | Bin 0 -> 171 bytes .../Storage/display_cases.rsi/unlocked.png | Bin 0 -> 110 bytes .../Storage/display_cases.rsi/welded.png | Bin 0 -> 203 bytes 28 files changed, 400 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml create mode 100644 Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/captains_paper.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_glass.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/unlocked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 60f49324c56..d1a79487ca4 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -25,7 +25,8 @@ job-name-cburn = Centcomm Quarantine Officer job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician -job-name-librarian = Librarian +# DeltaV - Changed Librarian to Curator +job-name-librarian = Curator # DeltaV - Changed Lawyer to Attorney # job-name-lawyer = Lawyer job-name-mime = Mime diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 35f67cef64f..c2d3ad08603 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -342,7 +342,7 @@ - HEADS OF STAFF - JANITORS - LAWYERS - - LIBRARIANS + - CURATORS # DeltaV - Replace librarians with Curators - MEDICAL DOCTORS - MIMES - MUSICIANS diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 4035f635d0c..196065f3701 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -565,8 +565,8 @@ - type: entity parent: BaseWidePDA id: LibrarianPDA - name: librarian PDA - description: Smells like books. + name: Curator PDA + description: Smells like old books and ozone. components: - type: Pda id: LibrarianIDCard diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index bf015046bcc..a6bd0da6971 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -353,7 +353,7 @@ - type: entity parent: IDCardStandard id: LibrarianIDCard - name: librarian ID card + name: Curator ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index ad78cab0b42..f1ae8068151 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -5,11 +5,12 @@ playTimeTracker: JobLibrarian startingGear: LibrarianGear icon: "JobIconLibrarian" - supervisors: job-supervisors-hop + supervisors: job-supervisors-rd # DeltaV - Moved to epistemics department access: - Service - Maintenance - Library # DeltaV - Add Library access + - Research - type: startingGear id: LibrarianGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 68f4f56f791..97f85f1271c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -59,7 +59,6 @@ # Begin DeltaV Additions - fine-grained service accesses - Boxer - Clown - - Library - Mime - Musician - Reporter diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index cd159528d36..412396fbd06 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -30,6 +30,7 @@ - Chapel # Chaplain is in Epistemics - Robotics - External # Needed to access the AI satellite + - Library # moved librarian to epistemics # end DeltaV Additions special: - !type:AddImplantSpecial diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index dbb0d95feb7..fbc33bbfc5c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -26,7 +26,7 @@ - HeadOfPersonnel - Janitor # - Lawyer # DeltaV - Move Lawyer into Justice - - Librarian + # - Librarian # DeltaV - Move Librarian into Epistemics - Mime - Musician - Passenger @@ -137,6 +137,7 @@ - Chaplain # DeltaV - Move Chaplain into Epistemics - ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml - Roboticist # DeltaV: Roboticist job + - Librarian # DeltaV - Move Librarian into epistemics as curator - type: department id: Silicon diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml new file mode 100644 index 00000000000..858485887e0 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml @@ -0,0 +1,101 @@ +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseItem + abstract: true + id: AncientBookBase + name: Ancient Book + components: + - type: Sprite + layers: + - sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: StaticPrice + price: 10 + +- type: entity + parent: AncientBookBase + id: AncientBookCommon + name: Common Ancient Book + description: A very old book commonly found in archives. Read it to discover what it is. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: SpawnItemsOnUse + items: + - id: ResearchDisk + - id: AncientBookCommon1 + orGroup: AncientBookCommonPool + - id: AncientBookCommon2 + orGroup: AncientBookCommonPool + - id: AncientBookCommon3 + orGroup: AncientBookCommonPool + +- type: entity + parent: AncientBookBase + id: AncientBookUncommon + name: Uncommon Ancient Book + description: A very old book generally only found in private collections. Read it to discover what it is. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: SpawnItemsOnUse + items: + - id: ResearchDisk5000 + - id: AncientBookUncommon1 + orGroup: AncientBookUncommonPool + - id: AncientBookUncommon2 + orGroup: AncientBookUncommonPool + - id: AncientBookUncommon3 + orGroup: AncientBookUncommonPool + +- type: entity + parent: AncientBookBase + id: AncientBookRare + name: Rare Ancient Book + description: A very old book sought after for it's rarity and value. Read it to discover what it is. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: SpawnItemsOnUse + items: + - id: ResearchDisk10000 + - id: AncientBookRare1 + orGroup: AncientBookRarePool + - id: AncientBookRare2 + orGroup: AncientBookRarePool + - id: AncientBookRare3 + orGroup: AncientBookRarePool diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index a3c2c922d35..8c733a49e22 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -108,3 +108,201 @@ guides: - Cargo - Salvage + +- type: entity + parent: BookBase + id: AncientBookCommon1 + name: Common Ancient Book 1 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookCommon2 + name: Common Ancient Book 2 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookCommon3 + name: Common Ancient Book 3 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookUncommon1 + name: Uncommon Ancient Book 1 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookUncommon2 + name: Uncommon Ancient Book 2 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookUncommon3 + name: Uncommon Ancient Book 3 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookRare1 + name: Rare Ancient Book 1 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookRare2 + name: Rare Ancient Book 2 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops + +- type: entity + parent: BookBase + id: AncientBookRare3 + name: Rare Ancient Book 3 + description: placeholder name and desc until story is written. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#0f204f" + - state: decor_wingette_circle + color: "#2c5491" + - state: decor_vertical_middle + color: "#3c6ab0" + - state: icon_fish + - state: detail_bookmark + color: "#2c5491" + - type: Paper + content: book-text-fishops diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml index dab49e53d49..1926ea61fd8 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml @@ -244,7 +244,7 @@ board: [ DoorElectronicsReporter ] - type: entity - parent: AirlockServiceLocked + parent: AirlockScienceLocked id: AirlockLibraryLocked suffix: Library, Locked components: diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml new file mode 100644 index 00000000000..33f75007a68 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -0,0 +1,43 @@ +- type: entity + id: DisplayCaseArtifact + parent: [BaseMachinePowered, CrateArtifactContainer] + name: Artifact Display Case + description: A sturdy display case for showing off interesting artifacts. + components: + - type: AccessReader + access: [["Research"]] + - type: Sprite + drawdepth: Objects + sprite: _DV/Structures/Storage/display_cases.rsi + layers: + - state: display_case + map: ["enum.StorageVisualLayers.Base"] + - state: display_case_glass + map: ["enum.StorageVisualLayers.Door"] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] + - type: Icon + sprite: _DV/Structures/Storage/display_cases.rsi + state: display_case_icon + - type: EntityStorageVisuals + sprite: _DV/Structures/Storage/display_cases.rsi + stateDoorOpen: display_case_open + stateDoorClosed: display_case_glass + - type: ResearchPointSource + pointspersecond: 5 + active: true + - type: PowerSwitch + - type: ResearchClient + - type: ActivatableUI + key: enum.ResearchClientUiKey.Key + - type: ActivatableUIRequiresPower + - type: UserInterface + interfaces: + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png index 005d97a3f98a214fc46a015d02ab3e3f561a185a..deb6b136dc50c760e4243c23a99a34732f56187c 100644 GIT binary patch delta 113 zcmbQwJezTXVU|#UPl&5avRd*)^Z)<wS4k|BWl(ftc){O!mJz6d N!PC{xWt~$(697MkCG`LR literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwx+JS5Pc;Ak|36S*TFikfAax}{e!(CS2d$M~fPBsZkH}&M2EM}} z%y>M1MG8<*qQo_#Bsf2bP0l+XkK%g0i< diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 108675c7baa..f79bc0b1246 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Librarian re-recoloured by AeraAulin (github)", "size": { "x": 8, "y": 8 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png index 3e638f8bab020bf6e974a1f2120f333e38688074..d73dfea46062a0dc87cddda44e9b4ff07803ece7 100644 GIT binary patch delta 163 zcmV;U09^l$CB6iZBa!kG0w|HQ2LW~gf6-l}sQ>@~bV)=(R9J;$U>F6XU=)mkkq#J% zRoHFN{~ukf^gVHKa_kpwv#v955&E#K1a$ z+F;ZHLn9jwYd};Gb{q8nx3e`M$>2kWFAx<)6r}-tU^IPAIEMgg$^0Npk$5q**7 R{5k*t002ovPDHLkV1f|0Lk9o= literal 4750 zcmeHKeNYtV8DF$~1QJ4(#EZ$q?FNIS+1roX``DEOf#c(p)8j)#4AFOY--Xrt;%v((V{Hr+Q^Yt`CsCtf!kA9LHr85=F|m=pd&lQAGaV+i zf3Y)ryZgM)`+J|~_xzrHZ(H1p3m-_Forq!B1I{8xDZ1kNnGlD5LrqOL(WSeoyizL# z4R|2vS5yzgwZ;I%VOUi#EPTQ1E=lgj6TTWqoxfok@p#X^>I08{dONRcSM{wKul$2v zg0-H!6Z_+s6Zb!}d*MuHoUd>HitW9p(+7^ekWMfB$w!(ksdmPB*Uxt!z4Pk8d!29i zN)8#Wm=Z6(b;|ay&wA!%{qpqbLGi&I4;O5D_82(Tyf@ADxB5+2iyB^=V{n`)T>0eN z{IZK5K3kl2bR#=gBCf~Pc1(MpJodtOTZ^7HmgQ8v{6X&Bt7^=VOJ6RZmHqke)?--A zW;HL*?aa#?Ne3m-(Y$SbQMWsF%h0Zc`A;QRq|_aA$95%WrSw#7Cdw1u%-xgxq_sK0 zHM=c!R$t3CP~Z2A`1|h` z9~3VCVAn-O_*u%qLk}@Ge}v@@_Sg!b^2ouq7dQBuFO^x(RBx^M;`6VT+gE=mE?AJ( zYU=)N%ej_cS-l%?WYukYNq*^eNBG3fq#4=4>g%_k51oeVYYI*jH?`VwpMLmar7Bgh z=F1tEU)z1*-IcFTH@&j+TvgT0guzR3#(gW=55zz7cWnBSEuQ21Qg_ZxP3*k$NOM{8 z;NjTcFMI2d`DERfm|R=&`lJ2*DTa*FTkR(gAHFbf%fBS_Tz0QH*n7U!=fkiEvs9$7 zN>{NU`MpLU`$cFBdjm*#7?znG4ghHl)Nm2js6IP!?eNu@u`G!^$WWtC z17Xq^dP0YYVmM$(3aSB3_4{xg6NvtL%}x+#93P3#8*sTs;eDZD77!m)7z8NBNK;-f zHGW1&%U_E?h6DQA8KH92rc@~m`Rjuc%wG$A+7sg;WNCDMpg!n{q$5id^gu6i4WU(; z2}>3_UGC8tIt4YVHxQYH$e!S-smd5x6JpaxBI%3|1Wg~so!~u^d&C)exm<$7FV*Ye zIUROFUtf^@k}3<4TPQPtgAz}&9HWq&%|??plVT&G2xY5e76G7b zXoe$ETz~|!%#aotC^l9x%O=Gdfs!Smz#sGiR8G|kY9JNx)kFq#!i5~S(@wBPdd%YX z08K#?>_oBZs}GM2l&fA?rU9Kz#%i*#HjBl^nM|~mW5%2+U@(M~sADp;(PW8?=w%U5 zGKg59>l6V*>?ju@F9?C=50?A=9y_6jgzGa$hh3#Y(S+hVh0&Oj4EP|O4 zSdOHTWt_iXR+Yy8=B+mmo*6B9ks3nlH%3g+jw*w7(WmI6M~$=+jz^k808%uC5LgT4 zNSp{OIwaKsUkyZWk72ov*wwF*f<+X~R>{hfCWwAG4sfI>%VyHTv*-|^1<=Yw^pIcC z8bA={)F2)aS4f@_uJC!0LS;AAcn#{vnfL`yaiJ zBU7EzkyBpTEv+)d?pT$&b;Gt~L(9^^w!OFJRC`YLt=Ov7y}IbYg`vN+d@{5x=bw%n zLmxbr|I{jCY2NX)q}@%ea{P(j`ON<0?G{6Q=c!{`cFg?+a$nbI&uP2=x$qTxNr|Im lc4vISdp+|a3#24rch_ZH`{L80F0?r2%wO!-m%D1izX8~khCToQ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 0a5a37d8025..26825483ee4 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github). | idcurator recoloured by AeraAulin (github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/bounty.png new file mode 100644 index 0000000000000000000000000000000000000000..d72d30b9537bc9fbcc20fca515e1f7684ea8f615 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MV>B>ArY;~ z2@Bn&1kUTJdukGaFA$wIQ_;Wp~WkFoYZ&T;>qglb1VPtF~cFEiPfY|sP(<(|0nzQSPBRV{)|Ye zd{SE*bNBYPoqMN8Ffp83loY2n$D5HO(d6w6W`<2V>Px#_DMuRR9J=Wmaz_kFcd|v#)Yw%u;73pZcZ)?{(>Llr}#1cgJEYgL>87N(vcCT znhpr>wRJG|Or&|-chh&<6bJ+Yfxy4BpcI`?`vCx?>Pe!BhyVbWYc;FCA}Jcp>$aP$ z%hMQA^=}h%EU5-4&8aok2EM^>8OYPvON|LRgo%hCRZnU_4ItUTt!l}F08lf^N%z1Q zMJ5Kl8+F^EY?PIjbqLK-aOdvDfaZAEIQ{Qrz_q!P0W;~G)O$1F3-UdnDKarkt#eNU z+rX#9>-DlxEIsxJ5)qAt&o+?O8Q5*tqu*TEBLIN=<7wT{*#PxfM&$)lY&PR$vmpEc O0000S9D-tQ zG)k2EERpcyHh9$#$SyFId)m8w+n&9>T&^Oiqocc}O`?=pj%hKUL@7hy&IfPWl(!v` zlBms@q|D6Bd^l+Jp1)75vP62C0u8v_4xV6Qu$e2l{zmKPFrbSVJYD@<);T3K0RTG7 BNS*)y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/display_case_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5b83c8b0eb5282c8bbbb4731554bd7f67f4927e9 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TArY;~ z2@S9D-tQ zG)k2EERpcyHh9&*Sk4gG`Qi5K<5Bb1&%Lti=L6lqwl3~M;}6j{gU>UvZ_i2j@$IMe z;iJ*|okk&HQ>H(ByPMx-rR)a{iP8fN)(tCMIG8sr+Qa;~VYT@_r$`x=t5)x#&Kv-O z4fl1YX|M}~N+&Tt<7)apb!n>v2)whaJzntXVD+XmO4hswbllS~pJg;i$W?KkSl1=v zu=1&hrGw7|VeQ#@d<(=BR>~wKG%TsBd9>si+a%cr?W2c}_}f+ZPpVXLZ=9i^e(i{R zUXzM7?+PuhS9D-tQ zG)k2EERpcyHh9$#$SyFId)m8w+n&9>T&^Oiqocc}O`?=pj%hKUL@7hy&IfPWl(!v` zS}}L)p^1%+jSt^!>G=D^DodoNDbRq+?cfO}26kV`<-u3WJb*4@@O1TaS?83{1OUFb BO78#w literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..944c2326d67cb4d32332979fd5441281b47e6a84 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MV>B>ArY;~ z2@Bn&1kKDm3zCwsGxYi-}E%s%ea$1DK^F-FCb^I~=%Qqa*pegFsx zN=`a$I-_`-kp~EF`K<#{Jo522>bH5+yks1B9m+V~%(R<1>m9;uHvFVdQ&MBb@04z2+@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..d7d051708a79cc6a367e7186fe5f47452a3a0c00 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_ z&oS~c7;rEfl=xVs?c_OhSt~=7fnop46swtU*%``h%6Bl&{^uhd2h_pf>FVdQ&MBb@ E06gFw82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json new file mode 100644 index 00000000000..e3328a5a4b7 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified by AeraAulin (Github),", + "states": [ + { + "name": "display_case" + }, + { + "name": "display_case_glass" + }, + { + "name": "display_case_open" + }, + { + "name": "display_case_icon" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "welded" + }, + { + "name": "paper" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/paper.png new file mode 100644 index 0000000000000000000000000000000000000000..9d2da8bf6d9dafd5b9f031aa2eae8789d721f72a GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY-_ zFC64;P!MprxPBwwu7xstf)CzX%9J%pZUcAjfo|$Uh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..b7a617ce6debf5221a748c64a8d88e6d886473b7 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY-_ z&l_?zJ4m=ZoNiLc-7VVP@K)}`>qr}na$Q9qP+F{pKr1a``&Nf_TDn^_O|q{iI*(nE*~*DKST1R zMMb}In%i63(9n%K+=?u1i5A7@J3CHn{mXdwrq*{}j`d|g2QhfM`njxgN@xNAn(<7$ literal 0 HcmV?d00001 From 82edd2863e02b63ece498a66c21337998fcbd2c4 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 11 Aug 2025 19:24:08 -0700 Subject: [PATCH 02/34] I've been at this for 11 hours I am so tired --- Resources/Locale/en-US/_DV/recipes/tags.ftl | 5 + .../Locale/en-US/_DV/tools/tool-qualities.ftl | 3 + .../Catalog/Fills/Books/bookshelf.yml | 11 + .../Spawners/Random/Salvage/tables_loot.yml | 5 + .../Markers/Spawners/Random/books.yml | 3 + .../Prototypes/Procedural/salvage_loot.yml | 9 + .../Roles/Jobs/Civilian/librarian.yml | 1 + .../Entities/Objects/Misc/ancient_books.yml | 60 +++ .../_DV/Entities/Objects/Misc/books.yml | 369 ++++++++++++------ .../Objects/Tools/book_restoration_kit.yml | 51 +++ .../Recipes/Crafting/Graphs/ancientbooks.yml | 38 ++ Resources/Prototypes/_DV/tags.yml | 9 + .../Misc/books.rsi/ancientbookcommon1.png | Bin 0 -> 534 bytes .../Misc/books.rsi/ancientbookcommon2.png | Bin 0 -> 517 bytes .../Misc/books.rsi/ancientbookcommon3.png | Bin 0 -> 489 bytes .../Misc/books.rsi/ancientbookdamaged1.png | Bin 0 -> 615 bytes .../Misc/books.rsi/ancientbookdamaged2.png | Bin 0 -> 626 bytes .../Misc/books.rsi/ancientbookdamaged3.png | Bin 0 -> 630 bytes .../Misc/books.rsi/ancientbookrare1.png | Bin 0 -> 574 bytes .../Misc/books.rsi/ancientbookrare2.png | Bin 0 -> 722 bytes .../Misc/books.rsi/ancientbookrare3.png | Bin 0 -> 667 bytes .../Misc/books.rsi/ancientbookuncommon1.png | Bin 0 -> 564 bytes .../Misc/books.rsi/ancientbookuncommon2.png | Bin 0 -> 500 bytes .../Misc/books.rsi/ancientbookuncommon3.png | Bin 0 -> 665 bytes .../_DV/Objects/Misc/books.rsi/meta.json | 38 +- .../book_restoration.rsi/equipped-BELT.png | Bin 0 -> 171 bytes .../Tools/book_restoration.rsi/icon.png | Bin 0 -> 423 bytes .../book_restoration.rsi/inhand-left.png | Bin 0 -> 289 bytes .../book_restoration.rsi/inhand-right.png | Bin 0 -> 293 bytes .../Tools/book_restoration.rsi/meta.json | 29 ++ .../Tools/book_restoration.rsi/storage.png | Bin 0 -> 423 bytes 31 files changed, 513 insertions(+), 118 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml create mode 100644 Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon1.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon2.png create mode 100644 Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/storage.png diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 0f7295a3b2a..8be44718a72 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -34,3 +34,8 @@ construction-graph-tag-carp-plushie = carp plushie # Moth plushie construction-graph-tag-mothroach-hide = mothroach hide + +# Ancient books +construction-graph-tag-ancientbook-common = Damaged Ancient Book +construction-graph-tag-ancientbook-uncommon = Damaged Ancient Book +construction-graph-tag-ancientbook-rare = Damaged Ancient Book diff --git a/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl b/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl index 68a5d34d31a..fce1eb5141f 100644 --- a/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl +++ b/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl @@ -6,3 +6,6 @@ tool-quality-fine-screwing-tool-name = Thin-Tipped Screwdriver tool-quality-censer-name = Censer tool-quality-censer-tool-name = Censer + +tool-quality-restoration-name = Restoring +tool-quality-restoration-tool-name = Restoration Kit diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml index a0b6b57ec17..ab4752ee7e6 100644 --- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml +++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml @@ -127,3 +127,14 @@ - id: BookInspiration prob: 0.1 orGroup: BookAuthor + # Begin DeltaV Additions + - id: AncientBookDamagedCommon + prob: 0.07 + orGroup: BookPool + - id: AncientBookDamagedUncommon + prob: 0.05 + orGroup: BookPool + - id: AncientBookDamagedRare + prob: 0.03 + orGroup: BookPool + # End DeltaV Additions diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 65f8f66106c..d15ec1c6b76 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -105,6 +105,8 @@ range: 1, 2 - !type:NestedSelector tableId: RandomInstrumentTable + - id: AncientBookDamagedCommon # DeltaV + - type: entityTable id: SalvageTreasureUncommon @@ -130,6 +132,7 @@ - id: WristwatchGold - !type:NestedSelector tableId: RingTableCommon + - id: AncientBookDamagedUncommon # DeltaV - type: entityTable id: SalvageTreasureRare @@ -163,6 +166,8 @@ weight: 1 - !type:NestedSelector tableId: RingTableRare + - id: AncientBookDamagedRare # DeltaV + - type: entityTable id: SalvageTreasureLegendary diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml index 6db6cfae00e..c2a8075542d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml @@ -77,4 +77,7 @@ - BookFishops # DeltaV - fishops book # - BookDetective # - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book + - AncientBookDamagedCommon # DeltaV + - AncientBookDamagedUncommon # DeltaV + - AncientBookDamagedRare # DeltaV rareChance: 0.25 diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index b70f2a5c8f4..e0e320a0f10 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -105,6 +105,15 @@ - proto: WeaponTeslaGun prob: 0.1 cost: 2 + # Begin DeltaV Additions + - proto: AncientBookDamagedCommon + - proto: AncientBookDamagedUncommon + prob: 0.7 + cost: 2 + - proto: AncientBookDamagedRare + prob: 0.3 + cost: 4 + # End DeltaV Additions # Mob loot table diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index f1ae8068151..ba124b4147b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -23,3 +23,4 @@ storage: back: - BookRandom + - BookRestorationKit # DeltaV - new tool important for their job diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml index 858485887e0..b191bbfd24d 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml @@ -13,6 +13,57 @@ - type: StaticPrice price: 10 +- type: entity + parent: AncientBookBase + id: AncientBookDamagedCommon + name: Damaged Ancient Book + description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. + components: + - type: Sprite + layers: + - sprite: _DV/Objects/Misc/books.rsi + state: ancientbookdamaged2 + - type: Construction + graph: AncientBookCommonRestored + node: start + - type: Tag + tags: + - AncientBookDamagedCommon + +- type: entity + parent: AncientBookBase + id: AncientBookDamagedUncommon + name: Damaged Ancient Book + description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. + components: + - type: Sprite + layers: + - sprite: _DV/Objects/Misc/books.rsi + state: ancientbookdamaged3 + - type: Construction + graph: AncientBookUncommonRestored + node: start + - type: Tag + tags: + - AncientBookDamagedUncommon + +- type: entity + parent: AncientBookBase + id: AncientBookDamagedRare + name: Damaged Ancient Book + description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. + components: + - type: Sprite + layers: + - sprite: _DV/Objects/Misc/books.rsi + state: ancientbookdamaged1 + - type: Construction + graph: AncientBookRareRestored + node: start + - type: Tag + tags: + - AncientBookDamagedRare + - type: entity parent: AncientBookBase id: AncientBookCommon @@ -32,6 +83,9 @@ - state: icon_fish - state: detail_bookmark color: "#2c5491" + - type: Construction + graph: AncientBookCommonRestored + node: bookrestored - type: SpawnItemsOnUse items: - id: ResearchDisk @@ -61,6 +115,9 @@ - state: icon_fish - state: detail_bookmark color: "#2c5491" + - type: Construction + graph: AncientBookUncommonRestored + node: bookrestored - type: SpawnItemsOnUse items: - id: ResearchDisk5000 @@ -90,6 +147,9 @@ - state: icon_fish - state: detail_bookmark color: "#2c5491" + - type: Construction + graph: AncientBookRareRestored + node: bookrestored - type: SpawnItemsOnUse items: - id: ResearchDisk10000 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index 8c733a49e22..2df1ed3643e 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -110,199 +110,334 @@ - Salvage - type: entity - parent: BookBase + parent: BaseItem id: AncientBookCommon1 name: Common Ancient Book 1 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookcommon1 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookCommon2 name: Common Ancient Book 2 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookcommon2 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookCommon3 name: Common Ancient Book 3 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookcommon3 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookUncommon1 name: Uncommon Ancient Book 1 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookuncommon1 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookUncommon2 name: Uncommon Ancient Book 2 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookuncommon2 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookUncommon3 name: Uncommon Ancient Book 3 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookuncommon3 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookRare1 name: Rare Ancient Book 1 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookrare1 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookRare2 name: Rare Ancient Book 2 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookrare2 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 - type: entity - parent: BookBase + parent: BaseItem id: AncientBookRare3 name: Rare Ancient Book 3 description: placeholder name and desc until story is written. components: - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#0f204f" - - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + sprite: _DV/Objects/Misc/books.rsi + state: ancientbookrare3 - type: Paper content: book-text-fishops + contentSize: 12000 + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml new file mode 100644 index 00000000000..6903931fc6c --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml @@ -0,0 +1,51 @@ +- type: tool + id: Restoring + name: tool-quality-restoration-name + toolName: tool-quality-restoration-tool-name + spawn: BookRestorationKit + icon: { sprite: _DV/Objects/Tools/book_restoration.rsi, state: icon } + + +- type: entity + name: Book Restoration Kit + parent: BaseItem + id: BookRestorationKit + description: A kit filled with various tools necessary for restoring old and damaged books. This one smells a bit like vanilla. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/wrench_drop.ogg + - type: Tag + tags: + - Wrench + - type: Sprite + sprite: _DV/Objects/Tools/book_restoration.rsi + state: icon + - type: Item + sprite: _DV/Objects/Tools/book_restoration.rsi + storedSprite: + sprite: _DV/Objects/Tools/book_restoration.rsi + state: storage + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right + - type: MeleeWeapon + wideAnimationRotation: 135 + attackRate: 1.5 + damage: + types: + Blunt: 1.5 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Restoring + useSound: + path: /Audio/Effects/plant_rustle.ogg + - type: StaticPrice + price: 22 + - type: GuideHelp + guides: + - Construction diff --git a/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml b/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml new file mode 100644 index 00000000000..c4560cd7c88 --- /dev/null +++ b/Resources/Prototypes/_DV/Recipes/Crafting/Graphs/ancientbooks.yml @@ -0,0 +1,38 @@ +- type: constructionGraph + id: AncientBookCommonRestored + start: start + graph: + - node: start + edges: + - to: bookrestored + steps: + - tool: Restoring + doAfter: 20 + - node: bookrestored + entity: AncientBookCommon + +- type: constructionGraph + id: AncientBookUncommonRestored + start: start + graph: + - node: start + edges: + - to: bookrestored + steps: + - tool: Restoring + doAfter: 20 + - node: bookrestored + entity: AncientBookUncommon + +- type: constructionGraph + id: AncientBookRareRestored + start: start + graph: + - node: start + edges: + - to: bookrestored + steps: + - tool: Restoring + doAfter: 20 + - node: bookrestored + entity: AncientBookRare diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 2635f8e95c3..850b0b561c4 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -173,3 +173,12 @@ - type: Tag id: CleaningGrenade + +- type: Tag + id: AncientBookDamagedCommon + +- type: Tag + id: AncientBookDamagedUncommon + +- type: Tag + id: AncientBookDamagedRare diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon1.png new file mode 100644 index 0000000000000000000000000000000000000000..553143754dbbb312ab2d50b349380a6cd9b5a59c GIT binary patch literal 534 zcmV+x0_pvUP)Px$&`Cr=R9J=WmOD?vP!z}ieJF#x!I6--C~;7XgNrfIu=p7K01kcx2NI1j1{aO} z5PSodx-l}Ez@R13#YCcul&2&hEp;HR0WRFDl*B}S%WdyDJ?DR4rx%zo;lIPNI7OCs zjA3@3=ZXDFMyAFWS(4YQ?@;7Th|YO9T%j&I=kvlSmC>x_;c$h(`Mdyt#>+ic_hHaP zPz7kM24>u|SUXSvDBw7O_6c;ogrWhj$@CSnA-!N^LRu68G8hfkfbO8ARf;S^y#e^wh54=D2i$U{y-2X$02JU6x9MQuR7CS zsc2R~vPD3(+JxKfuo9WAKM=Iud+D44x`-dofH}$z`Ju~kn>we)qn?6NscwzF7jrpA zfjR@vuh)1}on!%!;SU6fM^QRGvPXa*kX_QL8vpV!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon2.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3a4fae089f19243e587df0e8aea1d5f486567b GIT binary patch literal 517 zcmV+g0{Z=lP)Px$zez+vR9J=WmcL5FP!z_${Lxah(hiP=A_aAGu;5g|)yW5tK0v2FLCF(z>I3uz zTspdSE$E;rC>eqsMOv(q);5WQoXbs3b8l({!F)?@?!7tZcTdhaTp(4d|1L#l)8Wy% zAGNNkYUsRq(-qp+Wt_jiKEv#uLEqj-CRYrsD}_A#(HOJI5Sd&NN+Aybm_FU%_yWEN zLI|*!PqDSLi<3(efC)v>M4!NQ=NQ}?0Ir04g#aYa^Jpa8t7#juX5|3@pxvy(vK^F5 z*_F?_(F=i22*9!(v^xEj>y284js4MB%4RHpaw!YoD-r}mb9JM~#=h@L+l&Rkiw`vc z@tRGBQg*@%SRl)GBH!aE763V-P?PAL2U+eHi2(49DeQdsY2EWY){qhfAk~c?JFR6q zfqWpzR>4}opi!%^)0RtFR(|W`f)K!U7i`QsrBn0ex11Y^0EEf1oj?x!Y87bO_g2yB z^aD8%)g6Bf!2ber+HO_@Vdpzz;sCt(gyVAn2qvbgs?wb>Rx1uGx3GCd(Xe=XfV=oe z7GRaau4IG$3m)&Ug;z4EJK^5JY2=-dr0bh(EaN;?sz0GmI1#nOB)L5{00000NkvXX Hu0mjf)z|BH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookcommon3.png new file mode 100644 index 0000000000000000000000000000000000000000..fbaea3e6f67863c92d7c1c5530a93fa4663fee65 GIT binary patch literal 489 zcmVPx$qe(LjkZ2!h3>i#UonNf$T2 zfU6F6^cyIspefjFb}5MTum)P2ySQj*LXx}ED+uO+gXHdV&oA%&c@IdH>c5MqbXr_m z_mbKvrIGd4eN8&PsbcPYyuqri!JM8)CR+@&lY9aAetZZ8VED&PIJ^|-_)E|xkTuJ*z$L>dt=`4 z9&fJ$b?0XX%7Y6bMgy>I8;mhrUYz>og+f6I!fP`n$V7lrsYGns#^%-`0H9o{qSb1l zT&X6TdtAv}3IG7R`zL|-IP-8+dYz^o02K{0HDdvYnws!=p&cOnw}a+F2>(DD3xG<< zwd{g8sqO|X0GzwA5IUq~5dy=Vkjem#<9LP<%vVuHW7~$|To7k8%9h9=jprNbl}zbQIJdBxcqjaoX-@jj fD(0zD{Rw>oL%Y$f6aM%V00000NkvXXu0mjfgKX8< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged1.png new file mode 100644 index 0000000000000000000000000000000000000000..4ab1c1761009ff356c038995fc11d8b5903a76c5 GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*R9J=WmO*P1K@`V-+1VxyRB11I5}Q-Og9^R$luIc{s9Hmz2wpr1y#&^f zPa!J{#ZMr#S{nodE|13;TBdzkTn` zyn%rR`rj2Z4V;_IN&sOA{FWbhCoIwRo3+hV?fSMUfYRe<8Sc!N+NMul=aIX6G-_26 zXD$#M8wH^L=>yCobr41XbCX&5_2(B>HkSDYJY1XRssX+kA?WP;X@b?wot1sG4IP7KkgRkaYuc9@#~ zl}d$lIvp59VJW!IQZ@Itu}3Co)T%upkFC-4r5Op3j3?VWp)(8JrlIS2EElhHJNv?@ z{?H=>8(ZaACrGDh*jSZGSc2yMw$TjG0_b48{8Aw1R_-Rk5^QaLr}X}%@m0?_Ff0X= z7)p?gClQti+=xtdq6-NeWd$H}Wj69nXrO_V{s0YI#kp){herSa002ovPDHLkV1juo B8XW)t literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged2.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3d02ea42925dc678f890895a195cd5ed0a6616 GIT binary patch literal 626 zcmV-&0*(ENP)Px%EJ;K`R9J=Wma%ISQ5e8~_wG_7R%r)Eu@N+u8Yq%Ef<+uUNJVgV3Ux4~LqKtK z3I!>+1pkFnD<5!;6(-ZUMrcgNQ7AY)?dBSj`rQt!s&@A z*H^U$^ushmy$b+Xp)k3HjBjxDT$QTXtoKJC2thLRPXrWFHv1zWgyrgVKXMBhX4CVO z@~Qp^D1xTe7#*R!lHOkrdJqt1@ITeIZRFNA@OwqZMp``(qzM()a1{G{-gjyC6&Q;|4lGftR(vHo zc9`1#3xxuSM8dTZc~Nq$rE2V~V+}{CRV!U3JJ#sb*$WaN6bd_kLTeV1D`&;G#rt-JE%9XDw7a`#?Cs;#!sEt-32@%C5ca6C{cOAnpdH4Do zAJ?91AN8~cdQmc#HAHAAjA59r6Ok?lI*`DhtN@%jcPa2mXutr)FTUc(U*tKt2mk;8 M07*qoM6N<$f^Iq-^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookdamaged3.png new file mode 100644 index 0000000000000000000000000000000000000000..ae6329eb2c9a8de0e9fb62cd0eeee3955c8abe8f GIT binary patch literal 630 zcmV-+0*U>JP)Px%FiAu~R9J=Wmd|SwK@@<$&2G|4A~b(MvAI}KDM(eYhah+sdX%8}3$X}+R0RoC zgSDcItxH5pKAq9Ueih%Sip-+?)@!gh7t)fqbL5Dl}?0I0Vnqy zaJ^M~LKS_M`u&sw08uMKDxXs(m(OLZ>bAW-0zn8;p?@MEv4!3|Dg`2;kbBY}qx9Ykzf>xbOeS3ikrye~-YUDcj1?QEUM>4dcJ0ye-TMVVG!ky^g!U?QIt>fy zEVrMXXY$wst^R{g1s;D|GFl=HS5j|c*(TF8v1`k$I}M%O{sP@)Hkr>%xnd4qzJO&I zd|dp_qYsPPS3T`OFH)vIY!Qw0V;P3)Mx@J@E+o*Z3c%^T2Ls=Pdi0R|0zX&AS3JYz Q{{R3007*qoM6N<$f>_8Q>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare1.png new file mode 100644 index 0000000000000000000000000000000000000000..adcc051ed5085cdd263023019959c96179e0832b GIT binary patch literal 574 zcmV-E0>S->P)Px$_(?=TR9J=WmOo3wKp4iKCe>nUiviIov!itiU9=RzQHyRmICK(3NAX*TYd?S> z8bv9HP}D_=9aid6B4 z+c1~Q>5~%^uI~!5D5kG&9rq&~hhXgtC1xIiAau>)`6DdEqKG6yD8!-wU?n&8vtRTT zz)a38jN2egHR^S%A(2GY2Ws^?f*fa!&E&0%k^uog|KVfof=Oa*PZh{Zij}-|Q9@o) zTjh+Fj)v9gw?d1p1aT#buy#za}yT*VQk(9ECd?z<6km5xkv2FPrUv5wV5GxQ4 zhaJz%USLb^QB+IdCbx$4D*)ZpDLKoq)Sd8GPD7Sqp}jvr)l{M_)khfQIA~4HaA2J- zZa*oHcW+1+&WWv_2oR6QeVI%~Z>S9-XkaK{-HYo7RR5a;4fN;w0=Wyk*kRMewg3PC M07*qoM6N<$f}{5PBLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare2.png new file mode 100644 index 0000000000000000000000000000000000000000..f694ec57b0cb1e2ccc79c6a930c9ff2ea58c4df4 GIT binary patch literal 722 zcmV;@0xkWCP)Px%j7da6R9J=WmO*GzaU93LPJP-;=W?xCc-VHROUMc~I)vV2#9+8~SeGQ$VTXp7 zc33c8MiJ{W@UV-}>QKbc27|(*r)bs2@Dwtnq=tptpRFfOecGYkpFLCm|G7nn{J?|v z{=Xl;-{=4I{r`WUNt6E_4NubWMQ^!YT-&0pIv#$v$gHp9Y5r{|jp)*4=#HO-!R%1Q zHSJcEw+Z%kQ!tnv(6n0t0J+a`;3~>238p}d%xL^Ueci&`+( zfl6ZIUbsRLxIz*7Q*`z8s$}Gn3{ATg_Df^HhsfatigFP;?XOg&abF;azCf^Qe&@h7 z?yrC;U^+Jl>%P0oZ>P7<&|eJ z8aE>9v7xJ{7sK5SU@Ba{SR(=eAW2zR#btEQj$kR7Qq9s6%>c+CiG$5tfw>p7noiK? zq{%<$Cys6V%tf|=t^fc407*qoM6N<$ Ef~@;lBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookrare3.png new file mode 100644 index 0000000000000000000000000000000000000000..947b87102c2ec73f4e0e98f91b16beaa21b176ba GIT binary patch literal 667 zcmV;M0%ZM(P)Px%RY^oaR9J=WmO*IKP#DMmNm`0vbh~IN?68wC*g-6a2PH6e>P4MBi5PdQ0};HH z>Oo2!!+GpQuq}8Cp&oSLtv3$_g6t$=1T4rVgC%y6u1$>xc`>g|`%(#bu)oX8``*X< z{_o5C-h04|8UH(66sPN#ZhDi(1zrfXs~;8S{D~;RzkNTz`!`pSIDG*rae*4==I7uY zSvcvmkrEfc&CdY}fa5sc z+Lb&2pt6}kW_cZ*eQm72n9kzs?khYl9xww(5@1;t)DH@7U%NvEzkl!Dh;Ox)LuX$@ zW_caJGXTKg=YT1IpEPI~1}w`$rSUX0cwH&^-^5P*yd#SloGCz(B+f7l6z@I>4KC-) zp(3KJJdywa*nF@RYCpSpk!puI>9ivWU{*npx>BM7HZ_%MZBxgOV||(_*%=5T=gY87 z9XGOT06?|2sYA|}ec$2pVjNRtfQV>nDiu7~2Y&AXav-sYlmU0(QhnRhsr1|CXxd|` zf=Ps}{BK|i=(~L+gg<|ZlphJ+)YOr3j8yTccaiiwU&!l0J#gcURNNdv%ZKhh+Rx)A@D*xC!r)s zT&vacoPx$?ny*JR9J=Wmd|U`U>L_g?~QOuiIc&&47{fX0Ma6@2e>4oRX^L}}Ly@5G%{&$3m zQ{(PxQY5(h^)Q|0o`sm~kl8D`}cmRBPLh1>q zH?~<{TOkZXOmhJMDTe^q_7XdLtxQ1TA5UKZfMu0{a(0$~N@9+rU8PJZ3p$s3ZWC|! zFw21NpU?|?1VI;X_Ylu*UWf=fN-?!Ekf!(GsLj(S_o-GZBuT=~UaL_3wFQjQ3wy|T zNV!}dYrniNrY^v)+CZ>K(3Gi(EGZLI@r`xXr;)8$f#!a`!;VG_rHL31vLQFa$x+CG4K} z!TQ?D#5H{tg-Vdt-f?aaMFSw+kostqz;m0t|L}RDJ!NK_P^HF}X(CU5(2obXzFKdA z4(--2UVm@p&ZyE5Z{577^iQ~0x=5(X<#Xoz6Z{54jk&@ZK!)A`0000Px$u1Q2eR9J=WmO)DbK@`V-=88#Ht{sZVg9LRe0uRzR=n#Pr)Hm?dt#kAhy5zBA z5P0buc!Jg3g&_Yhmzg*3{bt_Gn}MN*`tS0|7^Rn1 z9WTx^muEu%icIjbp>uq?ff8OMI38;o_o)#ay-K52CO96$r$zv%-(A5vjtD{s@M66Z z3#;sI=YSkRML30qWpP+I5ZXxrbaO6}45Vj(&2;aTon&_0x?{v`@QLZMo~;$m(W_EE zUGD%uI2t0XmH;rTPdsbOZR0X&`jo33XacAu3_Xsa$FZFxlT(Ebn?|iX7=W4iM+`mQ z1Oa+N3i#=@C+`0lJuHlR6qldkg`N5#DGOD6Rv q+*(+X`V)=@zBW`Q_)tUr3B3a=k&!H3lsw@800007 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png b/Resources/Textures/_DV/Objects/Misc/books.rsi/ancientbookuncommon3.png new file mode 100644 index 0000000000000000000000000000000000000000..422806a4b933a403e39d26de7dcc06172f41dabb GIT binary patch literal 665 zcmV;K0%rY*P)Px%Q%OWYR9J=WmO)5UaU93LtEbOM*>;$h*iD`n8Hk6cRL=v)w zM28)Qh=|0dR8vT58)C#3lElbd59<=CsY!{a27>OeH+0am7thmMz5a9mzt0Il``+IF z_kF+b=MV4w{(qpNivD+*SWGt^t*Vjck5)fW`*SSe>HRFGXIREG_OZg;N3YQU?7G`tjI1rVEcxiG;V?qa0nU^vZf~w2FJ*A`RvQt1Y4SM$z!nJW)-|7+l}--ObN`8HdvgUZ##2OiCa=I2 z2&0fp_=EhBkkk;C(sw)2WA`e$?q10m&_mT7)+00000NkvXXu0mjfNog~a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json index cdc6c23e03c..63deda319c7 100644 --- a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon_kiss by Kr8", + "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77, modified by AeraAulin (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,42 @@ "states": [ { "name": "icon_kiss" + }, + { + "name": "ancientbookdamaged1" + }, + { + "name": "ancientbookdamaged2" + }, + { + "name": "ancientbookdamaged3" + }, + { + "name": "ancientbookcommon1" + }, + { + "name": "ancientbookcommon2" + }, + { + "name": "ancientbookcommon3" + }, + { + "name": "ancientbookuncommon1" + }, + { + "name": "ancientbookuncommon2" + }, + { + "name": "ancientbookuncommon3" + }, + { + "name": "ancientbookrare1" + }, + { + "name": "ancientbookrare2" + }, + { + "name": "ancientbookrare3" } ] } diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..0a90c1c9e002fc350a9136301c37851d14b5710e GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|QaxQ9Ln`LH zy>gJ(!9m3JBB$+!4T2XNj<_*<1x{zXlDLp%t%t@T6`yBwnDXlGJ!%JPfrAgi$1Cp^ zU%!)Y?b?&P&){2X#_Lz5>Ngp$<@R6lENgh9ds*NqJJ9lFa$inzo9{?mco3x3)78&q Iol`;+08Pp|`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3f7ed3c975b84dd4b060c6a474904d3ad5bd9c92 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T$PmI2iNm-HN`)yscFbyU!rGqHet~rp9_IpkCGy8 zidZwSrO8>hD~9cRDc030las>(#4eUi8SH2Jj8hYUfa7Y=vDJKOhE~$z362|6-hTVP zyn5Axnh2)mM%L{9WC?+HSqBr2{OnU)Q>w+hDK3eTJ5g1j;J>Z;;lHzt*x1-K*%aH> z7Z|4U9kK-3&sLq3A{t>9BJ$@{LZr>q#Oz!iW@cuUr`lX~sW(2)nR&3|v+PYi1xvw4 zOsiK#vtMI;!nDd#Va?X61X%|?g_DfOt2YOB#R1J_6F<3MX{6Rw zjgMMy{id+3Sk<PZlG@Kp^?y_L();b(?;d z-S}+rXy(zZudAz{sy$G2*E8eRi`Q=te^mLLC;qmA eiGkt4`d9|1{WdlGi;o`w8R+Ti=d#Wzp$P!wO=8Y+t zN=r}Q7hAZQK}l)dD%a4`85#E%u6niV*6TN?nSN{wc++(6;bkYo-{1d0%mk7SK4;EU zi^(tE{`jNb?7IiUPVY>~GzyuQP;2MTq8Xdl|MlbPDkJ0fF^;kY`(jdSZCt-sChfNG gTAg+5F;I8xJIh#`ntShDJU|9|y85}Sb4q9e0Dw?($PmI2iNm-HN`)yscFbyU!rGqHet~rp9_IpkCGy8 zidZwSrO8>hD~9cRDc030las>(#4eUi8SH2Jj8hYUfa7Y=vDJKOhE~$z362|6-hTVP zyn5Axnh2)mM%L{9WC?+HSqBr2{OnU)Q>w+hDK3eTJ5g1j;J>Z;;lHzt*x1-K*%aH> z7Z|4U9kK-3&sLq3A{t>9BJ$@{LZr>q#Oz!iW@cuUr`lX~sW(2)nR&3|v+PYi1xvw4 zOsiK#vtMI;!nDd#Va?X61X%|?g_DfOt2YOB#R1J_6F<3M Date: Tue, 12 Aug 2025 02:51:04 +0000 Subject: [PATCH 03/34] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../Tools/book_restoration.rsi/meta.json | 52 ++++++------ .../Storage/display_cases.rsi/meta.json | 82 +++++++++---------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json index 2076f769088..312825683d0 100644 --- a/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Tools/book_restoration.rsi/meta.json @@ -1,29 +1,29 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by AeraAulin (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by AeraAulin (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "storage" - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "storage" + } + ] } diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json index e3328a5a4b7..3f57d4c2b37 100644 --- a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json @@ -1,44 +1,44 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified by AeraAulin (Github),", - "states": [ - { - "name": "display_case" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "display_case_glass" - }, - { - "name": "display_case_open" - }, - { - "name": "display_case_icon" - }, - { - "name": "locked" - }, - { - "name": "unlocked" - }, - { - "name": "welded" - }, - { - "name": "paper" - }, - { - "name": "bounty" - }, - { - "name": "captains_paper" - }, - { - "name": "invoice" - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified by AeraAulin (Github),", + "states": [ + { + "name": "display_case" + }, + { + "name": "display_case_glass" + }, + { + "name": "display_case_open" + }, + { + "name": "display_case_icon" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "welded" + }, + { + "name": "paper" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" + } + ] } From 1c3d15efe405ae80ae3273856a9a43ac3fb66bcc Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:16:34 -0700 Subject: [PATCH 04/34] a little bit of cleanup. consolidated common components on the ancient books into a base entity. --- .../Entities/Objects/Misc/ancient_books.yml | 5 - .../_DV/Entities/Objects/Misc/books.yml | 266 +++--------------- 2 files changed, 39 insertions(+), 232 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml index b191bbfd24d..d1bf245b928 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml @@ -5,11 +5,6 @@ id: AncientBookBase name: Ancient Book components: - - type: Sprite - layers: - - sprite: Objects/Materials/Shards/shard.rsi - state: shard1 - map: [ "enum.DamageStateVisualLayers.Base" ] - type: StaticPrice price: 10 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index 2df1ed3643e..f441580efdb 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -111,6 +111,37 @@ - type: entity parent: BaseItem + id: BaseAncientBookReadable + name: Base Ancient Book + abstract: true + components: + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Tag + tags: + - Book + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" + backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 + contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: MeleeWeapon + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 + +- type: entity + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon1 name: Common Ancient Book 1 description: placeholder name and desc until story is written. @@ -121,33 +152,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon2 name: Common Ancient Book 2 description: placeholder name and desc until story is written. @@ -158,33 +165,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon3 name: Common Ancient Book 3 description: placeholder name and desc until story is written. @@ -195,33 +178,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookUncommon1 name: Uncommon Ancient Book 1 description: placeholder name and desc until story is written. @@ -229,36 +188,9 @@ - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon1 - - type: Paper - content: book-text-fishops - contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookUncommon2 name: Uncommon Ancient Book 2 description: placeholder name and desc until story is written. @@ -269,33 +201,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookUncommon3 name: Uncommon Ancient Book 3 description: placeholder name and desc until story is written. @@ -306,33 +214,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare1 name: Rare Ancient Book 1 description: placeholder name and desc until story is written. @@ -343,33 +227,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare2 name: Rare Ancient Book 2 description: placeholder name and desc until story is written. @@ -380,33 +240,9 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare3 name: Rare Ancient Book 3 description: placeholder name and desc until story is written. @@ -417,27 +253,3 @@ - type: Paper content: book-text-fishops contentSize: 12000 - - type: ActivatableUI - key: enum.PaperUiKey.Key - requiresComplex: false - - type: UserInterface - interfaces: - enum.PaperUiKey.Key: - type: PaperBoundUserInterface - - type: Tag - tags: - - Book - - type: PaperVisuals - backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" - backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 - contentMargin: 20.0, 20.0, 20.0, 20.0 - - type: MeleeWeapon - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 From c30a5e67383cd416a143c7fc02fc2b9e7948fb86 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sat, 16 Aug 2025 04:31:13 -0700 Subject: [PATCH 05/34] hopefully committing this before merging upstream changes doesn't kill me --- .../Storage/DisplayCases/display_cases.yml | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index 33f75007a68..06744160b8c 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -1,9 +1,28 @@ - type: entity id: DisplayCaseArtifact - parent: [BaseMachinePowered, CrateArtifactContainer] + parent: [BaseMachinePowered, DisplayCase, CrateArtifactContainer] name: Artifact Display Case description: A sturdy display case for showing off interesting artifacts. components: + - type: ResearchPointSource + pointspersecond: 5 + active: true + - type: PowerSwitch + - type: ResearchClient + - type: ActivatableUI + key: enum.ResearchClientUiKey.Key + - type: ActivatableUIRequiresPower + - type: UserInterface + interfaces: + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface + +- type: entity + id: DisplayCase + parent: [CrateBaseSecure] + name: Display Case + description: A sturdy display case. This one doesn't give any research points, but you can put whatever you want in it. + components: - type: AccessReader access: [["Research"]] - type: Sprite @@ -29,15 +48,3 @@ sprite: _DV/Structures/Storage/display_cases.rsi stateDoorOpen: display_case_open stateDoorClosed: display_case_glass - - type: ResearchPointSource - pointspersecond: 5 - active: true - - type: PowerSwitch - - type: ResearchClient - - type: ActivatableUI - key: enum.ResearchClientUiKey.Key - - type: ActivatableUIRequiresPower - - type: UserInterface - interfaces: - enum.ResearchClientUiKey.Key: - type: ResearchClientBoundUserInterface From fc1dc22bb4a047a0cc5d1099efff927bbdf70051 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sat, 16 Aug 2025 04:48:29 -0700 Subject: [PATCH 06/34] pls don't break --- Resources/Textures/Interface/Misc/job_icons.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 7b19bcd9b57..6be47457a8e 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | Librarian re-recoloured by AeraAulin (github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github)| Cluwne icon by Professor Renderer (Discord)| Librarian re-recoloured by AeraAulin (github)", "size": { "x": 8, "y": 8 From cf3b2f366fd33b8517f4977231b191c774ccc832 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sun, 17 Aug 2025 13:50:12 -0700 Subject: [PATCH 07/34] AAAAAAAAAAAAA --- Resources/Locale/en-US/job/job-names.ftl | 4 +-- .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Xenoarchaeology/item_artifacts.yml | 3 ++ .../Xenoarchaeology/structure_artifacts.yml | 10 +++++++ .../CircuitBoards/Machine/displaycase.yml | 18 ++++++++++++ .../Storage/DisplayCases/display_cases.yml | 29 ++++++++++++++++++- .../_DV/Recipes/Lathes/Packs/epistemics.yml | 1 + .../_DV/Recipes/Lathes/electronics.yml | 5 ++++ .../Prototypes/_DV/Research/experimental.yml | 11 +++++++ Resources/Prototypes/_DV/tags.yml | 3 ++ 11 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml create mode 100644 Resources/Prototypes/_DV/Research/experimental.yml diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index d1a79487ca4..53da0902e9b 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -25,8 +25,8 @@ job-name-cburn = Centcomm Quarantine Officer job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician -# DeltaV - Changed Librarian to Curator -job-name-librarian = Curator +# DeltaV - Changed Librarian to Archivist +job-name-librarian = Archivist # DeltaV - Changed Lawyer to Attorney # job-name-lawyer = Lawyer job-name-mime = Mime diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 196065f3701..c646ee82910 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -565,7 +565,7 @@ - type: entity parent: BaseWidePDA id: LibrarianPDA - name: Curator PDA + name: Archivist PDA # DeltaV - Librarian renamed to Archivist description: Smells like old books and ozone. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index f2d02efcb4f..50e435d0f0e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -353,7 +353,7 @@ - type: entity parent: IDCardStandard id: LibrarianIDCard - name: Curator ID card + name: Archivist ID card # DeltaV - Librarian renamed to Archivist components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml index 036b876a97a..d3d54a29d9a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml @@ -54,6 +54,9 @@ enum.IntercomUiKey.Key: type: IntercomBoundUserInterface - type: Appearance + - type: Tag + tags: + - Artifact - type: Item size: Normal sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index fb628fc8083..0a491d7aec3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -15,6 +15,8 @@ - state: ano30_on map: [ "enum.ArtifactsVisualLayers.Effect" ] visible: false + - type: Item # DeltaV - needs to be able to get picked up for display cases + size: Ginormous # DeltaV - type: Damageable - type: Physics bodyType: Dynamic @@ -53,11 +55,19 @@ - enum.ArtifactsVisualLayers.Effect: ano01_on: Rainbow - type: Appearance + - type: Tag + tags: + - Artifact - type: Actions - type: Psionic #Nyano - Summary: Makes psionic on creation. - type: GuideHelp guides: - Xenoarchaeology + - type: MultiHandedItem # DeltaV - but that doesn't mean it should be easy to carry + - type: ClothingSpeedModifier # DeltaV - Or light. + walkModifier: 0.5 # DeltaV + sprintModifier: 0.5 # DeltaV + - type: HeldSpeedModifier # DeltaV - type: StealTarget stealGroup: XenoArtifact - type: ContainerContainer diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml new file mode 100644 index 00000000000..78aa5d13d4f --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/displaycase.yml @@ -0,0 +1,18 @@ +- type: entity + parent: BaseMachineCircuitboard + id: ArtifactDisplayCaseMachineCircuitBoard + name: artifact display case machine board + components: + - type: Sprite + state: science + - type: MachineBoard + prototype: DisplayCaseArtifact + stackRequirements: + Manipulator: 2 + Glass: 5 + Steel: 5 + Cable: 5 + tagRequirements: + Artifact: + amount: 1 + defaultPrototype: SimpleXenoArtifactItem diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index 06744160b8c..b5e4550903a 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -1,17 +1,33 @@ - type: entity id: DisplayCaseArtifact - parent: [BaseMachinePowered, DisplayCase, CrateArtifactContainer] + parent: [BaseMachinePowered, DisplayCase] name: Artifact Display Case description: A sturdy display case for showing off interesting artifacts. components: - type: ResearchPointSource pointspersecond: 5 active: true + - type: Machine + board: ArtifactDisplayCaseMachineCircuitBoard - type: PowerSwitch - type: ResearchClient - type: ActivatableUI key: enum.ResearchClientUiKey.Key - type: ActivatableUIRequiresPower + - type: PointLight # DeltaV + radius: 0.8 + energy: 0.5 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.29" + density: 50 + mask: + - CrateMask #this is so they can go under plastic flaps + layer: + - MachineLayer - type: UserInterface interfaces: enum.ResearchClientUiKey.Key: @@ -41,6 +57,17 @@ shader: unshaded - state: paper map: ["enum.PaperLabelVisuals.Layer"] + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.29" + density: 50 + mask: + - CrateMask #this is so they can go under plastic flaps + layer: + - MachineLayer - type: Icon sprite: _DV/Structures/Storage/display_cases.rsi state: display_case_icon diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml index 3928c21bdaf..68597bea9af 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml @@ -9,3 +9,4 @@ id: EpistemicsBoards recipes: - ReverseEngineeringMachineCircuitboard + - ArtifactDisplayCaseMachineCircuitBoard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml index 7022448e076..5c6f21e3df6 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml @@ -42,3 +42,8 @@ parent: BaseCircuitboardRecipe id: DeepFryerMachineCircuitboard result: DeepFryerMachineCircuitboard + +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: ArtifactDisplayCaseMachineCircuitBoard + result: ArtifactDisplayCaseMachineCircuitBoard diff --git a/Resources/Prototypes/_DV/Research/experimental.yml b/Resources/Prototypes/_DV/Research/experimental.yml new file mode 100644 index 00000000000..eda92668bde --- /dev/null +++ b/Resources/Prototypes/_DV/Research/experimental.yml @@ -0,0 +1,11 @@ +- type: technology + id: ArtifactDisplayCases + name: Artifact Display Technology + icon: + sprite: _DV/Structures/Storage/display_cases.rsi + state: display_case_icon + discipline: Experimental + tier: 2 + cost: 5000 + recipeUnlocks: + - ArtifactDisplayCaseMachineCircuitBoard diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 850b0b561c4..ba45ea46203 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -1,5 +1,8 @@ ## This is for Nyano and Delta V tags +- type: Tag + id: Artifact + - type: Tag id: AugmentAPCBoard From 355e29d339711a8fb8256f9ff3534d72d2bec26e Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sun, 17 Aug 2025 14:05:23 -0700 Subject: [PATCH 08/34] webedit some comments Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com> --- .../Xenoarchaeology/structure_artifacts.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index 0a491d7aec3..be7c6e251c6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -15,8 +15,10 @@ - state: ano30_on map: [ "enum.ArtifactsVisualLayers.Effect" ] visible: false - - type: Item # DeltaV - needs to be able to get picked up for display cases - size: Ginormous # DeltaV + # Begin DeltaV Additions + - type: Item + size: Ginormous + # End DeltaV Additions - type: Damageable - type: Physics bodyType: Dynamic @@ -63,11 +65,13 @@ - type: GuideHelp guides: - Xenoarchaeology - - type: MultiHandedItem # DeltaV - but that doesn't mean it should be easy to carry - - type: ClothingSpeedModifier # DeltaV - Or light. - walkModifier: 0.5 # DeltaV - sprintModifier: 0.5 # DeltaV - - type: HeldSpeedModifier # DeltaV +# Begin DeltaV Additions + - type: MultiHandedItem + - type: ClothingSpeedModifier + walkModifier: 0.5 + sprintModifier: 0.5 + - type: HeldSpeedModifier +# End DeltaV Additions - type: StealTarget stealGroup: XenoArtifact - type: ContainerContainer From b942ab4f0ea1aadcd54df38ef61483b1c5a1dcd1 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sun, 17 Aug 2025 14:09:56 -0700 Subject: [PATCH 09/34] changed description back to original --- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index c646ee82910..a6bd43b1ffd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -566,7 +566,7 @@ parent: BaseWidePDA id: LibrarianPDA name: Archivist PDA # DeltaV - Librarian renamed to Archivist - description: Smells like old books and ozone. + description: Smells like books. components: - type: Pda id: LibrarianIDCard From 14857d03ce9b2c70e4c01048f841495d4d0f7bb7 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sun, 17 Aug 2025 14:36:26 -0700 Subject: [PATCH 10/34] let regular display cases get purchased from Cargo --- .../Prototypes/_DV/Catalog/Cargo/cargo_science.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml index 703619be18a..a67c18b7cec 100644 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml @@ -7,3 +7,13 @@ cost: 1000 category: Science group: market + +- type: cargoProduct + id: DisplayCase + icon: + sprite: _DV/Structures/Storage/display_cases.rsi + state: display_case_icon + product: DisplayCase + cost: 500 + category: Science + group: market From fe6fcceca99f73920b2d2109c0b890877871580c Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:47:40 -0700 Subject: [PATCH 11/34] proper placeholder stuff --- .../Locale/en-US/_DV/paper/book-salvage.ftl | 2 + .../_DV/Entities/Objects/Misc/books.yml | 37 ++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Resources/Locale/en-US/_DV/paper/book-salvage.ftl b/Resources/Locale/en-US/_DV/paper/book-salvage.ftl index 9736f6ccdaf..f4221cf3bd1 100644 --- a/Resources/Locale/en-US/_DV/paper/book-salvage.ftl +++ b/Resources/Locale/en-US/_DV/paper/book-salvage.ftl @@ -56,3 +56,5 @@ book-text-gorlexgirlfriend = It's the 197th version of the infamous Gorlex Girlf Most of the magazine is either Syndicate propaganda or advertisements for Syndicate-branded items like soda or merch from the show. At least there are some coupons on the back for them. On the last page is an ad for the Gorlex Girlfriends dating app... and the Gorlex Girlfriends Hotline. + +book-text-ancientbookcommon-1 = the text seems to shift and move, rendering it completely unreadable... but you feel as though these stories will become legible in time, and feel determined to keep uncovering the past. diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index f441580efdb..b6409ca0f82 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -143,113 +143,116 @@ - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon1 - name: Common Ancient Book 1 + name: Ancient Worn Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon1 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon2 - name: Common Ancient Book 2 + name: Ancient Tattered Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon2 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookCommon3 - name: Common Ancient Book 3 + name: Ancient Fractured Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon3 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] - id: AncientBookUncommon1 + id: Ancient Heavy Book name: Uncommon Ancient Book 1 description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon1 + - type: Paper + content: book-text-ancientbookcommon-1 + contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookUncommon2 - name: Uncommon Ancient Book 2 + name: Ancient Dusty Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon2 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookUncommon3 - name: Uncommon Ancient Book 3 + name: Ancient Wellworn Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon3 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare1 - name: Rare Ancient Book 1 + name: Ancient Mysterious Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare1 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare2 - name: Rare Ancient Book 2 + name: Ancient Ominous Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare2 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 - type: entity parent: [ BaseItem, BaseAncientBookReadable ] id: AncientBookRare3 - name: Rare Ancient Book 3 + name: Ancient Shining Book description: placeholder name and desc until story is written. components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare3 - type: Paper - content: book-text-fishops + content: book-text-ancientbookcommon-1 contentSize: 12000 From d7464c725d1679b3fa0b922e489cd01943ba2a91 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:47:59 -0700 Subject: [PATCH 12/34] book --- .../Entities/Objects/Misc/ancient_books.yml | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml index d1bf245b928..08106d583c8 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml @@ -72,12 +72,7 @@ - state: cover_strong color: "#0f204f" - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + color: "#a6adb8" - type: Construction graph: AncientBookCommonRestored node: bookrestored @@ -102,14 +97,9 @@ layers: - state: paper - state: cover_strong - color: "#0f204f" + color: "#771c1c" - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + color: "#a6adb8" - type: Construction graph: AncientBookUncommonRestored node: bookrestored @@ -134,14 +124,9 @@ layers: - state: paper - state: cover_strong - color: "#0f204f" + color: "#61104f" - state: decor_wingette_circle - color: "#2c5491" - - state: decor_vertical_middle - color: "#3c6ab0" - - state: icon_fish - - state: detail_bookmark - color: "#2c5491" + color: "#a6adb8" - type: Construction graph: AncientBookRareRestored node: bookrestored From d437668f35bc5a0e03842f09da95ce175b6e3c97 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:56:07 -0700 Subject: [PATCH 13/34] fix some locale stuff that the linter was yelling at me for --- Resources/Locale/en-US/_DV/research/technologies.ftl | 1 + Resources/Prototypes/_DV/Research/experimental.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl index d915fcf1697..fdf78f1cbcc 100644 --- a/Resources/Locale/en-US/_DV/research/technologies.ftl +++ b/Resources/Locale/en-US/_DV/research/technologies.ftl @@ -8,6 +8,7 @@ research-technology-engineering-eva = EVA PPE Suits # Experimental research-technology-cloning = Cloning +research-technology-artifact-display = Artifact Display Technology # Civilian research-technology-civilian-mechs = Civilian Mechs diff --git a/Resources/Prototypes/_DV/Research/experimental.yml b/Resources/Prototypes/_DV/Research/experimental.yml index eda92668bde..3d2e8aa7a5a 100644 --- a/Resources/Prototypes/_DV/Research/experimental.yml +++ b/Resources/Prototypes/_DV/Research/experimental.yml @@ -1,6 +1,6 @@ - type: technology id: ArtifactDisplayCases - name: Artifact Display Technology + name: research-technology-artifact-display icon: sprite: _DV/Structures/Storage/display_cases.rsi state: display_case_icon From 28cc067322dedbc9f22d21824b8d9b0abe103bb7 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 12:03:06 -0700 Subject: [PATCH 14/34] eepy accidentally renamed the ID and not the name --- Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index b6409ca0f82..4c8d283b44d 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -181,8 +181,8 @@ - type: entity parent: [ BaseItem, BaseAncientBookReadable ] - id: Ancient Heavy Book - name: Uncommon Ancient Book 1 + id: AncientBookUncommon1 + name: Ancient Heavy Book description: placeholder name and desc until story is written. components: - type: Sprite From 42f3927ae18408e74d09697115073947f10effd1 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 12:13:15 -0700 Subject: [PATCH 15/34] add forgotten deltav comments --- .../Objects/Specific/Xenoarchaeology/item_artifacts.yml | 2 ++ .../Objects/Specific/Xenoarchaeology/structure_artifacts.yml | 2 ++ Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml index d3d54a29d9a..4f43a75dcb9 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml @@ -54,9 +54,11 @@ enum.IntercomUiKey.Key: type: IntercomBoundUserInterface - type: Appearance + # Begin DeltaV Additions - type: Tag tags: - Artifact + # End DeltaV Additions - type: Item size: Normal sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index be7c6e251c6..89ef2f5c76f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -57,9 +57,11 @@ - enum.ArtifactsVisualLayers.Effect: ano01_on: Rainbow - type: Appearance +# Begin DeltaV Additions - type: Tag tags: - Artifact +# End DeltaV Additions - type: Actions - type: Psionic #Nyano - Summary: Makes psionic on creation. - type: GuideHelp diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 6473987c7aa..cfbde734348 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -10,7 +10,7 @@ - Service - Maintenance - Library # DeltaV - Add Library access - - Research + - Research # DeltaV - Moved to epistemics department - type: startingGear id: LibrarianGear From 628552a7ecae18e947de68ba0264539510af0397 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 21 Aug 2025 15:10:55 -0700 Subject: [PATCH 16/34] swap a thing around --- .../Entities/Structures/Storage/DisplayCases/display_cases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index b5e4550903a..1b65712e948 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -1,6 +1,6 @@ - type: entity id: DisplayCaseArtifact - parent: [BaseMachinePowered, DisplayCase] + parent: [ DisplayCase, BaseMachinePowered ] name: Artifact Display Case description: A sturdy display case for showing off interesting artifacts. components: From d32218349f108c19b5d456b76e94fcef9349c4b0 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:11:53 -0700 Subject: [PATCH 17/34] should have most fixed I hope --- Resources/Locale/en-US/_DV/job/archivist.ftl | 2 + Resources/Locale/en-US/_DV/job/job-names.ftl | 1 + Resources/Locale/en-US/_DV/recipes/tags.ftl | 5 +- Resources/Locale/en-US/job/job-names.ftl | 2 +- Resources/Prototypes/Datasets/ion_storm.yml | 2 +- .../Spawners/Random/Salvage/tables_loot.yml | 2 - .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Objects/Misc/ancient_books.yml | 13 ++- .../_DV/Entities/Objects/Misc/books.yml | 84 +++++++------------ .../Objects/Tools/book_restoration_kit.yml | 2 +- .../Storage/DisplayCases/display_cases.yml | 4 +- 12 files changed, 48 insertions(+), 73 deletions(-) create mode 100644 Resources/Locale/en-US/_DV/job/archivist.ftl diff --git a/Resources/Locale/en-US/_DV/job/archivist.ftl b/Resources/Locale/en-US/_DV/job/archivist.ftl new file mode 100644 index 00000000000..ddfa5b90d9e --- /dev/null +++ b/Resources/Locale/en-US/_DV/job/archivist.ftl @@ -0,0 +1,2 @@ +ent-LibrarianPDA = archivist PDA +ent-LibrarianIDCard = archivist ID card diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl index c8fa13d0d55..6a95081250d 100644 --- a/Resources/Locale/en-US/_DV/job/job-names.ftl +++ b/Resources/Locale/en-US/_DV/job/job-names.ftl @@ -7,6 +7,7 @@ job-name-lawyer = Attorney job-name-courier = Courier job-name-cargo-assistant = Cargo Assistant job-name-security-borg = Security Cyborg +job-name-librarian = Archivist # Used by the Agent ID job-name-senior-physician = Physician Mentor job-name-senior-researcher = Research Mentor diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 8be44718a72..4b163622533 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -36,6 +36,5 @@ construction-graph-tag-carp-plushie = carp plushie construction-graph-tag-mothroach-hide = mothroach hide # Ancient books -construction-graph-tag-ancientbook-common = Damaged Ancient Book -construction-graph-tag-ancientbook-uncommon = Damaged Ancient Book -construction-graph-tag-ancientbook-rare = Damaged Ancient Book +construction-graph-tag-ancientbook = Damaged Ancient Book + diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 53da0902e9b..37b473cd90f 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -26,7 +26,7 @@ job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician # DeltaV - Changed Librarian to Archivist -job-name-librarian = Archivist +# job-name-librarian = Librarian # DeltaV - Changed Lawyer to Attorney # job-name-lawyer = Lawyer job-name-mime = Mime diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index c2d3ad08603..bfa9e0409ea 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -342,7 +342,7 @@ - HEADS OF STAFF - JANITORS - LAWYERS - - CURATORS # DeltaV - Replace librarians with Curators + - ARCHIVISTS # DeltaV - Replace librarians with Curators - MEDICAL DOCTORS - MIMES - MUSICIANS diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index d15ec1c6b76..7b9b1692d19 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -107,7 +107,6 @@ tableId: RandomInstrumentTable - id: AncientBookDamagedCommon # DeltaV - - type: entityTable id: SalvageTreasureUncommon table: !type:GroupSelector @@ -168,7 +167,6 @@ tableId: RingTableRare - id: AncientBookDamagedRare # DeltaV - - type: entityTable id: SalvageTreasureLegendary table: !type:GroupSelector diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index a6bd43b1ffd..4035f635d0c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -565,7 +565,7 @@ - type: entity parent: BaseWidePDA id: LibrarianPDA - name: Archivist PDA # DeltaV - Librarian renamed to Archivist + name: librarian PDA description: Smells like books. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 50e435d0f0e..c02a81455e5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -353,7 +353,7 @@ - type: entity parent: IDCardStandard id: LibrarianIDCard - name: Archivist ID card # DeltaV - Librarian renamed to Archivist + name: librarian ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml index 08106d583c8..e00a90c1309 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/ancient_books.yml @@ -1,5 +1,4 @@ - type: entity - categories: [ HideSpawnMenu ] parent: BaseItem abstract: true id: AncientBookBase @@ -11,7 +10,7 @@ - type: entity parent: AncientBookBase id: AncientBookDamagedCommon - name: Damaged Ancient Book + name: damaged ancient book description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. components: - type: Sprite @@ -28,7 +27,7 @@ - type: entity parent: AncientBookBase id: AncientBookDamagedUncommon - name: Damaged Ancient Book + name: damaged ancient book description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. components: - type: Sprite @@ -45,7 +44,7 @@ - type: entity parent: AncientBookBase id: AncientBookDamagedRare - name: Damaged Ancient Book + name: damaged ancient book description: An ancient book that has seen better times. The cover and words are illegible, but surely someone could restore it. components: - type: Sprite @@ -62,7 +61,7 @@ - type: entity parent: AncientBookBase id: AncientBookCommon - name: Common Ancient Book + name: common ancient book description: A very old book commonly found in archives. Read it to discover what it is. components: - type: Sprite @@ -89,7 +88,7 @@ - type: entity parent: AncientBookBase id: AncientBookUncommon - name: Uncommon Ancient Book + name: uncommon ancient book description: A very old book generally only found in private collections. Read it to discover what it is. components: - type: Sprite @@ -116,7 +115,7 @@ - type: entity parent: AncientBookBase id: AncientBookRare - name: Rare Ancient Book + name: rare ancient book description: A very old book sought after for it's rarity and value. Read it to discover what it is. components: - type: Sprite diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml index 4c8d283b44d..6f80619cc71 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/books.yml @@ -110,7 +110,7 @@ - Salvage - type: entity - parent: BaseItem + parent: BaseItem # inherits from baseitem instead of BookBase because sprites break using BookBase id: BaseAncientBookReadable name: Base Ancient Book abstract: true @@ -129,6 +129,9 @@ backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: Paper + content: book-text-ancientbookcommon-1 + contentSize: 12000 - type: MeleeWeapon soundHit: collection: Punch @@ -141,118 +144,91 @@ Blunt: 1 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookCommon1 - name: Ancient Worn Book - description: placeholder name and desc until story is written. + name: ancient worn book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon1 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookCommon2 - name: Ancient Tattered Book - description: placeholder name and desc until story is written. + name: ancient tattered book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon2 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookCommon3 - name: Ancient Fractured Book - description: placeholder name and desc until story is written. + name: ancient fractured book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookcommon3 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookUncommon1 - name: Ancient Heavy Book - description: placeholder name and desc until story is written. + name: ancient heavy book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon1 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookUncommon2 name: Ancient Dusty Book - description: placeholder name and desc until story is written. + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon2 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookUncommon3 - name: Ancient Wellworn Book - description: placeholder name and desc until story is written. + name: ancient wellworn book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookuncommon3 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookRare1 - name: Ancient Mysterious Book - description: placeholder name and desc until story is written. + name: ancient mysterious book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare1 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookRare2 - name: Ancient Ominous Book - description: placeholder name and desc until story is written. + name: ancient ominous book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare2 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 - type: entity - parent: [ BaseItem, BaseAncientBookReadable ] + parent: BaseAncientBookReadable id: AncientBookRare3 - name: Ancient Shining Book - description: placeholder name and desc until story is written. + name: ancient shining book + description: An ancient book lost to time. One can only wonder what can be learned from these... components: - type: Sprite sprite: _DV/Objects/Misc/books.rsi state: ancientbookrare3 - - type: Paper - content: book-text-ancientbookcommon-1 - contentSize: 12000 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml index 6903931fc6c..c3f99a0f93b 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml @@ -7,7 +7,7 @@ - type: entity - name: Book Restoration Kit + name: book restoration kit parent: BaseItem id: BookRestorationKit description: A kit filled with various tools necessary for restoring old and damaged books. This one smells a bit like vanilla. diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index 1b65712e948..435e81421e5 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -1,7 +1,7 @@ - type: entity id: DisplayCaseArtifact parent: [ DisplayCase, BaseMachinePowered ] - name: Artifact Display Case + name: artifact display case description: A sturdy display case for showing off interesting artifacts. components: - type: ResearchPointSource @@ -36,7 +36,7 @@ - type: entity id: DisplayCase parent: [CrateBaseSecure] - name: Display Case + name: display case description: A sturdy display case. This one doesn't give any research points, but you can put whatever you want in it. components: - type: AccessReader From d1616dc8d329a7306aa1ebc8c2abe0d15aea9433 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 18:12:34 +0000 Subject: [PATCH 18/34] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Resources/Locale/en-US/_DV/recipes/tags.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 4b163622533..83eaecc8533 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -37,4 +37,3 @@ construction-graph-tag-mothroach-hide = mothroach hide # Ancient books construction-graph-tag-ancientbook = Damaged Ancient Book - From 5ab9b97b9b397925020d6c3315dbd9c92255b061 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:47:03 -0700 Subject: [PATCH 19/34] remove tag from book restoration kit --- .../_DV/Entities/Objects/Tools/book_restoration_kit.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml index c3f99a0f93b..183150e6e53 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/book_restoration_kit.yml @@ -15,9 +15,6 @@ - type: EmitSoundOnLand sound: path: /Audio/Items/wrench_drop.ogg - - type: Tag - tags: - - Wrench - type: Sprite sprite: _DV/Objects/Tools/book_restoration.rsi state: icon From e7691ccbb06ff508af79dea366df49cdcadf8bb8 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:06:26 -0700 Subject: [PATCH 20/34] i hope I have done this right but I am tired and can't find any good examples to work off of right now --- .../Storage/DisplayCases/display_cases.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index 435e81421e5..244385734f3 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -4,6 +4,24 @@ name: artifact display case description: A sturdy display case for showing off interesting artifacts. components: + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: [] + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] - type: ResearchPointSource pointspersecond: 5 active: true From 80d27f02796f18d4dfef14048c5188cd197cc3d0 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:30:01 -0700 Subject: [PATCH 21/34] hopefully this fixes it right --- .../Prototypes/_DV/Catalog/Cargo/cargo_science.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml index a67c18b7cec..37b567cb807 100644 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml @@ -1,13 +1,3 @@ -- type: cargoProduct - id: OilPackCrate - icon: - sprite: _DV/Objects/Medical/Oilpack.rsi - state: icon - product: CrateOilPack - cost: 1000 - category: Science - group: market - - type: cargoProduct id: DisplayCase icon: From 6e338c022ae94eaa326a2952436dd0c8a5304a12 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:31:04 -0700 Subject: [PATCH 22/34] did not, let's try this --- Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml deleted file mode 100644 index 37b567cb807..00000000000 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: DisplayCase - icon: - sprite: _DV/Structures/Storage/display_cases.rsi - state: display_case_icon - product: DisplayCase - cost: 500 - category: Science - group: market From 6eaeb737734b3f576066e55c7b3c8fe4fcc57bd3 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:32:11 -0700 Subject: [PATCH 23/34] this was so incredibly annoying --- Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml new file mode 100644 index 00000000000..37b567cb807 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_science.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: DisplayCase + icon: + sprite: _DV/Structures/Storage/display_cases.rsi + state: display_case_icon + product: DisplayCase + cost: 500 + category: Science + group: market From 4b5a2ab787820fefaf45ce413e5b8177ddc2ffb1 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:43:28 -0700 Subject: [PATCH 24/34] hopefully got this right too. library is from us so should be fine to remove from the upstream file --- Resources/Prototypes/Access/service.yml | 1 - Resources/Prototypes/_DV/Access/epistemics.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml index 39394d7f41f..bf00fc72896 100644 --- a/Resources/Prototypes/Access/service.yml +++ b/Resources/Prototypes/Access/service.yml @@ -44,7 +44,6 @@ - Lawyer - Boxer # DeltaV - Add Boxer access - Clown # DeltaV - Add Clown access - - Library # DeltaV - Add Library access - Mime # DeltaV - Add Mime access - Musician # DeltaV - Add Musician access - Reporter # DeltaV - Add Reporter access diff --git a/Resources/Prototypes/_DV/Access/epistemics.yml b/Resources/Prototypes/_DV/Access/epistemics.yml index ed62a9b3d78..bb116374f39 100644 --- a/Resources/Prototypes/_DV/Access/epistemics.yml +++ b/Resources/Prototypes/_DV/Access/epistemics.yml @@ -12,3 +12,4 @@ - Robotics - Mantis - Chapel + - Library # DeltaV - Add Library access From b37212d91877ad26be56de5d50284297a2128ad0 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Wed, 27 Aug 2025 00:16:33 -0700 Subject: [PATCH 25/34] aaaaaa also TGstation deleted the original antique laser case sprite and I can't find it --- .../Storage/DisplayCases/display_cases.yml | 16 ++-------------- .../ServerInfo/Guidebook/Science/Science.xml | 6 ++++-- .../ServerInfo/Guidebook/Service/Service.xml | 2 -- .../_DV/Objects/Misc/books.rsi/meta.json | 2 +- .../Storage/display_cases.rsi/meta.json | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml index 244385734f3..5994181a38f 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/DisplayCases/display_cases.yml @@ -7,21 +7,9 @@ - type: ContainerContainer containers: entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null machine_board: !type:Container - showEnts: False - occludes: True - ents: [] machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - type: ResearchPointSource pointspersecond: 5 active: true @@ -32,7 +20,7 @@ - type: ActivatableUI key: enum.ResearchClientUiKey.Key - type: ActivatableUIRequiresPower - - type: PointLight # DeltaV + - type: PointLight radius: 0.8 energy: 0.5 - type: Fixtures @@ -53,7 +41,7 @@ - type: entity id: DisplayCase - parent: [CrateBaseSecure] + parent: CrateBaseSecure name: display case description: A sturdy display case. This one doesn't give any research points, but you can put whatever you want in it. components: diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml index 288debbde72..c8139fb1824 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -4,13 +4,15 @@ [color=#c96dbf]Epistemics[/color], often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station. ## Personnel -[color=#c96dbf]Epistemics[/color]' staff is made up of Research Assistants, Scientists and the Psionic Mantis. [color=#c96dbf]Epistemics[/color] is run by the Mystagogue. +[color=#c96dbf]Epistemics[/color]' staff is made up of Research Assistants, Scientists, the chaplain, the archivist, and the Psionic Mantis. [color=#c96dbf]Epistemics[/color] is run by the Mystagogue. + + - + ## Technologies diff --git a/Resources/ServerInfo/Guidebook/Service/Service.xml b/Resources/ServerInfo/Guidebook/Service/Service.xml index 7fe9b55a77d..40affec4b29 100644 --- a/Resources/ServerInfo/Guidebook/Service/Service.xml +++ b/Resources/ServerInfo/Guidebook/Service/Service.xml @@ -12,14 +12,12 @@ - - diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json index 63deda319c7..32d1f06d890 100644 --- a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77, modified by AeraAulin (github)", + "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/blob/master/icons/obj/service/library.dmi, modified by AeraAulin (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json index 3f57d4c2b37..f8c568efea3 100644 --- a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified by AeraAulin (Github),", + "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/master/icons/obj/stationobjs.dmi Sprite modified by AeraAulin (Github),", "states": [ { "name": "display_case" From ef9201d05dcafb2cef0d74e57eaab28a8508c3bb Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Wed, 27 Aug 2025 20:00:04 -0700 Subject: [PATCH 26/34] aaaaaaaa --- Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json | 2 +- .../Textures/_DV/Structures/Storage/display_cases.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json index 32d1f06d890..e39fbacfa85 100644 --- a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/blob/master/icons/obj/service/library.dmi, modified by AeraAulin (github)", + "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/commit/39ed5e01bcffa0c2271348e21a1b757a2e5040b9 https://github.com/tgstation/tgstation/blob/master/icons/obj/service/library.dmi, modified by AeraAulin (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json index f8c568efea3..700340308c3 100644 --- a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/master/icons/obj/stationobjs.dmi Sprite modified by AeraAulin (Github),", + "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/master/icons/obj/stationobjs.dmi https://github.com/Mojave-Sun/mojave-sun-13/commit/d97a2e2dd99a727f33924682e25927c0ea2e9b09Sprite modified by AeraAulin (Github),", "states": [ { "name": "display_case" From 30bf5764ccd45e1968aa5da36789f285bfbf6446 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Wed, 27 Aug 2025 22:05:37 -0700 Subject: [PATCH 27/34] book link thing --- Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json index e39fbacfa85..b8df8f66dde 100644 --- a/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/books.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/commit/39ed5e01bcffa0c2271348e21a1b757a2e5040b9 https://github.com/tgstation/tgstation/blob/master/icons/obj/service/library.dmi, modified by AeraAulin (github)", + "copyright": "icon_kiss by Kr8 | ancientbookdamaged1-3 and ancientbooks Base sprite taken at: https://github.com/tgstation/tgstation/blob/39ed5e01bcffa0c2271348e21a1b757a2e5040b9/icons/obj/service/library.dmi, modified by AeraAulin (github)", "size": { "x": 32, "y": 32 From 13d3f57ad46b5aa5eb14e9df561d6d022f830639 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Wed, 27 Aug 2025 22:10:34 -0700 Subject: [PATCH 28/34] this should hopefully be right --- .../Textures/_DV/Structures/Storage/display_cases.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json index 700340308c3..3175a53d2bc 100644 --- a/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/display_cases.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/master/icons/obj/stationobjs.dmi https://github.com/Mojave-Sun/mojave-sun-13/commit/d97a2e2dd99a727f33924682e25927c0ea2e9b09Sprite modified by AeraAulin (Github),", + "copyright": "Taken from mojave sun mirror of tgstation https://github.com/Mojave-Sun/mojave-sun-13/blob/d97a2e2dd99a727f33924682e25927c0ea2e9b09/icons/obj/stationobjs.dmi Sprite modified by AeraAulin (Github),", "states": [ { "name": "display_case" From 5b2a00d187d6738e415e77fc7745a0cd4ddb0d7d Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:58:52 -0700 Subject: [PATCH 29/34] fix merge conflicts here too --- Resources/Locale/en-US/_DV/recipes/tags.ftl | 4 ++-- Resources/Prototypes/_DV/tags.yml | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 83eaecc8533..835d8d68952 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -35,5 +35,5 @@ construction-graph-tag-carp-plushie = carp plushie # Moth plushie construction-graph-tag-mothroach-hide = mothroach hide -# Ancient books -construction-graph-tag-ancientbook = Damaged Ancient Book +# Hoodies +construction-graph-tag-hoodie = hoodie diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index ba45ea46203..82560e73d36 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -1,8 +1,5 @@ ## This is for Nyano and Delta V tags -- type: Tag - id: Artifact - - type: Tag id: AugmentAPCBoard @@ -178,10 +175,4 @@ id: CleaningGrenade - type: Tag - id: AncientBookDamagedCommon - -- type: Tag - id: AncientBookDamagedUncommon - -- type: Tag - id: AncientBookDamagedRare + id: Hoodie From cdfc031e4ca074e2f42ca09cf463bc2f0abe692a Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:00:42 -0700 Subject: [PATCH 30/34] and fix --- Resources/Locale/en-US/_DV/recipes/tags.ftl | 3 +++ Resources/Prototypes/_DV/tags.yml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/Resources/Locale/en-US/_DV/recipes/tags.ftl b/Resources/Locale/en-US/_DV/recipes/tags.ftl index 835d8d68952..17067a539bf 100644 --- a/Resources/Locale/en-US/_DV/recipes/tags.ftl +++ b/Resources/Locale/en-US/_DV/recipes/tags.ftl @@ -37,3 +37,6 @@ construction-graph-tag-mothroach-hide = mothroach hide # Hoodies construction-graph-tag-hoodie = hoodie + +# Ancient books +construction-graph-tag-ancientbook = Damaged Ancient Book diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 82560e73d36..28d14fed41b 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -176,3 +176,12 @@ - type: Tag id: Hoodie + +- type: Tag + id: AncientBookDamagedCommon + +- type: Tag + id: AncientBookDamagedUncommon + +- type: Tag + id: AncientBookDamagedRare From 5107034fb02c91c547c9036eaa997ba1e5767c13 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:08:42 -0700 Subject: [PATCH 31/34] readd artifact tag --- Resources/Prototypes/_DV/tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 28d14fed41b..bb9ed446350 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -1,5 +1,8 @@ ## This is for Nyano and Delta V tags +- type: Tag + id: Artifact + - type: Tag id: AugmentAPCBoard From 1eb6b52fe7bdc87909d1e9399c42e2ae04d2fe4b Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Sat, 6 Sep 2025 17:03:21 -0700 Subject: [PATCH 32/34] untouch --- Resources/ServerInfo/Guidebook/Science/Science.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml index c8139fb1824..4ea1bec6fa1 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -12,7 +12,6 @@ - ## Technologies From b709ff81f2b12c6955236a95dbcefd4657a0201d Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 2 Oct 2025 16:54:03 -0700 Subject: [PATCH 33/34] remove my additions to artifacts because easier for me probably --- .../Specific/Xenoarchaeology/item_artifacts.yml | 5 ----- .../Xenoarchaeology/structure_artifacts.yml | 16 ---------------- 2 files changed, 21 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml index 4f43a75dcb9..036b876a97a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml @@ -54,11 +54,6 @@ enum.IntercomUiKey.Key: type: IntercomBoundUserInterface - type: Appearance - # Begin DeltaV Additions - - type: Tag - tags: - - Artifact - # End DeltaV Additions - type: Item size: Normal sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index 89ef2f5c76f..fb628fc8083 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -15,10 +15,6 @@ - state: ano30_on map: [ "enum.ArtifactsVisualLayers.Effect" ] visible: false - # Begin DeltaV Additions - - type: Item - size: Ginormous - # End DeltaV Additions - type: Damageable - type: Physics bodyType: Dynamic @@ -57,23 +53,11 @@ - enum.ArtifactsVisualLayers.Effect: ano01_on: Rainbow - type: Appearance -# Begin DeltaV Additions - - type: Tag - tags: - - Artifact -# End DeltaV Additions - type: Actions - type: Psionic #Nyano - Summary: Makes psionic on creation. - type: GuideHelp guides: - Xenoarchaeology -# Begin DeltaV Additions - - type: MultiHandedItem - - type: ClothingSpeedModifier - walkModifier: 0.5 - sprintModifier: 0.5 - - type: HeldSpeedModifier -# End DeltaV Additions - type: StealTarget stealGroup: XenoArtifact - type: ContainerContainer From 5a1f8a825e7c1c74ace7faee85a588bc8b7441a3 Mon Sep 17 00:00:00 2001 From: AeraAulin <133451603+AeraAuling@users.noreply.github.com> Date: Thu, 2 Oct 2025 17:04:50 -0700 Subject: [PATCH 34/34] add it all back now --- .../Specific/Xenoarchaeology/item_xenoartifacts.yml | 3 +++ .../Xenoarchaeology/structure_xenoartifacts.yml | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml index 83a04a809b3..4f3b387ae4e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml @@ -44,6 +44,9 @@ available: - enum.ArtifactsVisualLayers.UnlockingEffect: ano01_on: Rainbow + - type: Tag # DeltaV - allows for artifacts to be used in the crafting system + tags: + - Artifact # gameplay interactions - type: Item size: Normal diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml index 8edbbd71f4a..6f53905a69d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml @@ -25,6 +25,17 @@ available: - enum.ArtifactsVisualLayers.UnlockingEffect: ano01_on: Rainbow + # Begin DeltaV Additions + - type: Item + size: Ginormous + - type: MultiHandedItem + - type: ClothingSpeedModifier + walkModifier: 0.5 + sprintModifier: 0.5 + - type: Tag # DeltaV - allows for artifacts to be used in the crafting system + tags: + - Artifact + # End DeltaV Additions - type: Transform noRot: true - type: Fixtures