Merge pull request #238 from iaada/bureaucracy-module

Bureaucracy and bartender module
impstation · Sep 10, 2024 · 84bc209 · 84bc209
2 parents 1546a1e + 59fd977
commit 84bc209
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 6 deletions.
diff --git 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/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 refilling 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/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/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -419,6 +419,25 @@
     - Multitool
 
 # service modules
+- type: entity
+  id: BorgModuleBartender
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: bartender cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-beer
+  - type: ItemBorgModule
+    items:
+    - Lighter
+    - DrinkShaker
+    - BarSpoon
+    - BorgIceBucket
+    - Pitcher
+    - BorgDropper
+
+# depreciated. included in case of merge errors
 - type: entity
   id: BorgModuleService
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
@@ -498,6 +517,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

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -572,8 +572,9 @@
     - BorgModuleRadiationDetection
     - BorgModuleTool
     - BorgModuleAppraisal
+    - BorgModuleBartender
     - BorgModuleConstruction
-    - BorgModuleService
+    - BorgModulePaper
     - BorgModuleTreatment
     - BorgModuleCleaning
     - CyborgEndoskeleton

diff --git 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:
@@ -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
diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
@@ -55,7 +55,7 @@
     <GuideEntityEmbed Entity="BorgModuleRCD" Caption="RCD"/>
     <GuideEntityEmbed Entity="BorgModuleMining" Caption="Mining"/>
     <GuideEntityEmbed Entity="BorgModuleCleaning" Caption="Cleaning"/>
-    <GuideEntityEmbed Entity="BorgModuleService" Caption="Service"/>
+    <GuideEntityEmbed Entity="BorgModulePaper" Caption="Service"/>
     <GuideEntityEmbed Entity="BorgModuleTreatment" Caption="Treatment"/>
   </Box>
   <Box>

diff --git 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
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-beer.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-beer.png
diff --git 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"
     },

diff --git 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