Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bureaucracy and bartender module #238

Merged
merged 7 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,9 @@
- BorgModuleRadiationDetection
- BorgModuleTool
- BorgModuleAppraisal
- BorgModuleBartender
- BorgModuleConstruction
- BorgModuleService
- BorgModulePaper
- BorgModuleTreatment
- BorgModuleCleaning
- CyborgEndoskeleton
Expand Down
14 changes: 12 additions & 2 deletions Resources/Prototypes/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@
Plastic: 250

- type: latheRecipe
id: BorgModuleService
result: BorgModuleService
id: BorgModuleBartender
result: BorgModuleBartender
category: Robotics
completetime: 3
materials:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -228,6 +228,9 @@
{
"name": "paper_stamp-greytide"
},
{
"name": "paper_stamp-borg"
},
{
"name": "paper_stamp-signature"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,6 +25,9 @@
{
"name": "icon-artifacts"
},
{
"name": "icon-beer"
},
{
"name": "icon-cables"
},
Expand Down
3 changes: 3 additions & 0 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -420,3 +420,6 @@ ClothingBackpackDuffelSyndicateCostumeCentcom: null
ClothingHeadsetAltCentComFake: null
CentcomPDAFake: null
CentcomIDCardSyndie: null

# 2024-09-09
BorgModuleService: BorgModuleBartender
Loading