From 9e12f0588a7d37f9e28ba1cd54642e9618effb01 Mon Sep 17 00:00:00 2001 From: nekosich <80796749+tripsov@users.noreply.github.com> Date: Thu, 31 Oct 2024 05:40:54 +0800 Subject: [PATCH] new stamps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Для ХРП Мейна --- .../ru-RU/corvax/paper/stamp-component.ftl | 2 ++ .../entities/objects/misc/rubber_stamp.ftl | 6 ++++ .../Entities/Objects/Misc/rubber_stamp.yml | 28 ++++++++++++++++++ .../Roles/Jobs/Civilian/librarian.yml | 1 + .../Roles/Jobs/Wildcards/reporter.yml | 7 +++-- .../Corvax/Objects/Misc/stamps.rsi/meta.json | 6 ++++ .../Misc/stamps.rsi/stamp-librarian.png | Bin 0 -> 299 bytes .../Misc/stamps.rsi/stamp-reporter.png | Bin 0 -> 298 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 6 ++++ .../bureaucracy.rsi/paper_stamp-librarian.png | Bin 0 -> 189 bytes .../bureaucracy.rsi/paper_stamp-reporter.png | Bin 0 -> 188 bytes 11 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-librarian.png create mode 100644 Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-reporter.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-librarian.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-reporter.png diff --git a/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl b/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl index 77bb04bc9e1..445c635d6f0 100644 --- a/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl @@ -1,2 +1,4 @@ stamp-component-stamped-name-iaa = Агент внутренних дел stamp-component-stamped-name-psychologist = Психолог +stamp-component-stamped-name-reporter = Репортёр +stamp-component-stamped-name-librarian = Библиотекарь diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/rubber_stamp.ftl index 945f9c546bd..18358b559c6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/rubber_stamp.ftl @@ -4,3 +4,9 @@ ent-RubberStampIAA = печать агента внутренних дел ent-RubberStampPsychologist = печать психолога .desc = { ent-RubberStampMime.desc } .suffix = НЕ МАППИТЬ +ent-RubberStampReporter = печать репортёра + .desc = { ent-RubberStampMime.desc } + .suffix = НЕ МАППИТЬ +ent-RubberStampLibrarian = печать библиотекаря + .desc = { ent-RubberStampMime.desc } + .suffix = НЕ МАППИТЬ diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml index 243d57429e3..3395e4ee5d0 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml @@ -25,3 +25,31 @@ - type: Sprite sprite: Corvax/Objects/Misc/stamps.rsi state: stamp-psychologist + +- type: entity + name: reporter's rubber stamp + parent: RubberStampBase + id: RubberStampReporter + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-reporter + stampedColor: "#3d3a3d" + stampState: "paper_stamp-reporter" + - type: Sprite + sprite: Corvax/Objects/Misc/stamps.rsi + state: stamp-reporter + +- type: entity + name: librarian's rubber stamp + parent: RubberStampBase + id: RubberStampLibrarian + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-librarian + stampedColor: "#795548" + stampState: "paper_stamp-librarian" + - type: Sprite + sprite: Corvax/Objects/Misc/stamps.rsi + state: stamp-librarian diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index d865d57cab3..980a84e2c69 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -21,3 +21,4 @@ storage: back: - BookRandom + - RubberStampLibrarian # Main-HRP+ diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index d0a35990d70..e1a0b486679 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -16,6 +16,7 @@ shoes: ClothingShoesColorWhite id: ReporterPDA ears: ClothingHeadsetService - #storage: - #back: - #- Stuff + storage: + back: + - RubberStampReporter # Main-HRP+ + diff --git a/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/meta.json index 53b0802c727..7219705c51b 100644 --- a/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/meta.json @@ -12,6 +12,12 @@ }, { "name": "stamp-iaa" + }, + { + "name": "stamp-librarian" + }, + { + "name": "stamp-reporter" } ] } diff --git a/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-librarian.png b/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-librarian.png new file mode 100644 index 0000000000000000000000000000000000000000..9939ad861ba86a7a1b589936536e3d2e7279b23c GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Pd!~6Ln7SY zPTMHhY{27c@9f~{f1a)EBvV`y?+Obovjk3k2Tth=mxB)ooYEA(^hDzc%Z@vpw>Hh2 zm$R6|y#C_Zp9>kX9C%kW?l*HdCeicwM1N+1;=;y|>!zPI`&FH&xC%pX>OPE33BN;%MkPhu77C(XQQ= v#?CT=9+SIE=Nca9;{7A##CWAaDu9_kUMWD4{f1gP(8CO#u6{1-oD!M<3fpjI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-reporter.png b/Resources/Textures/Corvax/Objects/Misc/stamps.rsi/stamp-reporter.png new file mode 100644 index 0000000000000000000000000000000000000000..86ff84427c950d1ea2b9c2554730265168ba92e8 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Pdr^5Ln7SY zPTR=aV!-2S@9f~{@82uZsv6OxD&U>MIgP<}(X!>s8x(6kz1;E4<>4JhtCLp>|NNQ5 z;=bc&ciuUE)&S-#2i`wh88=-^l3=UzY3AnSU9v25!gI@InNGL29Tae6xE7^#`qN+O zm%r!vvb+@)VQF}^%T4C^jcvT=c6##)q(A<*xi$RjZr(!2OAM=4alPJU$1flK;FYAB zr%*|(y4gq319jYb>=sfRtM utwWh9vuNWwW44Hmjq%PJ4N^eYJzxxs3Q*LGTyF*RFN3G6pUXO@geCyzlX0v7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index d1ddea450e9..0e7406c7b12 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -126,6 +126,12 @@ { "name": "paper_talisman_revealrunes" }, + { + "name": "paper_stamp-librarian" + }, + { + "name": "paper_stamp-reporter" + }, { "name": "paper_talisman_runestun" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-librarian.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-librarian.png new file mode 100644 index 0000000000000000000000000000000000000000..3f599ed0fdfdeb259b241a2ec3ba06e1b011ef19 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}<(@8%ArbD$ zDG~_>EDn4#?y*WRVR3VY5i5k44Edh@pDttJIW00J(`lWfTA{IoN$G4v7&(#6PTFN a#=x*3L`U(vhy#$tz~JfX=d#Wzp$PzYZ#?(_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-reporter.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-reporter.png new file mode 100644 index 0000000000000000000000000000000000000000..7b2722d7604278589d2b7105bf82d5503fcb882a GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArbCx zr)}gtpuod&mdiv^LG^dP(@e%o8=RE5yaP|wtIS&5Zhv2V*^y_#X3yCfBn~jJ88kGi zvfa8ludei^?#oN%&F4N;U6J_C!Fq`4#7S8W$p`YQt|>5|k(zUIvm3X9;*@vO8F$26 g-DZI3eIQlA*cqau`1L^`&;bk#p00i_>zopr0CL