Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream
# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml
This commit is contained in:
Ed
@@ -487,7 +487,6 @@
|
||||
- CartridgeAmmo
|
||||
- DoorRemote
|
||||
- Whistle
|
||||
- HolosignProjector
|
||||
- BalloonPopper
|
||||
- type: ItemMapper
|
||||
mapLayers:
|
||||
|
||||
@@ -13,11 +13,7 @@
|
||||
categories: [ HideSpawnMenu ]
|
||||
components:
|
||||
- type: ShowHealthBars
|
||||
damageContainers:
|
||||
- Biological
|
||||
- type: ShowHealthIcons
|
||||
damageContainers:
|
||||
- Biological
|
||||
|
||||
- type: entity
|
||||
parent: ClothingEyesBase
|
||||
@@ -223,8 +219,6 @@
|
||||
sprite: Clothing/Eyes/Hud/syndagent.rsi
|
||||
- type: ShowSyndicateIcons
|
||||
- type: ShowHealthBars
|
||||
damageContainers:
|
||||
- Biological
|
||||
|
||||
- type: entity
|
||||
parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons]
|
||||
|
||||
@@ -853,6 +853,10 @@
|
||||
- type: Construction
|
||||
graph: WebObjects
|
||||
node: coat
|
||||
- type: Butcherable
|
||||
spawned:
|
||||
- id: MaterialWebSilk1
|
||||
amount: 5
|
||||
- type: FlavorProfile
|
||||
flavors:
|
||||
- cobwebs
|
||||
|
||||
@@ -187,6 +187,10 @@
|
||||
reagents:
|
||||
- ReagentId: Fiber
|
||||
Quantity: 10
|
||||
- type: Butcherable
|
||||
spawned:
|
||||
- id: MaterialWebSilk1
|
||||
amount: 2
|
||||
- type: Construction
|
||||
graph: WebObjects
|
||||
node: boots
|
||||
|
||||
@@ -46,6 +46,8 @@
|
||||
- FoodBakedMuffinBerry
|
||||
- FoodBakedMuffinCherry
|
||||
- FoodBakedMuffinBluecherry
|
||||
- FoodBakedMuffinChocolate
|
||||
- FoodBakedMuffinBanana
|
||||
- FoodBakedBunHoney
|
||||
- FoodBakedBunHotX
|
||||
- FoodBakedBunMeat
|
||||
|
||||
@@ -285,7 +285,6 @@
|
||||
- type: AccessReader
|
||||
access: [["Command"], ["Research"]]
|
||||
- type: ShowJobIcons
|
||||
- type: ShowMindShieldIcons
|
||||
|
||||
- type: entity
|
||||
id: BaseBorgChassisSyndicate
|
||||
|
||||
@@ -391,8 +391,6 @@
|
||||
- type: Construction
|
||||
node: syndicatemedical
|
||||
- type: ShowHealthBars
|
||||
damageContainers:
|
||||
- Biological
|
||||
- type: InteractionPopup
|
||||
interactSuccessString: petting-success-syndicate-cyborg
|
||||
interactFailureString: petting-failure-syndicate-cyborg
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
|
||||
iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
|
||||
keywords: [ "AI", "console", "interface" ]
|
||||
priority: -7
|
||||
priority: -6
|
||||
event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }
|
||||
|
||||
- type: entity
|
||||
@@ -151,7 +151,7 @@
|
||||
icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
|
||||
iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
|
||||
keywords: [ "AI", "console", "interface" ]
|
||||
priority: -9
|
||||
priority: -8
|
||||
event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }
|
||||
|
||||
- type: entity
|
||||
@@ -163,5 +163,5 @@
|
||||
icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
|
||||
iconOn: Interface/Actions/actions_ai.rsi/station_records.png
|
||||
keywords: [ "AI", "console", "interface" ]
|
||||
priority: -8
|
||||
priority: -7
|
||||
event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
- type: ActionGrant
|
||||
actions:
|
||||
- ActionJumpToCore
|
||||
- ActionShowJobIcons
|
||||
- ActionSurvCameraLights
|
||||
- ActionAIViewLaws
|
||||
- type: UserInterface
|
||||
@@ -70,6 +69,9 @@
|
||||
canShuttle: false
|
||||
title: comms-console-announcement-title-station-ai
|
||||
color: "#2ed2fd"
|
||||
- type: Speech
|
||||
speechVerb: Robotic
|
||||
- type: ShowJobIcons
|
||||
|
||||
- type: entity
|
||||
id: AiHeldIntellicard
|
||||
|
||||
@@ -19,44 +19,84 @@
|
||||
- type: Item
|
||||
size: Tiny
|
||||
|
||||
# Muffins/Buns
|
||||
# Muffins
|
||||
|
||||
- type: entity
|
||||
name: muffin
|
||||
parent: FoodBakedBase
|
||||
parent: FoodInjectableBase
|
||||
id: FoodBakedMuffin
|
||||
description: A delicious and spongy little cake.
|
||||
components:
|
||||
- type: Food
|
||||
trash:
|
||||
- FoodPlateMuffinTin
|
||||
- type: Sprite
|
||||
sprite: Objects/Consumable/Food/Baked/misc.rsi
|
||||
state: muffin
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 10
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 6
|
||||
- ReagentId: Vitamin
|
||||
Quantity: 2
|
||||
- type: FlavorProfile
|
||||
flavors:
|
||||
- sweet
|
||||
- type: Item
|
||||
size: Tiny
|
||||
|
||||
- type: entity
|
||||
name: berry muffin
|
||||
parent: FoodBakedBase
|
||||
parent: FoodBakedMuffin
|
||||
id: FoodBakedMuffinBerry
|
||||
description: A delicious and spongy little cake, with berries.
|
||||
components:
|
||||
- type: Sprite
|
||||
state: muffin-berry
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 12
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 6
|
||||
- ReagentId: Vitamin
|
||||
Quantity: 2
|
||||
- ReagentId: JuiceBerry
|
||||
Quantity: 2
|
||||
- type: Tag
|
||||
tags:
|
||||
- Fruit
|
||||
|
||||
- type: entity
|
||||
name: cherry muffin
|
||||
parent: FoodBakedBase
|
||||
parent: FoodBakedMuffin
|
||||
id: FoodBakedMuffinCherry
|
||||
description: A sweet muffin with cherry bits.
|
||||
components:
|
||||
- type: Sprite
|
||||
state: muffin-cherry
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 12
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 6
|
||||
- ReagentId: Vitamin
|
||||
Quantity: 2
|
||||
- ReagentId: JuiceCherry
|
||||
Quantity: 2
|
||||
- type: Tag
|
||||
tags:
|
||||
- Fruit
|
||||
|
||||
- type: entity
|
||||
name: bluecherry muffin
|
||||
parent: FoodBakedBase
|
||||
parent: FoodBakedMuffin
|
||||
id: FoodBakedMuffinBluecherry
|
||||
description: Blue cherries inside a delicious muffin.
|
||||
components:
|
||||
@@ -66,6 +106,51 @@
|
||||
tags:
|
||||
- Fruit
|
||||
|
||||
- type: entity
|
||||
name: chocolate muffin
|
||||
parent: FoodBakedMuffin
|
||||
id: FoodBakedMuffinChocolate
|
||||
description: A delicious and spongy chocolate muffin.
|
||||
components:
|
||||
- type: Sprite
|
||||
state: muffin-chocolate
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 12
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 6
|
||||
- ReagentId: Vitamin
|
||||
Quantity: 2
|
||||
- ReagentId: CocoaPowder
|
||||
Quantity: 2
|
||||
|
||||
- type: entity
|
||||
name: banana muffin
|
||||
parent: FoodBakedMuffin
|
||||
id: FoodBakedMuffinBanana
|
||||
description: A delicious and spongy banana muffin.
|
||||
components:
|
||||
- type: Sprite
|
||||
state: muffin-banana
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 12
|
||||
reagents:
|
||||
- ReagentId: Nutriment
|
||||
Quantity: 6
|
||||
- ReagentId: Vitamin
|
||||
Quantity: 2
|
||||
- ReagentId: JuiceBanana
|
||||
Quantity: 2
|
||||
- type: Tag
|
||||
tags:
|
||||
- Fruit
|
||||
|
||||
# Buns
|
||||
|
||||
- type: entity
|
||||
name: honey bun #TODO honey
|
||||
parent: FoodBakedBase
|
||||
@@ -685,4 +770,4 @@
|
||||
- type: DamageOtherOnHit
|
||||
damage:
|
||||
types:
|
||||
Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
|
||||
Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
|
||||
|
||||
@@ -178,3 +178,27 @@
|
||||
materialComposition:
|
||||
Steel: 60
|
||||
- type: SpaceGarbage
|
||||
|
||||
# Muffin Tin
|
||||
|
||||
- type: entity
|
||||
name: muffin tin
|
||||
parent: BaseItem
|
||||
id: FoodPlateMuffinTin
|
||||
description: A cheap foil tin for muffins.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Consumable/Food/plates.rsi
|
||||
state: muffin-tin
|
||||
- type: Item
|
||||
size: Small
|
||||
shape:
|
||||
- 0,0,1,0
|
||||
storedOffset: 0,-3
|
||||
- type: Tag
|
||||
tags:
|
||||
- Trash
|
||||
- type: PhysicalComposition
|
||||
materialComposition:
|
||||
Steel: 30
|
||||
- type: SpaceGarbage
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
components:
|
||||
- Anchorable
|
||||
- Item
|
||||
tags:
|
||||
- Bot # for funny bot moments
|
||||
blacklist:
|
||||
components:
|
||||
|
||||
@@ -121,6 +121,7 @@
|
||||
- type: Tag
|
||||
tags:
|
||||
- HolofanProjector
|
||||
- SecBeltEquip
|
||||
- type: StaticPrice
|
||||
price: 50
|
||||
|
||||
|
||||
@@ -496,7 +496,7 @@
|
||||
state: pda-janitor
|
||||
|
||||
- type: entity
|
||||
parent: BaseSecurityPDA
|
||||
parent: BasePDA
|
||||
id: CaptainPDA
|
||||
name: captain PDA
|
||||
description: Surprisingly no different from your PDA.
|
||||
@@ -684,6 +684,13 @@
|
||||
accentHColor: "#447987"
|
||||
- type: Icon
|
||||
state: pda-hos
|
||||
- type: CartridgeLoader
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- WantedListCartridge
|
||||
- LogProbeCartridge
|
||||
|
||||
- type: entity
|
||||
parent: BaseSecurityPDA
|
||||
@@ -732,6 +739,16 @@
|
||||
borderColor: "#00842e"
|
||||
- type: Icon
|
||||
state: pda-centcom
|
||||
- type: CartridgeLoader
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- MedTekCartridge
|
||||
- WantedListCartridge
|
||||
- LogProbeCartridge
|
||||
- AstroNavCartridge
|
||||
|
||||
- type: entity
|
||||
parent: CentcomPDA
|
||||
@@ -754,6 +771,8 @@
|
||||
- NewsReaderCartridge
|
||||
- LogProbeCartridge
|
||||
- WantedListCartridge
|
||||
- MedTekCartridge
|
||||
- AstroNavCartridge
|
||||
|
||||
- type: entity
|
||||
parent: CentcomPDA
|
||||
@@ -845,14 +864,6 @@
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- NotekeeperCartridge
|
||||
cartridgeSlot:
|
||||
priority: -1
|
||||
name: Cartridge
|
||||
ejectSound: /Audio/Machines/id_swipe.ogg
|
||||
insertSound: /Audio/Machines/id_insert.ogg
|
||||
whitelist:
|
||||
components:
|
||||
- Cartridge
|
||||
|
||||
- type: entity
|
||||
parent: BaseSecurityPDA
|
||||
@@ -870,6 +881,16 @@
|
||||
accentVColor: "#447987"
|
||||
- type: Icon
|
||||
state: pda-ert
|
||||
- type: CartridgeLoader
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- MedTekCartridge
|
||||
- WantedListCartridge
|
||||
- LogProbeCartridge
|
||||
- AstroNavCartridge
|
||||
|
||||
- type: entity
|
||||
parent: ERTLeaderPDA
|
||||
@@ -910,14 +931,6 @@
|
||||
components:
|
||||
- type: Pda
|
||||
id: ERTMedicIDCard
|
||||
- type: CartridgeLoader
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- MedTekCartridge
|
||||
- WantedListCartridge
|
||||
|
||||
- type: entity
|
||||
parent: ERTLeaderPDA
|
||||
@@ -1019,6 +1032,13 @@
|
||||
borderColor: "#774705"
|
||||
- type: Icon
|
||||
state: pda-detective
|
||||
- type: CartridgeLoader
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- WantedListCartridge
|
||||
- LogProbeCartridge
|
||||
|
||||
- type: entity
|
||||
parent: BaseMedicalPDA
|
||||
@@ -1035,6 +1055,13 @@
|
||||
accentVColor: "#d7d7d0"
|
||||
- type: Icon
|
||||
state: pda-brigmedic
|
||||
- type: CartridgeLoader
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- NewsReaderCartridge
|
||||
- WantedListCartridge
|
||||
- MedTekCartridge
|
||||
|
||||
- type: entity
|
||||
parent: ClownPDA
|
||||
@@ -1151,11 +1178,3 @@
|
||||
preinstalled:
|
||||
- NotekeeperCartridge
|
||||
- MedTekCartridge
|
||||
cartridgeSlot:
|
||||
priority: -1
|
||||
name: Cartridge
|
||||
ejectSound: /Audio/Machines/id_swipe.ogg
|
||||
insertSound: /Audio/Machines/id_insert.ogg
|
||||
whitelist:
|
||||
components:
|
||||
- Cartridge
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
damage:
|
||||
types:
|
||||
Blunt: 0
|
||||
hidden: true
|
||||
- type: PhysicalComposition
|
||||
materialComposition:
|
||||
Cloth: 100
|
||||
@@ -598,6 +599,11 @@
|
||||
path: /Audio/Effects/bite.ogg
|
||||
angle: 0
|
||||
animation: WeaponArcBite # Rrrr!
|
||||
- type: Tag
|
||||
tags:
|
||||
- Payload
|
||||
- ClothMade
|
||||
- PlushieCarp
|
||||
|
||||
- type: entity
|
||||
parent: PlushieCarp
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
density: 15
|
||||
mask:
|
||||
- MachineMask
|
||||
- type: CargoPallet
|
||||
palletType: All
|
||||
- type: StaticPrice
|
||||
price: 100
|
||||
- type: Sprite
|
||||
|
||||
@@ -71,3 +71,69 @@
|
||||
id: DefibrillatorOneHandedUnpowered
|
||||
parent: BaseDefibrillator
|
||||
suffix: One-Handed, Unpowered
|
||||
|
||||
- type: entity
|
||||
id: DefibrillatorCompact # This should be a research item at some point
|
||||
parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
|
||||
name: compact defibrillator
|
||||
description: Now in fun size!
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Medical/defibsmall.rsi
|
||||
layers:
|
||||
- state: icon
|
||||
- state: screen
|
||||
map: [ "enum.ToggleVisuals.Layer" ]
|
||||
visible: false
|
||||
shader: unshaded
|
||||
- state: ready
|
||||
map: ["enum.PowerDeviceVisualLayers.Powered"]
|
||||
shader: unshaded
|
||||
- type: Item
|
||||
size: Normal
|
||||
- type: ToggleCellDraw
|
||||
- type: PowerCellDraw
|
||||
useRate: 100
|
||||
- type: Defibrillator
|
||||
zapHeal:
|
||||
types:
|
||||
Asphyxiation: -40
|
||||
doAfterDuration: 6
|
||||
- type: DoAfter
|
||||
- type: UseDelay
|
||||
|
||||
- type: entity
|
||||
id: DefibrillatorSyndicate
|
||||
parent: DefibrillatorCompact
|
||||
name: interdyne defibrillator
|
||||
description: Doubles as a self-defense weapon against war-crime inclined tiders.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Medical/defibsyndi.rsi
|
||||
layers:
|
||||
- state: icon
|
||||
- state: screen
|
||||
map: [ "enum.ToggleVisuals.Layer" ]
|
||||
visible: false
|
||||
shader: unshaded
|
||||
- state: ready
|
||||
map: ["enum.PowerDeviceVisualLayers.Powered"]
|
||||
shader: unshaded
|
||||
- type: MeleeWeapon
|
||||
damage:
|
||||
types:
|
||||
Blunt: 8
|
||||
- type: ItemToggleMeleeWeapon
|
||||
activatedSoundOnHit:
|
||||
path: /Audio/Items/Defib/defib_zap.ogg
|
||||
params:
|
||||
variation: 0.250
|
||||
activatedSoundOnHitNoDamage:
|
||||
path: /Audio/Items/Defib/defib_zap.ogg
|
||||
params:
|
||||
variation: 0.250
|
||||
volume: -10
|
||||
activatedDamage:
|
||||
types:
|
||||
Blunt: 8
|
||||
Shock: 16
|
||||
|
||||
@@ -271,7 +271,6 @@
|
||||
transferAmount: 20
|
||||
onlyAffectsMobs: false
|
||||
injectOnly: true
|
||||
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
pen:
|
||||
@@ -284,6 +283,102 @@
|
||||
- type: Tag
|
||||
tags: []
|
||||
|
||||
- type: entity
|
||||
name: puncturase auto-injector
|
||||
parent: ChemicalMedipen
|
||||
id: PunctAutoInjector
|
||||
description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Medical/medipen.rsi
|
||||
layers:
|
||||
- state: punctpen
|
||||
map: ["enum.SolutionContainerLayers.Fill"]
|
||||
- type: SolutionContainerVisuals
|
||||
maxFillLevels: 1
|
||||
changeColor: false
|
||||
emptySpriteName: punctpen_empty
|
||||
- type: Hypospray
|
||||
solutionName: pen
|
||||
transferAmount: 15
|
||||
onlyAffectsMobs: false
|
||||
injectOnly: true
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
pen:
|
||||
maxVol: 15
|
||||
reagents:
|
||||
- ReagentId: Puncturase
|
||||
Quantity: 10
|
||||
- ReagentId: TranexamicAcid
|
||||
Quantity: 5
|
||||
- type: Tag
|
||||
tags: []
|
||||
|
||||
- type: entity
|
||||
name: pyrazine auto-injector
|
||||
parent: ChemicalMedipen
|
||||
id: PyraAutoInjector
|
||||
description: A rapid dose of pyrazine and dermaline, intended for combat applications.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Medical/medipen.rsi
|
||||
layers:
|
||||
- state: pyrapen
|
||||
map: ["enum.SolutionContainerLayers.Fill"]
|
||||
- type: SolutionContainerVisuals
|
||||
maxFillLevels: 1
|
||||
changeColor: false
|
||||
emptySpriteName: pyrapen_empty
|
||||
- type: Hypospray
|
||||
solutionName: pen
|
||||
transferAmount: 20
|
||||
onlyAffectsMobs: false
|
||||
injectOnly: true
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
pen:
|
||||
maxVol: 20
|
||||
reagents:
|
||||
- ReagentId: Pyrazine
|
||||
Quantity: 10
|
||||
- ReagentId: Dermaline
|
||||
Quantity: 10
|
||||
- type: Tag
|
||||
tags: []
|
||||
|
||||
- type: entity
|
||||
name: airloss auto-injector
|
||||
parent: ChemicalMedipen
|
||||
id: AirlossAutoInjector
|
||||
description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Medical/medipen.rsi
|
||||
layers:
|
||||
- state: dexpen
|
||||
map: ["enum.SolutionContainerLayers.Fill"]
|
||||
- type: SolutionContainerVisuals
|
||||
maxFillLevels: 1
|
||||
changeColor: false
|
||||
emptySpriteName: dexpen_empty
|
||||
- type: Hypospray
|
||||
solutionName: pen
|
||||
transferAmount: 40
|
||||
onlyAffectsMobs: false
|
||||
injectOnly: true
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
pen:
|
||||
maxVol: 40
|
||||
reagents:
|
||||
- ReagentId: Saline
|
||||
Quantity: 20
|
||||
- ReagentId: DexalinPlus
|
||||
Quantity: 20
|
||||
- type: Tag
|
||||
tags: []
|
||||
|
||||
- type: entity
|
||||
name: space medipen
|
||||
parent: ChemicalMedipen
|
||||
|
||||
@@ -5,60 +5,65 @@
|
||||
description: A strange alien device.
|
||||
abstract: true
|
||||
components:
|
||||
- type: Sprite
|
||||
drawdepth: SmallObjects
|
||||
sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
|
||||
noRot: true
|
||||
layers:
|
||||
- state: ano30
|
||||
map: [ "enum.ArtifactsVisualLayers.Base" ]
|
||||
- state: ano30_on
|
||||
map: [ "enum.ArtifactsVisualLayers.Effect" ]
|
||||
visible: false
|
||||
- type: Damageable
|
||||
- type: Physics
|
||||
bodyType: Dynamic
|
||||
- type: Transform
|
||||
noRot: true
|
||||
- type: UserInterface #needs to be here for certain effects
|
||||
interfaces:
|
||||
enum.StorageUiKey.Key:
|
||||
type: StorageBoundUserInterface
|
||||
enum.TransferAmountUiKey.Key:
|
||||
type: TransferAmountBoundUserInterface
|
||||
enum.InstrumentUiKey.Key:
|
||||
type: InstrumentBoundUserInterface
|
||||
enum.IntercomUiKey.Key:
|
||||
type: IntercomBoundUserInterface
|
||||
- type: Reactive
|
||||
groups:
|
||||
Acidic: [Touch]
|
||||
- type: Fixtures
|
||||
fixtures:
|
||||
fix1:
|
||||
shape:
|
||||
!type:PhysShapeCircle
|
||||
radius: 0.45
|
||||
density: 75
|
||||
layer: # doesn't collide with artifact storage
|
||||
- Opaque
|
||||
mask:
|
||||
- MachineMask
|
||||
- type: InteractionOutline
|
||||
- type: Artifact
|
||||
- type: RandomArtifactSprite
|
||||
maxSprite: 36
|
||||
- type: RandomSprite
|
||||
available:
|
||||
- enum.ArtifactsVisualLayers.Effect:
|
||||
ano01_on: Rainbow
|
||||
- type: Appearance
|
||||
- type: Actions
|
||||
- type: GuideHelp
|
||||
guides:
|
||||
- Xenoarchaeology
|
||||
- type: StealTarget
|
||||
stealGroup: XenoArtifact
|
||||
- type: Sprite
|
||||
drawdepth: SmallObjects
|
||||
sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
|
||||
noRot: true
|
||||
layers:
|
||||
- state: ano30
|
||||
map: [ "enum.ArtifactsVisualLayers.Base" ]
|
||||
- state: ano30_on
|
||||
map: [ "enum.ArtifactsVisualLayers.Effect" ]
|
||||
visible: false
|
||||
- type: Damageable
|
||||
- type: Physics
|
||||
bodyType: Dynamic
|
||||
- type: Transform
|
||||
noRot: true
|
||||
- type: UserInterface #needs to be here for certain effects
|
||||
interfaces:
|
||||
enum.StorageUiKey.Key:
|
||||
type: StorageBoundUserInterface
|
||||
enum.TransferAmountUiKey.Key:
|
||||
type: TransferAmountBoundUserInterface
|
||||
enum.InstrumentUiKey.Key:
|
||||
type: InstrumentBoundUserInterface
|
||||
enum.IntercomUiKey.Key:
|
||||
type: IntercomBoundUserInterface
|
||||
- type: Reactive
|
||||
groups:
|
||||
Acidic: [Touch]
|
||||
- type: Fixtures
|
||||
fixtures:
|
||||
fix1:
|
||||
shape:
|
||||
!type:PhysShapeCircle
|
||||
radius: 0.45
|
||||
density: 75
|
||||
layer: # doesn't collide with artifact storage
|
||||
- Opaque
|
||||
mask:
|
||||
- MachineMask
|
||||
- type: InteractionOutline
|
||||
- type: Artifact
|
||||
- type: RandomArtifactSprite
|
||||
maxSprite: 36
|
||||
- type: RandomSprite
|
||||
available:
|
||||
- enum.ArtifactsVisualLayers.Effect:
|
||||
ano01_on: Rainbow
|
||||
- type: Appearance
|
||||
- type: Actions
|
||||
- type: GuideHelp
|
||||
guides:
|
||||
- Xenoarchaeology
|
||||
- type: StealTarget
|
||||
stealGroup: XenoArtifact
|
||||
- type: ContainerContainer
|
||||
containers:
|
||||
storagebase: !type:Container # needed for the EffectStorage artifactEffect
|
||||
ents: [ ]
|
||||
revolver-ammo: !type:Container # needed for the EffectBigIron artifactEffect
|
||||
|
||||
- type: entity
|
||||
parent: BaseXenoArtifact
|
||||
|
||||
@@ -543,12 +543,8 @@
|
||||
solutions:
|
||||
food:
|
||||
maxVol: 20
|
||||
- type: SolutionSpiker
|
||||
sourceSolution: food
|
||||
- type: Extractable
|
||||
grindableSolutionName: food
|
||||
- type: StaticPrice
|
||||
price: 0
|
||||
- type: ExplosionResistance
|
||||
damageCoefficient: 0.025 # survives conventional explosives but not minibombs and nukes
|
||||
- type: Damageable
|
||||
damageContainer: Inorganic
|
||||
- type: Destructible
|
||||
@@ -561,6 +557,12 @@
|
||||
solution: food
|
||||
- !type:DoActsBehavior
|
||||
acts: [ "Destruction" ]
|
||||
- type: SolutionSpiker
|
||||
sourceSolution: food
|
||||
- type: Extractable
|
||||
grindableSolutionName: food
|
||||
- type: StaticPrice
|
||||
price: 0
|
||||
- type: Tag
|
||||
tags:
|
||||
- Pill
|
||||
@@ -588,4 +590,7 @@
|
||||
areaInsertRadius: 1
|
||||
storageInsertSound: /Audio/Effects/pill_insert.ogg
|
||||
storageRemoveSound: /Audio/Effects/pill_remove.ogg
|
||||
whitelist:
|
||||
tags:
|
||||
- Pill
|
||||
- type: Dumpable
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
- type: entity
|
||||
- type: entity
|
||||
id: WeaponWaterGunBase
|
||||
abstract: true
|
||||
parent: BaseItem
|
||||
@@ -71,7 +71,7 @@
|
||||
id: WeaponWaterBlaster
|
||||
parent: WeaponWaterGunBase
|
||||
name: water blaster
|
||||
description: With this bad boy, you'll be the cooleste kid at the summer barbecue.
|
||||
description: With this bad boy, you'll be the coolest kid at the summer barbecue.
|
||||
components:
|
||||
- type: Gun
|
||||
cameraRecoilScalar: 0 #no recoil
|
||||
|
||||
@@ -103,6 +103,9 @@
|
||||
Slash: 10
|
||||
- type: Item
|
||||
sprite: Objects/Weapons/Melee/combat_knife.rsi
|
||||
storedSprite:
|
||||
state: storage
|
||||
sprite: Objects/Weapons/Melee/combat_knife.rsi
|
||||
- type: DisarmMalus
|
||||
malus: 0.225
|
||||
|
||||
@@ -117,6 +120,9 @@
|
||||
state: icon
|
||||
- type: Item
|
||||
sprite: Objects/Weapons/Melee/survival_knife.rsi
|
||||
storedSprite:
|
||||
state: storage
|
||||
sprite: Objects/Weapons/Melee/survival_knife.rsi
|
||||
|
||||
- type: entity
|
||||
name: kukri knife
|
||||
|
||||
@@ -149,6 +149,7 @@
|
||||
- type: GunRequiresWield
|
||||
- type: Item
|
||||
size: Ginormous
|
||||
sprite: Objects/Weapons/Melee/crusher-inhands.rsi
|
||||
- type: DisarmMalus
|
||||
- type: Prying
|
||||
|
||||
@@ -191,3 +192,6 @@
|
||||
- type: Tag
|
||||
tags:
|
||||
- Pickaxe
|
||||
- type: Item
|
||||
size: Ginormous
|
||||
sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
- type: RCDDeconstructable
|
||||
cost: 4
|
||||
delay: 2
|
||||
fx: EffectRCDDeconstruct2
|
||||
fx: EffectRCDDeconstruct2
|
||||
- type: Destructible
|
||||
thresholds:
|
||||
- trigger:
|
||||
@@ -74,7 +74,7 @@
|
||||
mode: SnapgridCenter
|
||||
snap:
|
||||
- Wallmount
|
||||
|
||||
|
||||
- type: entity
|
||||
name: light
|
||||
description: "A light fixture. Draws power and produces light when equipped with a light tube."
|
||||
@@ -400,6 +400,37 @@
|
||||
shader: "unshaded"
|
||||
visible: false
|
||||
- type: Appearance
|
||||
- type: Construction
|
||||
graph: LightFixture
|
||||
node: emergencyLight
|
||||
- type: Destructible
|
||||
thresholds:
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 100
|
||||
behaviors: #excess damage, don't spawn entities.
|
||||
- !type:DoActsBehavior
|
||||
acts: [ "Destruction" ]
|
||||
- !type:PlaySoundBehavior
|
||||
sound:
|
||||
collection: GlassBreak
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 25
|
||||
behaviors:
|
||||
- !type:SpawnEntitiesBehavior
|
||||
spawn:
|
||||
SheetSteel1:
|
||||
min: 1
|
||||
max: 1
|
||||
ShardGlass:
|
||||
min: 1
|
||||
max: 1
|
||||
- !type:DoActsBehavior
|
||||
acts: ["Destruction"]
|
||||
- !type:PlaySoundBehavior
|
||||
sound:
|
||||
collection: GlassBreak
|
||||
placement:
|
||||
mode: SnapgridCenter
|
||||
snap:
|
||||
|
||||
@@ -163,6 +163,7 @@
|
||||
- FoodPlateSmallPlastic
|
||||
- FoodBowlBig
|
||||
- FoodPlateTin
|
||||
- FoodPlateMuffinTin
|
||||
- FoodKebabSkewer
|
||||
- SprayBottle
|
||||
- MopItem
|
||||
|
||||
@@ -47,19 +47,30 @@
|
||||
whitelist:
|
||||
tags:
|
||||
- PlushieSharkGrey
|
||||
sprite: Objects/Fun/sharkplush.rsi
|
||||
mopbucket_carpplush:
|
||||
whitelist:
|
||||
tags:
|
||||
- PlushieCarp
|
||||
sprite: Objects/Specific/Janitorial/janitorial.rsi
|
||||
- type: Transform
|
||||
noRot: true
|
||||
- type: ItemSlots
|
||||
slots:
|
||||
shark_slot:
|
||||
name: mop-bucket-slot-component-slot-name-shark
|
||||
item_slot:
|
||||
name: mop-bucket-slot-component-slot-name-item
|
||||
ejectVerbText: mop-bucket-slot-component-eject-verb
|
||||
whitelist:
|
||||
tags:
|
||||
- PlushieSharkBlue
|
||||
- PlushieSharkPink
|
||||
- PlushieSharkGrey
|
||||
- PlushieCarp
|
||||
components:
|
||||
- Rehydratable
|
||||
priority: 3 # Higher than drinking priority
|
||||
- type: ReactiveContainer
|
||||
solution: bucket
|
||||
container: item_slot
|
||||
- type: Drink
|
||||
solution: bucket
|
||||
- type: Appearance
|
||||
@@ -70,7 +81,7 @@
|
||||
containers:
|
||||
storagebase: !type:Container
|
||||
ents: []
|
||||
shark_slot: !type:ContainerSlot {}
|
||||
item_slot: !type:ContainerSlot {}
|
||||
- type: GuideHelp
|
||||
guides:
|
||||
- Janitorial
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
isCollidableWhenOpen: false
|
||||
openOnMove: false
|
||||
airtight: false
|
||||
capacity: 4 #4 Entities seems like a nice comfy fit for a cardboard box.
|
||||
capacity: 5 #5 entity capacity to fit all of your friends (or teammates on your nuclear operation without reinforcements).
|
||||
- type: ContainerContainer
|
||||
containers:
|
||||
entity_storage: !type:Container
|
||||
|
||||
@@ -64,8 +64,8 @@
|
||||
canEditLabel: true
|
||||
- type: TextScreenVisuals
|
||||
color: FloralWhite
|
||||
textOffset: 0,8
|
||||
timerOffset: 0,8
|
||||
textOffset: 0,6
|
||||
timerOffset: 0,6
|
||||
textLength: 5
|
||||
rows: 1
|
||||
- type: Sprite
|
||||
|
||||
Reference in New Issue
Block a user