From 98a28e08636b262987a6186c4ac7b14fbbb4eaf1 Mon Sep 17 00:00:00 2001 From: Guess-My-Name <34919974+Guess-My-Name@users.noreply.github.com> Date: Sat, 17 Feb 2024 17:26:33 +0100 Subject: [PATCH 1/4] new stamps --- .../Locale/en-US/paper/stamp-component.ftl | 2 ++ .../Entities/Objects/Misc/rubber_stamp.yml | 27 ++++++++++++++++++ .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 17 +++++++++++ .../Objects/Misc/stamps.rsi/stamp-lawyer.png | Bin 0 -> 282 bytes .../Misc/stamps.rsi/stamp-psychologist.png | Bin 0 -> 277 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 8 +++++- .../bureaucracy.rsi/paper_stamp-lawyer.png | Bin 0 -> 141 bytes .../paper_stamp-psychologist.png | Bin 0 -> 139 bytes 8 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 121fa6f5ee3..49d6ddfd48e 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -15,3 +15,5 @@ stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer +stamp-component-stamped-name-lawyer = Lawyer +stamp-component-stamped-name-psychologist = Psychologist diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml new file mode 100644 index 00000000000..2494de534e4 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -0,0 +1,27 @@ +- type: entity + name: psychologist's rubber stamp + parent: RubberStampBase + id: RubberStampPsychologist + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-psychologist + stampedColor: "#00ccff" + stampState: "paper_stamp-psychologist" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-psychologist + +- 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: "#696969" + stampState: "paper_stamp-lawyer" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-lawyer diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json new file mode 100644 index 00000000000..31a3b1bee37 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-lawyer" + }, + { + "name": "stamp-psychologist" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png new file mode 100644 index 0000000000000000000000000000000000000000..0d1ee0c2d408b570e615d92d18c7bc9743378f2e GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R9J=Wlraj!FbqY1OUFzeG-S*bd<9=2hscS7&yXu*$OQ~pvuMnaK~r{j zXqM6zYPYyh^uU8;zVtytfTAdh@?%c9LTha_#y~_6LddR@-Q0U0r)i4b`)I9=xwXzY zB4Z2yU|E*CxR?PE0W$*tm>D8c)Iba&+$D}UYYeH&6Wg}Mwr$w=9nLw7r1 z+A4-ImOa(*%;}^Ec9n*n>mPpneO&PDmd&J8$=dtHad{H63u>(sdls(JdOoKv{DW)p ze1&8lN!=S_Vhx55xiV(8S@fyjU%U05YfWBtMc$5=65r+;T+j n*0;vz)8~6_X=P^EXTWGsrL=Zs-m>>VBN;qh{an^LB{Ts5Uz#xa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png new file mode 100644 index 0000000000000000000000000000000000000000..d3c8ad7afff6554b58842de1b0bc0d3981ac0d7e GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_ zFKpxms&WZ@bcpY%f>nccVrudlo2Ik%yrMgqjTsmO5_j!iH*LZPvn4`NKjv+%&g(S( ka-02<{{E>93=SI@R+VU`{$=vy0~*NS>FVdQ&MBb@0D8hKVgLXD literal 0 HcmV?d00001 From 0b6bc02f4d1b277971b8fe4fb1c6d11990200f09 Mon Sep 17 00:00:00 2001 From: Guess-My-Name <34919974+Guess-My-Name@users.noreply.github.com> Date: Sat, 17 Feb 2024 17:54:28 +0100 Subject: [PATCH 2/4] add stamps to cmos locker and lawdrobe --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 1 + .../Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 966be72c49a..067afc6326c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -195,6 +195,7 @@ - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO + - id: RubberStampPsychologist # DeltaV - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - id: BoxPDAMedical # Delta-V diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 8e4a9ac95de..69dec7c2416 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -15,5 +15,6 @@ ClothingHeadsetService: 2 ClothingNeckLawyerbadge: 2 ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe + RubberStampLawyer: 1 # DeltaV emaggedInventory: CyberPen: 1 From 81bf041f99d831c81ee7b853ffc79cac78fbd1da Mon Sep 17 00:00:00 2001 From: Guess-My-Name <34919974+Guess-My-Name@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:20:21 +0100 Subject: [PATCH 3/4] adds stamps to starting gear of psychologist and lawyer --- .../Fills/Backpacks/StarterGear/backpack.yml | 21 +++++++++++++++++++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 21 +++++++++++++++++++ .../Fills/Backpacks/StarterGear/satchel.yml | 21 +++++++++++++++++++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 6 +++--- .../Roles/Jobs/Wildcards/psychologist.yml | 6 +++--- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 5b49434bef5..e51f98758be 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -29,3 +29,24 @@ - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - id: Portafib + +- type: entity + noSpawn: true + parent: ClothingBackpackMedical + id: ClothingBackpackPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + + +- type: entity + noSpawn: true + parent: ClothingBackpack + id: ClothingBackpackLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 0f63692eeb3..0ae8407a2fc 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -9,3 +9,24 @@ - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - id: Portafib + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelMedical + id: ClothingBackpackDuffelPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 8d4545e8de8..4eebbcfe917 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -9,3 +9,24 @@ - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - id: Portafib + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelMedical + id: ClothingBackpackSatchelPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index f89f39308ce..b67275c9930 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -22,7 +22,7 @@ id: LawyerGear equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants - back: ClothingBackpackFilled + back: ClothingBackpackLawyerFilled #DeltaV - stamp included shoes: ClothingShoesBootsLaceup id: LawyerPDA ears: ClothingHeadsetSecurity @@ -30,5 +30,5 @@ inhand: - BriefcaseBrownFilled innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included + duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 19d53a92c40..7687049b685 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -23,10 +23,10 @@ id: PsychologistGear equipment: jumpsuit: ClothingUniformJumpsuitPsychologist - back: ClothingBackpackMedicalFilled + back: ClothingBackpackPsychologistFilled #DeltaV - stamp included shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical innerClothingSkirt: ClothingUniformJumpsuitPsychologist - satchel: ClothingBackpackSatchelMedicalFilled - duffelbag: ClothingBackpackDuffelMedicalFilled + satchel: ClothingBackpackSatchelPsychologistFilled #DeltaV - stamp included + duffelbag: ClothingBackpackDuffelPsychologistFilled #DeltaV - stamp included From e5c6c448b278379b0e3025c4e344fbb1489b74c1 Mon Sep 17 00:00:00 2001 From: Guess-My-Name <34919974+Guess-My-Name@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:30:51 +0100 Subject: [PATCH 4/4] move locale to deltav --- Resources/Locale/en-US/deltav/paper/stamp-component.ftl | 2 ++ Resources/Locale/en-US/paper/stamp-component.ftl | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/paper/stamp-component.ftl diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl new file mode 100644 index 00000000000..8c591e771f1 --- /dev/null +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -0,0 +1,2 @@ +stamp-component-stamped-name-lawyer = Lawyer +stamp-component-stamped-name-psychologist = Psychologist \ No newline at end of file diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 49d6ddfd48e..121fa6f5ee3 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -15,5 +15,3 @@ stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer -stamp-component-stamped-name-lawyer = Lawyer -stamp-component-stamped-name-psychologist = Psychologist