From c871305a1f9f3d2e4300a2c728a7bd87a3cf9152 Mon Sep 17 00:00:00 2001 From: SimpleStation14 Date: Mon, 22 Apr 2024 05:30:35 -0400 Subject: [PATCH] Cherry-picked commit 61b3eb4de0460bf3ca44008ae6cff87442d6b865 from space-wizards/space-station-14/master --- .../Locale/en-US/paper/stamp-component.ftl | 1 + .../Fills/Backpacks/StarterGear/backpack.yml | 10 ++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 10 ++ .../Fills/Backpacks/StarterGear/satchel.yml | 10 ++ .../Entities/Objects/Misc/rubber_stamp.yml | 13 ++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 8 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 3 + .../bureaucracy.rsi/paper_stamp-lawyer.png | Bin 141 -> 211 bytes .../Objects/Misc/stamps.rsi/meta.json | 123 +++++++++--------- .../Objects/Misc/stamps.rsi/stamp-lawyer.png | Bin 0 -> 327 bytes 10 files changed, 114 insertions(+), 64 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/stamp-lawyer.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index e4341e7be33..a00c4a62a70 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -4,6 +4,7 @@ stamp-component-stamped-name-mime = Mime stamp-component-stamped-name-captain = Captain stamp-component-stamped-name-centcom = CentCom stamp-component-stamped-name-chaplain = Chaplain +stamp-component-stamped-name-lawyer = Lawyer stamp-component-stamped-name-clown = Clown stamp-component-stamped-name-cmo = Chief Medical Officer stamp-component-stamped-name-denied = DENIED diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index cd269d83ddb..1ffabb1564d 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -202,6 +202,16 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain + +- type: entity + noSpawn: true + parent: ClothingBackpack + id: ClothingBackpackLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index f7ad973b842..fc49adcd213 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -211,6 +211,16 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 1a3dda66487..305d8d5e86b 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -214,6 +214,16 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index e88ed48fe56..f9503c2c90a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -76,6 +76,19 @@ - type: Sprite state: stamp-chaplain +- type: entity + name: lawyer's rubber stamp + parent: RubberStampBase + id: RubberStampLawyer + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-lawyer + stampedColor: "#233D57" + stampState: "paper_stamp-lawyer" + - type: Sprite + state: stamp-lawyer + - type: entity name: clown's rubber stamp parent: RubberStampBase diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index b67275c9930..2e59ecedf46 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -21,8 +21,8 @@ - type: startingGear id: LawyerGear equipment: - jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants - back: ClothingBackpackLawyerFilled #DeltaV - stamp included + jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants # ignoring this since loadouts are gonna be out soon + back: ClothingBackpackLawyerFilled shoes: ClothingShoesBootsLaceup id: LawyerPDA ears: ClothingHeadsetSecurity @@ -30,5 +30,5 @@ inhand: - BriefcaseBrownFilled innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack - satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included - duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included + satchel: ClothingBackpackSatchelLawyerFilled + duffelbag: ClothingBackpackDuffelLawyerFilled diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 5117df77356..98ad7642f01 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -209,6 +209,9 @@ { "name": "paper_stamp-chaplain" }, + { + "name": "paper_stamp-lawyer" + }, { "name": "paper_stamp-clown" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png index ca9bc920af76171a9fbd3d73f9042eccf2c82815..dd5752947566599bf0434413f39ae1f47c225261 100644 GIT binary patch delta 170 zcmeBWyv#Vku%0E|(btiIVPik{pF~y$1_sUokH}&M2EIce%qXhi)c_RC@N{tuiEvMr zU|pOb($f@Zz~#nh+Aw3+<$8_DDF;}Vo@7%vy_5Cn$ubsKK8DC&ub$Z*TmN3(DBuyt zCWaG6uH8re8+f1GI!DlJGONS1rW!sj#sCk8)|cEbq?F&lOl(t3NMK;_Ws!bmQ4%f= Pw3NZq)z4*}Q$iB}v%WeK delta 99 zcmV-p0G$8R0gVBWF4FDhrL{Z{wEW^wUgO!c35+aHDuc0D$AOZjY z3Yb~k?v9FZcTbf_g|Dfq@wCJq+V+9xm!C?sg#!S-Faa=nBCV-zrtbg%002ovPDHLk FV1g{;Dk1;? diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 13d35ad8789..8ce4882a2f8 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json @@ -1,62 +1,65 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "stamp-cap" - }, - { - "name": "stamp-ce" - }, - { - "name": "stamp-centcom" - }, - { - "name": "stamp-chaplain" - }, - { - "name": "stamp-clown" - }, - { - "name": "stamp-cmo" - }, - { - "name": "stamp-deny" - }, - { - "name": "stamp-detective" - }, - { - "name": "stamp-hop" - }, - { - "name": "stamp-hos" - }, - { - "name": "stamp-ok" - }, - { - "name": "stamp-mime" - }, - { - "name": "stamp-qm" - }, - { - "name": "stamp-rd" - }, - { - "name": "stamp-syndicate" - }, - { - "name": "stamp-trader" - }, - { - "name": "stamp-warden" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-cap" + }, + { + "name": "stamp-ce" + }, + { + "name": "stamp-centcom" + }, + { + "name": "stamp-chaplain" + }, + { + "name": "stamp-lawyer" + }, + { + "name": "stamp-clown" + }, + { + "name": "stamp-cmo" + }, + { + "name": "stamp-deny" + }, + { + "name": "stamp-detective" + }, + { + "name": "stamp-hop" + }, + { + "name": "stamp-hos" + }, + { + "name": "stamp-ok" + }, + { + "name": "stamp-mime" + }, + { + "name": "stamp-qm" + }, + { + "name": "stamp-rd" + }, + { + "name": "stamp-syndicate" + }, + { + "name": "stamp-trader" + }, + { + "name": "stamp-warden" + } + ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-lawyer.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-lawyer.png new file mode 100644 index 0000000000000000000000000000000000000000..ff0dd4d714ff7ea090b4cad24a93060d4c410da5 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(c*oPlF(ktM?PN!;Lk0q_?v6_qD7cF3DhU6| zlE-~-;qo`KHVx_lyQVfN-3`gO>iVTUBwRH8NUIV5sq^!voJpB9VUb4Hr_CkR&c-u* zc(1g&Y?-sk;nK$%N7?oM*EcQro96rca^RM*+nU_xzpquYT(OrWkTG>$aA-&wPwR9g z%>#FC`%W)P=M|AFlukILd*Dc+PoRkHE{0Zjna|(!*%m3USh@QH=bhQv))!nRsR&$~ z^@iz?!4d_IIkl5gC6{J)Eqr0Q?`X!hBa-HIdGlCz-wOBSyM6V0*?ORxmJ8fvSehMN Uvou{a7U)j~Pgg&ebxsLQ0Hk7n4gdfE literal 0 HcmV?d00001