From 2b28d922dd2052b84a699e66174675abfbe0eea7 Mon Sep 17 00:00:00 2001 From: aada Date: Mon, 9 Sep 2024 22:26:42 -0500 Subject: [PATCH 1/7] Cyborg stamp --- Resources/Locale/en-US/paper/stamp-component.ftl | 1 + .../Entities/Objects/Misc/rubber_stamp.yml | 14 ++++++++++++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../Misc/bureaucracy.rsi/paper_stamp-borg.png | Bin 0 -> 120 bytes 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-borg.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 36be70d61fbce9..d4f9424112f194 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -18,3 +18,4 @@ stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer stamp-component-stamped-name-greytide = Greytide +stamp-component-stamped-name-borg = Cyborg diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 66ff215f30f422..735922d93750aa 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -284,3 +284,17 @@ stampState: "paper_stamp-greytide" - type: Sprite state: stamp-greytide + +- type: entity + name: cyborg's rubber stamp + parent: RubberStampBase + id: RubberStampBorg + description: 01010010 01110101 01100010 01100101 01110010 00100000 01010011 01110100 01100001 01101101 01110000 + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-borg + stampedColor: "#323232" + stampState: "paper_stamp-borg" + - type: Sprite + state: stamp-greytide diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index c7183955f3d1bb..2ff1665c2dbd2c 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-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-borg by aada. paper_stamp-signature by Mnemotechnician.", "size": { "x": 32, "y": 32 @@ -228,6 +228,9 @@ { "name": "paper_stamp-greytide" }, + { + "name": "paper_stamp-borg" + }, { "name": "paper_stamp-signature" } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-borg.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-borg.png new file mode 100644 index 0000000000000000000000000000000000000000..6b102a45a8aea452a0508433072b689c77f9f9c9 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzdrud~kcif|=QeUO7;vx#p7i+l z*S%ob5}_PrCyqPJg4_?!09DmJd1tNuepmjQJQtUe_;jXaTbNaR%NQ8$Sw3jv`e2u~ R;~Y>CgQu&X%Q~loCIGPVCFcMD literal 0 HcmV?d00001 From 3f4ccf58c1930e9c5e7258fa28c91fa817210373 Mon Sep 17 00:00:00 2001 From: aada Date: Mon, 9 Sep 2024 22:27:11 -0500 Subject: [PATCH 2/7] rough module --- .../Specific/Robotics/borg_modules.yml | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 3163b9bdee2af2..19df11ce0f133b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -430,9 +430,6 @@ - state: icon-pen - type: ItemBorgModule items: - - Pen - - BooksBag - - HandLabeler - Lighter - DrinkShaker - BorgDropper @@ -498,6 +495,24 @@ - ClownRecorder - BikeHornInstrument +- type: entity + id: BorgModulePaper + parent: [ BaseBorgModuleService, BaseProviderBorgModule ] + name: bureaucracy cyborg module + components: + - type: Sprite + layers: + - state: service + - state: icon-pen + - type: ItemBorgModule + items: + - Pen + - BooksBag + - HandLabeler + - RubberStampApproved + - RubberStampDenied + - RubberStampBorg + #syndicate modules - type: entity id: BorgModuleSyndicateWeapon From 38139018f191f6e455211c0f2738ef7c76817433 Mon Sep 17 00:00:00 2001 From: aada Date: Mon, 9 Sep 2024 23:49:03 -0500 Subject: [PATCH 3/7] bartender module expanded and separated from bureaucracy module --- .../Consumable/Drinks/drinks_special.yml | 36 +++++++++++++++++++ .../Specific/Robotics/borg_modules.yml | 3 ++ 2 files changed, 39 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 930cf8175762af..c3ca7b395356ca 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -169,3 +169,39 @@ - type: PhysicalComposition materialComposition: Steel: 75 + +- type: entity + parent: BaseItem # Doesn't inherit the ability to put other reagents into it + id: BorgIceBucket + name: ice bucket + suffix: Cyborg + description: A special bucket of refreshy ice. Prohibited use for challenge with the same name! + components: + - type: Drink + - type: DrainableSolution + solution: drink + - type: DrawableSolution + solution: drink + - type: SolutionTransfer + canChangeTransferAmount: true + - type: Spillable + solution: drink + - type: UserInterface + interfaces: + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Ice + Quantity: 200 + - type: SolutionRegeneration + solution: drink + generated: + reagents: + - ReagentId: Ice + Quantity: 1 + - type: Sprite + sprite: Objects/Consumable/Drinks/icebucket.rsi + state: icon diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 19df11ce0f133b..d34b02f9a06a95 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -432,6 +432,9 @@ items: - Lighter - DrinkShaker + - BarSpoon + - BorgIceBucket + - Pitcher - BorgDropper - type: entity From e8c39eccb86c2e9aeb8db158b8a51ac31618e76a Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 10 Sep 2024 00:30:49 -0500 Subject: [PATCH 4/7] Rename service module to bartender module --- .../Specific/Robotics/borg_modules.yml | 23 +++++++++++++++++-- .../Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/Recipes/Lathes/robotics.yml | 4 ++-- .../ServerInfo/Guidebook/Science/Cyborgs.xml | 2 +- Resources/migration.yml | 3 +++ 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index d34b02f9a06a95..46a9b04f7eff00 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -420,9 +420,9 @@ # service modules - type: entity - id: BorgModuleService + id: BorgModuleBartender parent: [ BaseBorgModuleService, BaseProviderBorgModule ] - name: service cyborg module + name: bartender cyborg module components: - type: Sprite layers: @@ -437,6 +437,25 @@ - Pitcher - BorgDropper +# depreciated. included in case of merge errors +- type: entity + id: BorgModuleService + parent: [ BaseBorgModuleService, BaseProviderBorgModule ] + name: service cyborg module + components: + - type: Sprite + layers: + - state: service + - state: icon-pen + - type: ItemBorgModule + items: + - Pen + - BooksBag + - HandLabeler + - Lighter + - DrinkShaker + - BorgDropper + - type: entity id: BorgModuleMusique parent: [ BaseBorgModuleService, BaseProviderBorgModule ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 06e5bb695cf55a..a01c898f3b5fef 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -572,8 +572,8 @@ - BorgModuleRadiationDetection - BorgModuleTool - BorgModuleAppraisal + - BorgModuleBartender - BorgModuleConstruction - - BorgModuleService - BorgModuleTreatment - BorgModuleCleaning - CyborgEndoskeleton diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 44a9e2f0f244eb..140b4e72bfe39a 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -564,8 +564,8 @@ Plastic: 250 - type: latheRecipe - id: BorgModuleService - result: BorgModuleService + id: BorgModuleBartender + result: BorgModuleBartender category: Robotics completetime: 3 materials: diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml index 2b8defb0705845..c1e75118008555 100644 --- a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml +++ b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml @@ -55,7 +55,7 @@ - + diff --git a/Resources/migration.yml b/Resources/migration.yml index 65007e50b59cb8..0765758499fc38 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -420,3 +420,6 @@ ClothingBackpackDuffelSyndicateCostumeCentcom: null ClothingHeadsetAltCentComFake: null CentcomPDAFake: null CentcomIDCardSyndie: null + +# 2024-09-09 +BorgModuleService: BorgModuleBartender From 84ddfc5226aac558f8791078a7d3f892c5814a7e Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 10 Sep 2024 00:35:32 -0500 Subject: [PATCH 5/7] lathe recipe --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Recipes/Lathes/robotics.yml | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a01c898f3b5fef..a5c66b7a8e45c7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -574,6 +574,7 @@ - BorgModuleAppraisal - BorgModuleBartender - BorgModuleConstruction + - BorgModulePaper - BorgModuleTreatment - BorgModuleCleaning - CyborgEndoskeleton diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 140b4e72bfe39a..3f6ef65f22effe 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -612,3 +612,13 @@ Steel: 250 Glass: 250 Plastic: 250 + +- type: latheRecipe + id: BorgModulePaper + result: BorgModulePaper + category: Robotics + completetime: 3 + materials: + Steel: 250 + Glass: 250 + Plastic: 250 From 904a2d81afc35baa91001f1c61cfe8b1954f9959 Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 10 Sep 2024 01:01:50 -0500 Subject: [PATCH 6/7] bartender module sprite --- .../Objects/Specific/Robotics/borg_modules.yml | 2 +- .../Robotics/borgmodule.rsi/icon-beer.png | Bin 0 -> 199 bytes .../Specific/Robotics/borgmodule.rsi/meta.json | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-beer.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 46a9b04f7eff00..2e6a76696ac51e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -427,7 +427,7 @@ - type: Sprite layers: - state: service - - state: icon-pen + - state: icon-beer - type: ItemBorgModule items: - Lighter diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-beer.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-beer.png new file mode 100644 index 0000000000000000000000000000000000000000..7530485db0c3b678e836fccd6db4d3594a37063d GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJK2I0Nkcigg1PRu~2_ijBfd*V{ zQa5&&zyJUF`T74qV9&L;{QbTEPi7o@KGl5<=xB@ zK%f`1!(m!#NHGIY!Qnn5VT<2>(>dj)niMf?W#C@QwqnZMh3lE`?X70_FL=Mt7^uCS pWxv-yy)GFeF1LdkAnTtnF?{IO)qNWIPZ8)c22WQ%mvv4FO#qH0MYaF{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 74c9893cae3735..8b11b32a546365 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-beer by aada.", "size": { "x": 32, "y": 32 @@ -25,6 +25,9 @@ { "name": "icon-artifacts" }, + { + "name": "icon-beer" + }, { "name": "icon-cables" }, From 59fd977c03bba64cd83e93a89f15c4bceec62d9d Mon Sep 17 00:00:00 2001 From: aada Date: Tue, 10 Sep 2024 01:11:27 -0500 Subject: [PATCH 7/7] description change --- .../Entities/Objects/Consumable/Drinks/drinks_special.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index c3ca7b395356ca..e318092f936f55 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -175,7 +175,7 @@ id: BorgIceBucket name: ice bucket suffix: Cyborg - description: A special bucket of refreshy ice. Prohibited use for challenge with the same name! + description: A special bucket of refreshy refilling ice. Prohibited use for challenge with the same name! components: - type: Drink - type: DrainableSolution