diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bdbaa3da1aa..3c9d32e561f 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,16 +1,4 @@ Entries: -- author: VMSolidus - changes: - - message: Harpies no longer choke on completely breathable air - type: Fix - id: 169 - time: '2023-12-14T05:13:43.0000000+00:00' -- author: UnicornOnLSD - changes: - - message: Changed bags of holding cost to be more consistent. - type: Tweak - id: 170 - time: '2023-12-14T09:17:35.0000000+00:00' - author: Adrian16199 changes: - message: Fixed non-wizden species not having markings. @@ -3725,3 +3713,19 @@ id: 668 time: '2024-11-11T15:41:44.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2169 +- author: Tomce795 + changes: + - message: Added a new stamp for Prosecutor and added it to their starting loadout. + Also added the Space Law book to the starting loadout for both Prosec and Clerk. + type: Add + id: 669 + time: '2024-11-12T04:15:14.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2158 +- author: Unkn0wnGh0st333 + changes: + - message: Whoops someone forgot to give Clerk and Prosecutor their company-mandated + mindshields... that's fixed now. + type: Tweak + id: 670 + time: '2024-11-12T06:21:28.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2175 diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index efb392c4bf8..78b74bb87b8 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,3 +1,4 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-chiefjustice = Chief Justice +stamp-component-stamped-name-prosec = Prosecutor diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 6f545675161..c648474144f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -29,3 +29,18 @@ sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-cj +- type: entity + name: prosecutor's rubber stamp + parent: RubberStampBase + id: RubberStampProsec + suffix: DO NOT MAP + description: A rubber stamp for stamping important documents. A more legal way to annoy Security. + components: + - type: Stamp + stampedName: stamp-component-stamped-name-prosec + stampedColor: "#562D3D" + stampState: "paper_stamp-prosec" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-prosec + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index 51ae3e1a1c9..38abca0f0b5 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -22,6 +22,9 @@ - Justice - Clerk - Maintenance + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: ClerkGear @@ -34,5 +37,8 @@ #innerClothingSkirt: ClothingUniformJumpskirtClerk #satchel: ClothingBackpackSatchelFilled #duffelbag: ClothingBackpackDuffelFilled + storage: + back: + - BookSpaceLaw diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index b1481afa17a..35618552400 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -17,6 +17,9 @@ - Prosecutor - Justice - Maintenance + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: ProsecutorGear @@ -33,5 +36,9 @@ #innerClothingSkirt: ClothingUniformJumpskirtProsecutor #satchel: ClothingBackpackSatchelFilled #duffelbag: ClothingBackpackDuffelFilled + storage: + back: + - RubberStampProsec + - BookSpaceLaw diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index ea9f292ad8e..18d546a1196 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -1,7 +1,7 @@ { "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. CJ stamp modified by Timemaster99 (Discord)", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord). stamp-prosec is a recoloured version of stamp-lawyer", "size": { "x": 32, "y": 32 @@ -12,6 +12,9 @@ }, { "name": "stamp-notary" + }, + { + "name": "stamp-prosec" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-prosec.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-prosec.png new file mode 100644 index 00000000000..a9894e8ff86 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-prosec.png differ diff --git a/Resources/Textures/LobbyScreens/Corporate_Rats.webp b/Resources/Textures/LobbyScreens/Corporate_Rats.webp new file mode 100644 index 00000000000..1dc7e133ce8 Binary files /dev/null and b/Resources/Textures/LobbyScreens/Corporate_Rats.webp differ diff --git a/Resources/Textures/LobbyScreens/DeltaVContestWinner.webp b/Resources/Textures/LobbyScreens/DeltaVContestWinner.webp new file mode 100644 index 00000000000..bd6baccb765 Binary files /dev/null and b/Resources/Textures/LobbyScreens/DeltaVContestWinner.webp differ diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index e63d6857174..5452aaa0c2a 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/Resources/Textures/LobbyScreens/attributions.yml @@ -51,9 +51,24 @@ - files: ["OperatorPlush.webp"] license: "CC-BY-4.0" copyright: "Commission adapted to fit the format by Leonardo_DaBepis on discord / @leonardo-dabepis on Tumblr. Template was filled in by Adeinitas @ DeltaV" - source: "https://leonardo-dabepis.tumblr.com/" + source: "https://leonardo-dabepis.tumblr.com/" - files: ["breakingspace.webp"] license: "Custom" copyright: "p.r.ospector on discord / Prospector @ DeltaV" source: "https://discord.gg/deltav" + +- files: ["Corporate_Rats.webp"] + license: "CC-BY-4.0" + copyright: "Aikakakah - Winner of the Delta V art contest" + source: "https://discord.gg/deltav" + +- files: ["DeltaVContestWinner.webp"] + license: "CC-BY-4.0" + copyright: "Mylegsaresharp - Winner of the Delta V art contest" + source: "https://discord.gg/deltav" + +- files: ["station-crew-board.webp"] + license: "CC-BY-4.0" + copyright: "Starry - Winner of the Delta V art contest" + source: "https://discord.gg/deltav" diff --git a/Resources/Textures/LobbyScreens/station-crew-board.webp b/Resources/Textures/LobbyScreens/station-crew-board.webp new file mode 100644 index 00000000000..c10beeab793 Binary files /dev/null and b/Resources/Textures/LobbyScreens/station-crew-board.webp differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 071fd538f76..7edccd85dc9 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich | paper_stamp-signature by Mnemotechnician.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich | paper_stamp-signature by Mnemotechnician. paper_stamp-prosec is a recoloured version of paper_stamp-lawyer", "size": { "x": 32, "y": 32 @@ -242,6 +242,9 @@ }, { "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-prosec" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-prosec.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-prosec.png new file mode 100644 index 00000000000..548cb0122a4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-prosec.png differ