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.

Sign up for GitHub

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

Emergency Hotfix #470

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Emergency Hotfix #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cf8948
emergency fix
fenndragon Jan 9, 2025
fdad6d8
emergency fix
fenndragon Jan 9, 2025
ff65842
Update Borgmodules.yml
fenndragon Jan 9, 2025
3215ed3
Emergency Hotfix
fenndragon Jan 9, 2025
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
15 changes: 0 additions & 15 deletions Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
- type: Body
prototype: Primate
requiredLegs: 1 # TODO: More than 1 leg
- type: Inventory
templateId: Securityborg
- type: BorgChassis
maxModules: 4
moduleWhitelist:
Expand Down Expand Up @@ -72,16 +70,3 @@
shader: unshaded
map: ["light"]
visible: false

- type: inventoryTemplate
id: Securityborg
slots:
- name: pocket1
slotTexture: pocket
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,4
displayName: Pocket 1
stripHidden: false
8 changes: 4 additions & 4 deletions Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
layers:
- state: security
- state: icon-investigation
- type: Construction
graph: BorgModuleInvestigation
node: icon
# - type: Construction
# graph: BorgModuleInvestigation
# node: icon
- type: ItemBorgModule
items:
- ForensicScanner
Expand All @@ -83,4 +83,4 @@
- BorgModuleGeneric
- type: GuideHelp
guides:
- Cyborgs
- Cyborgs
46 changes: 23 additions & 23 deletions Resources/Prototypes/Recipes/Construction/Graphs/tools/BorgModules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@
- node: icon
entity: BorgModuleKill

- type: constructionGraph
id: BorgModuleInvestigation
start: start
graph:
- node: start
entity: ForensicScanner
edges:
- to: icon
steps:
- tag: BorgModuleGeneric
name: blank security borg module
icon:
sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
state: security
doAfter: 1
- tag: DoorBumpOpener
name: SecurityPDA
icon:
sprite: Objects/Devices/pda.rsi
state: pda-security
doAfter: 1
- node: icon
entity: BorgModuleInvestigation
#- type: constructionGraph
#id: BorgModuleInvestigation
#start: start
#graph:
#- node: start
#entity: ForensicScanner
#edges:
#- to: icon
#steps:
#- tag: BorgModuleGeneric
#name: blank security borg module
#icon:
#sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
#state: security
#doAfter: 1
#- tag: DoorBumpOpener
#name: SecurityPDA
#icon:
#sprite: Objects/Devices/pda.rsi
#state: pda-security
#doAfter: 1
#- node: icon
#entity: BorgModuleInvestigation
32 changes: 11 additions & 21 deletions Resources/Prototypes/Recipes/Construction/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,17 @@
icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-kill }
objectType: Item

- type: construction
name: Investigation
id: BorgModuleInvestigation
graph: BorgModuleInvestigation
startNode: start
targetNode: icon
category: construction-category-tools
description: A lethal module for security borg
icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-investigation }
objectType: Item
#- type: construction
#name: Investigation
#id: BorgModuleInvestigation
#graph: BorgModuleInvestigation
#startNode: start
#targetNode: icon
#category: construction-category-tools
#description: A lethal module for security borg
#icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-investigation }
#objectType: Item

# - type: construction
# name: Investigation Module
# id: BorgModuleInvestigation
# graph: BorgmoduleInvestigation
# startNode: start
# targetNode: power_sensor
# category: construction-category-tools
# description: A power network checking device for signals.
# icon: { sprite: Objects/Devices/gates.rsi, state: power_sensor }
# objectType: Item

# - type: construction
# name: Advanced Combat Module
Expand All @@ -95,4 +85,4 @@
# category: construction-category-tools
# description: A power network checking device for signals.
# icon: { sprite: Objects/Devices/gates.rsi, state: power_sensor }
# objectType: Item
# objectType: Item
Loading