Minor Xenoborg Fixes and Tweaks (#6278)
* Disallowed crew IDs and talking over binary for xenoborg borgs. * Added tag * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add a EMP resistant battery * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * added EMP duration resistance * Fixed attribution * Fixed xenoborg magnet bags. Made the core suck up materials. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Removed Xenoborg ID chips since they should never have more than Xenoborg access * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Apply suggestions from code review Co-authored-by: Radezolid <snappednexus@gmail.com> Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> * meta.json ordering --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Radezolid <snappednexus@gmail.com>
This commit is contained in:
parent
57e5564ff8
commit
e639f423f4
|
|
@ -0,0 +1,2 @@
|
|||
magnet-pickup-component-magnet-xenoborg-on = The magnet appears to be [color=darkgreen]on[/color].
|
||||
magnet-pickup-component-magnet-xenoborg-off = The magnet appears to be [color=darkred]off[/color].
|
||||
|
|
@ -152,3 +152,15 @@
|
|||
blacklist:
|
||||
components:
|
||||
- SiliconLawProvider
|
||||
# Begin DeltaV changes - Allow toggling magnet
|
||||
- type: ItemToggle
|
||||
onUse: false
|
||||
soundActivate: &soundActivate
|
||||
collection: sparks
|
||||
params:
|
||||
variation: 0.25
|
||||
soundDeactivate: *soundActivate
|
||||
- type: ItemToggleExamine # DeltaV - Allow Toggle
|
||||
on: magnet-pickup-component-magnet-xenoborg-on
|
||||
off: magnet-pickup-component-magnet-xenoborg-off
|
||||
# End DeltaV changes
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@
|
|||
- type: IntrinsicRadioTransmitter # can only use binary and xenoborg channel
|
||||
channels:
|
||||
- Xenoborg
|
||||
- Binary
|
||||
# - Binary # DeltaV - only the mothership can talk over binary (prevents "accidents" on binary)
|
||||
- type: ActiveRadio # but can hear the mothership channel
|
||||
channels:
|
||||
- Mothership
|
||||
|
|
@ -584,12 +584,11 @@
|
|||
- Robotics
|
||||
- Xenoborgs
|
||||
- type: Access
|
||||
enabled: false # DeltaV - comment to prevent upstream removing, borg id chips
|
||||
tags:
|
||||
- Xenoborg
|
||||
- type: ContainerFill # DeltaV - borg id chips
|
||||
containers:
|
||||
borg_id_chip:
|
||||
- type: IdChipSlot # DeltaV - no crew IDs. Incompatible with *xeno*borg systems.
|
||||
whitelist:
|
||||
tags:
|
||||
- IdChipXenoborg
|
||||
- type: AccessReader
|
||||
access: [["Xenoborg"]]
|
||||
|
|
@ -603,3 +602,5 @@
|
|||
- type: Xenoborg
|
||||
- type: BypassLock
|
||||
bypassDelay: 15 # We don't want people to easily be able to remove xenoborg brains.
|
||||
- type: EmpResistance # DeltaV
|
||||
durationMultiplier: 0.1 # Only disabled for 10%. Default EMP stun time is 60% so still a 6 second disable. Battery has 40% resistance already.
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
containers:
|
||||
borg_brain:
|
||||
- MMIFilled
|
||||
borg_id_chip: # DeltaV
|
||||
- IdChipXenoborg
|
||||
borg_module:
|
||||
- XenoborgModuleBasic
|
||||
- BorgModuleAdvancedTool
|
||||
|
|
@ -54,7 +52,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHigh
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
|
||||
|
|
@ -129,7 +127,6 @@
|
|||
- !type:EmptyContainersBehaviour
|
||||
containers:
|
||||
- borg_brain
|
||||
- borg_id_chip # DeltaV
|
||||
- borg_module
|
||||
- cell_slot
|
||||
- !type:DoActsBehavior
|
||||
|
|
@ -138,8 +135,6 @@
|
|||
containers:
|
||||
borg_brain:
|
||||
- MMIFilled
|
||||
borg_id_chip: # DeltaV
|
||||
- IdChipXenoborg
|
||||
borg_module:
|
||||
- XenoborgModuleBasic
|
||||
- XenoborgModuleTool
|
||||
|
|
@ -149,7 +144,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHigh
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
|
||||
|
|
@ -194,8 +189,6 @@
|
|||
containers:
|
||||
borg_brain:
|
||||
- MMIFilled
|
||||
borg_id_chip: # DeltaV
|
||||
- IdChipXenoborg
|
||||
borg_module:
|
||||
- XenoborgModuleBasic
|
||||
- XenoborgModuleTool
|
||||
|
|
@ -205,7 +198,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHigh
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
|
||||
|
|
@ -249,8 +242,6 @@
|
|||
containers:
|
||||
borg_brain:
|
||||
- MMIFilled
|
||||
borg_id_chip: # DeltaV
|
||||
- IdChipXenoborg
|
||||
borg_module:
|
||||
- XenoborgModuleBasic
|
||||
- XenoborgModuleTool
|
||||
|
|
@ -261,7 +252,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHigh
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
|
||||
# xenoborgs empty
|
||||
|
|
@ -274,8 +265,6 @@
|
|||
containers:
|
||||
borg_brain:
|
||||
- MMI
|
||||
borg_id_chip: # DeltaV
|
||||
- IdChipXenoborg
|
||||
borg_module:
|
||||
- XenoborgModuleBasic
|
||||
- BorgModuleAdvancedTool
|
||||
|
|
@ -288,7 +277,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHighPrinted
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: XenoborgHeavy
|
||||
|
|
@ -308,7 +297,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHighPrinted
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: XenoborgScout
|
||||
|
|
@ -328,7 +317,7 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHighPrinted
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
||||
- type: entity
|
||||
parent: XenoborgStealth
|
||||
|
|
@ -349,4 +338,4 @@
|
|||
slots:
|
||||
cell_slot:
|
||||
name: power-cell-slot-component-slot-name-default
|
||||
startingItem: PowerCellHighPrinted
|
||||
startingItem: PowerCellHighXenoborg # DeltaV
|
||||
|
|
|
|||
|
|
@ -245,6 +245,9 @@
|
|||
- type: DeployableTurretController
|
||||
- type: DeviceList
|
||||
isAllowList: true
|
||||
- type: MaterialStorageMagnetPickup # Allow the core to suck up materials
|
||||
magnetEnabled: true
|
||||
range: 1
|
||||
# End DeltaV Additions
|
||||
|
||||
- type: entity
|
||||
|
|
|
|||
|
|
@ -20,3 +20,22 @@
|
|||
- type: Sprite
|
||||
sprite: _DV/Objects/Power/gamblagator_capacitors.rsi
|
||||
state: capacitor
|
||||
|
||||
- type: entity
|
||||
parent: PowerCellHigh
|
||||
id: PowerCellHighXenoborg
|
||||
name: xenoborg power cell
|
||||
description: A rechargeable power cell with many differences from our own designs. It seems to be somewhat resistant to electromagnetic pulses.
|
||||
suffix: Full
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _DV/Objects/Power/power_cells.rsi
|
||||
layers:
|
||||
- map: [ "enum.PowerCellVisualLayers.Base" ]
|
||||
state: xenoborg
|
||||
- map: [ "enum.PowerCellVisualLayers.Unshaded" ]
|
||||
state: o2
|
||||
shader: unshaded
|
||||
- type: EmpResistance # EMPs only remove 40% of charge
|
||||
strengthMultiplier: 0.00864 # EMPs remove 50000j. High Caps hold 1080j. 40% of 1080 is 432. 40% of a high cap will be 1/(50000/432)=0.00864% of 50000
|
||||
durationMultiplier: 0.4 # Disables only have 40% duration, around 4 seconds normally.
|
||||
|
|
|
|||
|
|
@ -85,13 +85,3 @@
|
|||
- External
|
||||
- Robotics
|
||||
- Maintenance
|
||||
|
||||
- type: entity
|
||||
parent: BaseIdChip
|
||||
id: IdChipXenoborg
|
||||
suffix: Xenoborg
|
||||
components:
|
||||
- type: Access
|
||||
tags:
|
||||
- Xenoborg
|
||||
# TODO: cool sprite
|
||||
|
|
|
|||
|
|
@ -99,6 +99,9 @@
|
|||
- type: Tag # prevents ID chips being used for an id computer privileged id
|
||||
id: IdChip
|
||||
|
||||
- type: Tag
|
||||
id: IdChipXenoborg # Xenoborg ID chip whitelist
|
||||
|
||||
- type: Tag
|
||||
id: JetInjector # Used to make the medical belt sprite show that a JetInjector is there.
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "sprites based on https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068. power cells edited by EmoGarbage404. Xenoborg modified from microreactor by javadocs(discord)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "xenoborg"
|
||||
},
|
||||
{
|
||||
"name": "o1"
|
||||
},
|
||||
{
|
||||
"name": "o2"
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 118 B |
Binary file not shown.
|
After Width: | Height: | Size: 118 B |
Binary file not shown.
|
After Width: | Height: | Size: 287 B |
Loading…
Reference in New Issue