From d70abda44d384c229c982e47c6b058ee6e1ed120 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 9 Oct 2023 19:40:52 +0200 Subject: [PATCH 1/5] ian --- .../Prototypes/Catalog/Fills/Lockers/heads.yml | 1 + .../DeltaV/Entities/Objects/Misc/ian_dossier.yml | 14 ++++++++++++++ .../Prototypes/DeltaV/Objectives/traitor.yml | 11 +++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 1 + .../ServerInfo/Guidebook/Antagonist/Traitors.xml | 4 ++++ .../Misc/bureaucracy.rsi/folder-hop-ian.png | Bin 0 -> 373 bytes .../DeltaV/Objects/Misc/bureaucracy.rsi/meta.json | 14 ++++++++++++++ 7 files changed, 45 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml create mode 100644 Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2f246c6cd13..267d3d5f261 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -121,6 +121,7 @@ - id: ClothingBackpackIan prob: 0.5 - id: AccessConfigurator + - id: BookIanDossier - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml new file mode 100644 index 00000000000..51f2766af47 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BaseItem + id: BookIanDossier + name: head of personnel's photobook + description: VERY CONFIDENTIAL. This folder is filled with various pictures of Ian. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + layers: + - state: folder-hop-ian + - type: Tag + tags: + - Book + - HighRiskItem diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index fbfba136b2c..d974564e3d0 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -8,3 +8,14 @@ - type: StealCondition prototype: SpaceCashLuckyBill # owner: job-name-qm + +- type: entity # Head of Personnel steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: HoPBookIanDossierStealObjective + components: + - type: NotJobRequirement + job: HeadOfPersonnel + - type: StealCondition + prototype: BookIanDossier + # owner: job-name-hop diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index f6432f81932..70b3c2773cd 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,6 +22,7 @@ HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 HoLLuckyBillStealObjective: 0.5 # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml + HoPBookIanDossierStealObjective: 1 # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index ac4cdf8e81f..2d022d05ade 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -82,5 +82,9 @@ + - Steal the Head of Personnel's [color=#a4885c]Ian Photobook[/color]. + + + diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png new file mode 100644 index 0000000000000000000000000000000000000000..243287e20bed95bb4e628b75d0fab7d15723062b GIT binary patch literal 373 zcmV-*0gC>KP)HrWB6PF^|0W2~O|NlHWz&K!05MUv~5E2sd zAB3qE0x)pn+ySiO8b%IaIU#8^hJK?q2D$3r48g&{)QbXSi-B>BBFCo_h2gMAt*i`% z=ct$lKt6;y1Y{wu5C8#???DcrY9d6o=+(<-coXQ)wH^#FZ|tRw1MuYtSSb8-T?Gs( zVd@q{=k_gw(=d!Ij?Dh@g~lbJky8{_$H72uZXz%N`Z4hF@zEv<&@BWx2w7~yi8l;1 zEr`%V0GAjsfRUI+DXDeAw-3*V4gnTo4J8E-YdO&&Fxns)b-<_tMjb#)01#jRGj4aR TDylKY00000NkvXXu0mjf$;6C- literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json new file mode 100644 index 00000000000..75c5548e647 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-hop-ian" + } + ] +} From f7a3bbd77c20d773919304201a99ab6142a5ff1d Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:10:00 -0500 Subject: [PATCH 2/5] Update heads.yml added comment Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 267d3d5f261..badc1664606 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -121,7 +121,7 @@ - id: ClothingBackpackIan prob: 0.5 - id: AccessConfigurator - - id: BookIanDossier + - id: BookIanDossier # DeltaV Traitor obj - type: entity id: LockerChiefEngineerFilledHardsuit From 5629f9953b3f0ebdf6bc69e9041486e02e063ce3 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 9 Oct 2023 20:44:09 +0200 Subject: [PATCH 3/5] more pictures --- .../Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- .../Entities/Objects/Misc/ian_dossier.yml | 2 +- .../Misc/bureaucracy.rsi/folder-hop-ian.png | Bin 373 -> 401 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index badc1664606..bbdcff236c4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -121,7 +121,7 @@ - id: ClothingBackpackIan prob: 0.5 - id: AccessConfigurator - - id: BookIanDossier # DeltaV Traitor obj + - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml index 51f2766af47..fba4536c7d9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml @@ -2,7 +2,7 @@ parent: BaseItem id: BookIanDossier name: head of personnel's photobook - description: VERY CONFIDENTIAL. This folder is filled with various pictures of Ian. + description: VERY CONFIDENTIAL. This folder contains various pictures of Ian cherished by the Head of Personnel. components: - type: Sprite sprite: DeltaV/Objects/Misc/bureaucracy.rsi diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png index 243287e20bed95bb4e628b75d0fab7d15723062b..512086d75b9c0c4cf04c0cc3d0e4fdc4b2bc5e0e 100644 GIT binary patch delta 337 zcmV-X0j~b_0+9odNq;j*L_t(|+G70w|3AY(0w#t52BQubbpQ*g8j_Nd7(RXage(Nh zMvO3lHEY(;Ed>6rUAvZ{-)IxELl{CrLg?av|4@s;0NoM90!CsAA_eybq78oc^cI7g z#xF)~hBwX~V1E#jRs*viwX#w-3P6U# zz^5zAP~`Y@qEPs9)xW9l0DKmrgP&_X7+&7kOI-(O7&*Y%uU#Br)CK4EErZiAj4Y1K&dp6^C_LxKz{kf&n_OVz6ou7sXr&^9>JUPHfwOjx#--!mqT26EbjJ63! j9Wd&EQ3ucx00bBS^@4w=<s~ zdiV4e!>23D7^&(25D*iWBH95gG7kU$JUPHPU{MfYA;J(667nB}sTKk-aO2zotl}C* z4q!PUX*Gs^qc#S)>fa2(!NJsv0%VJUaf~9zrxS(Yut%+|41a~^sF(&oK7=_0WFf8) z00EHiK@Om5B1E?6)yrpi6X?&i9t=->J~)j_AP_cFpMmY z%>MF)#wDSVQxsOm!9Z?qA}|5^G4S#6(IyJeEd)6TS!~0JHw-i_h|og-ml!dCk(fp) zsdd4(56_4W0WKC|4J8E-YdO&&Fxns)b-<_tMjb#)01#jRGj4aRDylKY00000NkvXX Hu0mjf*$RF0 From f1277ca29f7f9f78b697d646b845d0f0b0d9f41d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 9 Oct 2023 20:51:14 +0200 Subject: [PATCH 4/5] wrong reference --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index bbdcff236c4..c64ddd78cf4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -121,7 +121,7 @@ - id: ClothingBackpackIan prob: 0.5 - id: AccessConfigurator - - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml + - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml - type: entity id: LockerChiefEngineerFilledHardsuit From 851fdda2918b1760a39348367c547cdbffd9ec64 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 9 Oct 2023 21:04:02 +0200 Subject: [PATCH 5/5] update pictures --- .../Misc/bureaucracy.rsi/folder-hop-ian.png | Bin 401 -> 417 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/folder-hop-ian.png index 512086d75b9c0c4cf04c0cc3d0e4fdc4b2bc5e0e..2f6f9ff5d6516095ca057c04854e9117ac8aa44f 100644 GIT binary patch delta 324 zcmV-K0lWT@1EB+uNdZHVN+Ev)=dW3_29}K&LqbAeV)O|CkmZbwj0}(4*g)L>q*zR` z13;ETEd~Q}9l=OUL8Rc`Ky+#K?&&RtPgj;PQaufbiAxdffGbz7{MXUZfqRnfx!~n| z3kFcypnEpFaqa+vkhB_@{iv0dx={c!90q`Kj3URU6NSR}p8AL3b{&6>$^mQ^qJtCN zRtyZEk5JbE8b%Iq_N$lAuqIGgDE%_;U|`r|L%R^bl_Nlo1Ucf{H!tcJMCbM`gVQjK zERM`(XaCEaC;-4VnBMq&yg1@{J`4Sx6Z7K59{FGgacf#@_KCN4#^13)1Giw2-W80nr1K+yq8 z8+6ZxH_jbk5Rz5{vmdpxQa1`fhQq+8E6Y&i_;jLB_;S_1sqX-M7NUQHpKCoBUf$SC zT?c3wIl$SkUOvN`Kw+Wu({&Y)BTTyxz?CCFjs!X4%NH8d1?ToHgVQjKERM|1%}rz| zJm<&2$HzyTTwvrBh1GFrr6R+;dGi=);sA6DK@LI|1LXpm)&=MxfG!ps96Ydf!M6|3 z82&stz(}=R04?8%2E-^@PIL&2wh2caFzSF&2hb7#1Q-DIf`6yw)B;EV0000