Skip to content

Commit

Permalink
Merge branch 'Modules' of https://github.com/fenndragon/floofstation1
Browse files Browse the repository at this point in the history
…into Modules
fenndragon committed Dec 20, 2024
2 parents 69b62a8 + ba95ee3 commit 524f022
Showing 2 changed files with 3 additions and 8 deletions.
8 changes: 2 additions & 6 deletions Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 6
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
@@ -31,8 +31,4 @@
sprite:
sprite: Floof/Mobs/Silicon/quad.rsi
state: quadsprite
name: cyborg
- type: Construction
node: cyborg
- type: Speech
speechVerb: Robotic
name: cyborg
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
- type: ItemBorgModule
items:
- WeaponBorgDisabler
- WeaponborgTaser
- BorgStunbaton

- type: entity
@@ -35,6 +34,6 @@
- state: icon-kill
- type: ItemBorgModule
items:
- WeaponAntiqueLaser
- WeaponAdvancedLaser
- WeaponborgPistolMk58
- CombatKnife

0 comments on commit 524f022

Please sign in to comment.