The lawyer finally gets a stamp (#26012)

lawyer stamp

diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index 3fc7fe64ba94127b038cdf5fc3d0dd3d9b825703..18f103bf80f3e220d6f2f42ed760416768d90414 100644 (file)
--- 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 b961659c0825103f06272e569775b7ddda872e17..e4c094ea2bf30fa473974f25ed28307a43a59462 100644 (file)
--- 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 504054dc27882e31bb949d3507b8fd680d81bd9b..477b8b2f185fb47969c942525b4894990ba07ebc 100644 (file)
--- 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 3b1b7f73a5cd9b69ed0d45385391893f9fc142f1..140b1c2968f9c1c88d980cf2c300ffad28f95470 100644 (file)
--- 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 301aed66849d66c8f69eac94d1b24da9405757b3..975a554d5253c4d24dcf928af75c3a6a511877c6 100644 (file)
--- 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 179974e2590670ede2b956c09db8fa8468ea58a9..43561d4db429aff804074efa57693ef42fd94bd7 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -18,8 +18,8 @@
 - type: startingGear
   id: LawyerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitLawyerBlack  # TODO change jumpsuit to randomiser of the 4 variants
-    back: ClothingBackpackFilled
+    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
@@ -27,5 +27,5 @@
   inhand:
     - BriefcaseBrownFilled
   innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+  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 8f21f8a25bd5c9b5f233d4af5da0553b0fb2429c..91602db51ecd074bc04c13788a4bdf807f9fd03b 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..dd57529
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png differ

diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
index 13d35ad87897d2fe5cef362991c527054e23a4bb..8ce4882a2f8880c0fcbe9ee08ad79e0f0b02cc65 100644 (file)
--- 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 (file)
index 0000000..ff0dd4d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-lawyer.png differ