Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

This commit is contained in:
Hitlinemoss
2025-07-07 18:09:10 -04:00
617 changed files with 10860 additions and 4884 deletions

View File

@@ -98,3 +98,25 @@
- type: Construction
graph: ClothingBagPet
node: bagPet
- type: entity
parent: Clothing
id: ClothingBackpackHarmpack
name: H.A.R.M.P.A.C.K.
description: Now you can reload, punch, and eat a snack - simultaneously.
components:
- type: Sprite
sprite: Clothing/Back/Specific/harmpack.rsi
state: icon
- type: Item
size: Ginormous
- type: Clothing
slots: BACK
- type: ExtraHandsEquipment
hands:
# middle hands to prevent overlapping inhand sprites
# This can be changed once we have per-hand displacement maps
extra_hand_1:
location: Middle
extra_hand_2:
location: Middle

View File

@@ -229,6 +229,7 @@
- WetFloorSign
- HolosignProjector
- Plunger
- WireBrush
components:
- LightReplacer
- SmokeOnTrigger

View File

@@ -38,7 +38,7 @@
- type: Storage
showVerb: false
grid:
- 0,0,6,3
- 0,0,3,2
maxItemSize: Small
blacklist:
tags:

View File

@@ -579,6 +579,7 @@
- Hardsuit
- WhitelistChameleon
- CorgiWearable
- ScurretWearable
- type: StaticPrice
price: 5000

View File

@@ -62,6 +62,7 @@
- type: Tag
tags:
- CorgiWearable
- ScurretWearable
- MonkeyWearable
- WhitelistChameleon

View File

@@ -182,3 +182,30 @@
price: 75
- type: Tag
tags: [ ]
- type: entity
parent: ClothingShoesBase
id: ClothingShoesBootsJump
name: jump boots
description: High-tech boots that give you the incredible ability to JUMP! With these boots you can jump over lava, chasms and weird chemicals on the floor!
components:
- type: Sprite
sprite: Clothing/Shoes/Boots/jumpboots.rsi
layers:
- state: icon
- type: Clothing
sprite: Clothing/Shoes/Boots/jumpboots.rsi
- type: JumpAbility
jumpDistance: 4
jumpSound: /Audio/Effects/stealthoff.ogg
- type: ActionGrant
actions:
- ActionGravityJump
- type: ItemActionGrant
actions:
- ActionGravityJump
activeIfWorn: true
- type: StaticPrice
price: 220
- type: Tag
tags: []

View File

@@ -172,6 +172,7 @@
- id: ClothingHeadHatFancyCrown
- id: GoldenBikeHorn
- id: ClothingHeadHatCatEars
- id: GoldenPersonalAI
- id: TreasureCoinDiamond
amount: !type:RangeNumberSelector
range: 2, 5

View File

@@ -172,6 +172,8 @@
- id: ClothingUniformJumpsuitFamilyGuy
- id: WristwatchGold
- id: RubberStampGreytide
- id: MysteryLighterBox
- id: GoldenPersonalAI
- type: entity
name: Maint Loot Spawner

View File

@@ -0,0 +1,118 @@
- type: marking
id: VoxScarEyeRight
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_eye_right
- type: marking
id: VoxScarEyeLeft
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_eye_left
- type: marking
id: VoxScarTopSurgeryShort
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_top_surgery_short
- type: marking
id: VoxScarTopSurgeryLong
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_top_surgery_long
- type: marking
id: VoxScarChest
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_chest
- type: marking
id: VoxScarNeck
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_neck
- type: marking
id: VoxScarChestBullets
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_chest_bullets
- type: marking
id: VoxScarStomachBullets
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_stomach_bullets
- type: marking
id: VoxScarFace1
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_face_1
- type: marking
id: VoxScarFace2
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_face_2
- type: marking
id: VoxScarEyeRightSmall
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_eye_right_small
- type: marking
id: VoxScarEyeLeftSmall
bodyPart: Head
markingCategory: Head
speciesRestriction: [Vox]
followSkinColor: true
sprites:
- sprite: Mobs/Customization/vox_scars.rsi
state: vox_scar_eye_left_small

View File

@@ -1464,6 +1464,9 @@
Piercing: 4
groups:
Burn: 3
catchingFailDamage:
types:
Blunt: 1
clumsySound:
path: /Audio/Animals/monkey_scream.ogg
@@ -1643,6 +1646,9 @@
Piercing: 7
groups:
Burn: 3
catchingFailDamage:
types:
Blunt: 1
clumsySound:
path: /Audio/Voice/Reptilian/reptilian_scream.ogg

View File

@@ -57,7 +57,7 @@
- type: MobThresholds
thresholds:
0: Alive
250: Dead
150: Dead
- type: MeleeWeapon
soundHit:
path: "/Audio/Weapons/smash.ogg"
@@ -378,7 +378,7 @@
- type: MobThresholds
thresholds:
0: Alive
75: Dead
45: Dead
- type: MeleeWeapon
angle: 0
animation: WeaponArcBite

View File

@@ -156,6 +156,10 @@
suffix: "Salvage Ruleset"
components:
- type: SalvageMobRestrictions
- type: MobThresholds
thresholds:
0: Alive
30: Dead
- type: entity
name: space carp
@@ -222,7 +226,7 @@
- type: MobThresholds
thresholds:
0: Alive
150: Dead
82: Dead # Might seem random, but this brings up the hits to kill with a crusher mark to 3
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals

View File

@@ -6,6 +6,8 @@
name: revenant
description: A spooky ghostie.
components:
- type: Emag
emagType: All
- type: Input
context: "ghost"
- type: Spectral

View File

@@ -56,7 +56,7 @@
- type: Speech
speechVerb: Wawa
speechSounds: Wawa
allowedEmotes: ['Thump'] # They're 80% tail
allowedEmotes: ["Thump"] # They're 80% tail
- type: TypingIndicator
proto: moth
- type: InteractionPopup
@@ -104,12 +104,46 @@
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: neck
ears:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: ears
eyes:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: eyes
head:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: head
mask:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: mask
back:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: back
- type: Hands
leftHandDisplacement:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: hand
- type: InventorySlots
- type: Food
- type: Hunger
baseDecayRate: 0.05 # They get a lil' hungy
- type: BodyEmotes # Grants them clapping and so on.
soundsId: GeneralBodyEmotes
soundsId: Scurret
- type: Deathgasp
prototype: ScurretDeathgasp # You monster
- type: Tag
tags:
- DoorBumpOpener
@@ -137,6 +171,14 @@
available:
- enum.DamageStateVisualLayers.Base:
scurret: ScurretColors
# They are of a mysterious gender.
- type: Grammar
attributes:
gender: epicene
proper: true
# Strips the name identifier from them, so they're just "Confident Waters" rather than "Confident Waters (123)"
- type: NameIdentifier
group: null
# Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but
# feel free to hook them into random content.
@@ -167,4 +209,4 @@
name: Emotional Support Scurret
id: MobEmotionalSupportScurret
parent: [MobScurret, MobBaseEmotionalSupportScurret]
description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce". This one is here as a temp.
description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnold's Pizza's "loyal workforce". This one is here as a temp.

View File

@@ -34,7 +34,7 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
80: Dead
- type: Stamina
critThreshold: 150
- type: MovementAlwaysTouching
@@ -168,6 +168,10 @@
spawned:
- id: FoodMeat
amount: 1
- type: MobThresholds
thresholds:
0: Alive
60: Dead
- type: entity
id: MobKangarooSpaceSalvage
@@ -194,7 +198,7 @@
- type: MobThresholds
thresholds:
0: Alive
90: Dead
45: Dead
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals
@@ -295,7 +299,7 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
45: Dead
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals

View File

@@ -41,7 +41,7 @@
- type: MobThresholds
thresholds:
0: Alive
15: Dead
5: Dead
- type: Destructible
thresholds:
- trigger:

View File

@@ -458,8 +458,8 @@
# Mob mapped to Xeno Station that can not be ghostrole / pry
- type: entity
name: lone praetorian
description: The last of its kind.
name: '"Dale"'
description: A praetorian left over from the station's initial security sweep. Has a pair of bloodied dog tags engraved with the name "Pvt. Dale" stuck in its maw.
parent: SimpleSpaceMobBase
id: MobXenoLonePraetorianNoGhost
components:

View File

@@ -16,8 +16,8 @@
- NpcFactionMember
# traits
# - LegsParalyzed (you get healed)
- BlackAndWhiteOverlay
- LightweightDrunk
- Monochromacy
- Muted
- Narcolepsy
- Pacified

View File

@@ -239,6 +239,9 @@
Piercing: 4
groups:
Burn: 3
catchingFailDamage:
types:
Blunt: 1
- type: MeleeWeapon
angle: 30
animation: WeaponArcFist

View File

@@ -190,6 +190,7 @@
acts: [ "Destruction" ]
- type: ApcPowerReceiver
powerLoad: 1000
needsPower: false
- type: StationAiCore
- type: StationAiVision
- type: InteractionOutline
@@ -218,7 +219,6 @@
listeningRange: 0
speakerVolume: Speak
unlistedNumber: true
requiresPower: false
- type: Holopad
- type: StationAiWhitelist
- type: UserInterface

View File

@@ -48,8 +48,8 @@
Female: UnisexMoth
Unsexed: UnisexMoth
- type: MovementSpeedModifier
weightlessAcceleration: 1.5 # Move around more easily in space.
weightlessFriction: 1
baseWeightlessAcceleration: 1.5 # Move around more easily in space.
baseWeightlessFriction: 1
baseWeightlessModifier: 1
- type: Flammable
damage:

View File

@@ -277,7 +277,7 @@
prob: 0.05
orGroup: Pizza
- id: KnifePlastic
- type: entity
name: pizza box
parent: FoodBoxPizzaFilled
@@ -372,6 +372,9 @@
contents:
- id: FoodDonkpocket
amount: 6
- id: DonkcoLighter
amount: 1
prob: 0.10
- type: entity
parent: FoodBoxDonkpocket

View File

@@ -29,6 +29,24 @@
- type: Access
groups:
- Command
- type: DoorRemote
- type: entity
parent: [DoorRemoteDefault, BaseCommandContraband]
id: DoorRemoteCustom
name: custom door remote
description: A gadget which can open and bolt doors remotely. This advanced variant does not have built-in access, instead inheriting the ID access of the user.
components:
- type: Sprite
layers:
- state: door_remotebase
- state: door_remotelightscolour
color: "#0077FF"
- state: door_remotescreencolour
color: "#0033EE"
- type: Access
- type: DoorRemote
includeUserAccess: true
- type: entity
parent: [DoorRemoteDefault, BaseCommandContraband]
@@ -155,6 +173,8 @@
color: "#2eba22"
- state: door_remotescreencolour
color: "#22871a"
- type: DoorRemote
includeUserAccess: true
- type: Access
groups:
- AllAccess

View File

@@ -923,6 +923,7 @@
id: CentcomIDCard
penSlot:
startingItem: PenCentcom
priority: -1
whitelist:
tags:
- Write

View File

@@ -456,6 +456,70 @@
- type: NavMapBeacon
defaultText: station-beacon-solars
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsN
suffix: Solars, North
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-N
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsNE
suffix: Solars, Northeast
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-NE
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsE
suffix: Solars, East
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-E
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsSE
suffix: Solars, Southeast
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-SE
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsS
suffix: Solars, South
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-S
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsSW
suffix: Solars, Southwest
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-SW
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsW
suffix: Solars, West
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-W
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsNW
suffix: Solars, Northwest
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-NW
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconGravGen
@@ -706,6 +770,70 @@
- type: NavMapBeacon
defaultText: station-beacon-escape-pod
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodN
suffix: Escape Pod, North
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-N
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodNE
suffix: Escape Pod, Northeast
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-NE
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodE
suffix: Escape Pod, East
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-E
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodSE
suffix: Escape Pod, Southeast
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-SE
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodS
suffix: Escape Pod, South
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-S
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodSW
suffix: Escape Pod, Southwest
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-SW
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodW
suffix: Escape Pod, West
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-W
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodNW
suffix: Escape Pod, Northwest
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-NW
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconVox

View File

@@ -133,3 +133,62 @@
- id: ToyFigurineHamlet
prob: 0.20
orGroup: SpacemenFig
- type: entity
parent: BaseItem
id: MysteryLighterBox
name: Novelty lighter mystery box
suffix: Filled
description: A box of discontinued promotional lighters, many of which have since been declared "contraband".
components:
- type: Sprite
sprite: Objects/Fun/figurines.rsi
layers:
- state: fig_box
- type: SpawnItemsOnUse
items:
- id: MysteryFigureBoxTrash
- id: CybersunFlippo
orGroup: Lighterbox
weight: 0.15
- id: InterdyneFlippo
orGroup: Lighterbox
weight: 0.15
- id: NanotrasenFlippo
orGroup: Lighterbox
weight: 0.25
- id: WaffleCoFlippo
orGroup: Lighterbox
weight: 0.35
- id: HonkCoFlippo
orGroup: Lighterbox
- id: GorlexMatchbox
orGroup: Lighterbox
weight: 0.15
- id: DonkcoLighter
orGroup: Lighterbox
weight: 0.25
- id: SyndicateFlippo
orGroup: Lighterbox
weight: 0.15
- type: entity
parent: MysteryLighterBox
id: UplinkLighterBox
suffix: Uplink
components:
- type: SpawnItemsOnUse
items:
- id: MysteryFigureBoxTrash
- id: CybersunFlippo
orGroup: Lighterbox
- id: InterdyneFlippo
orGroup: Lighterbox
- id: WaffleCoFlippo
orGroup: Lighterbox
- id: GorlexMatchbox
orGroup: Lighterbox
- id: DonkcoLighter
orGroup: Lighterbox
- id: SyndicateFlippo
orGroup: Lighterbox

View File

@@ -130,6 +130,23 @@
- type: StaticPrice
price: 500
- type: entity
parent: PersonalAI
id: GoldenPersonalAI
name: golden personal ai device
description: Your electronic pal who's fun to be with! Special golden edition!
components:
- type: Sprite
sprite: Objects/Fun/pai.rsi
layers:
- state: golden-pai-base
- state: pai-off-overlay
shader: unshaded
map: ["screen"]
- type: Appearance
- type: StaticPrice
price: 5000
- type: entity
parent: PersonalAI
id: PotatoAI

View File

@@ -396,6 +396,20 @@
- type: Sprite
sprite: Objects/Fun/Balls/basketball.rsi
state: icon
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeCircle
radius: 0.25
density: 20
mask:
- ItemMask
restitution: 0.8 # bouncy
friction: 0.2
- type: Catchable
catchChance: 0.8
catchSuccessSound:
path: /Audio/Effects/Footsteps/bounce.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Effects/Footsteps/bounce.ogg
@@ -414,6 +428,23 @@
- type: Sprite
sprite: Objects/Fun/Balls/football.rsi
state: icon
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeCircle
radius: 0.25
density: 20
mask:
- ItemMask
restitution: 0.5 # a little bouncy
friction: 0.2
- type: Catchable
catchChance: 0.8
catchSuccessSound:
path: /Audio/Effects/Footsteps/bounce.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Effects/Footsteps/bounce.ogg
- type: Item
size: Small
sprite: Objects/Fun/Balls/football.rsi
@@ -427,6 +458,21 @@
- type: Sprite
sprite: Objects/Fun/Balls/beach_ball.rsi
state: icon
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeCircle
radius: 0.3
position: "0,-0.2"
density: 20
mask:
- ItemMask
restitution: 0.1 # not bouncy
friction: 0.2
- type: Catchable
catchChance: 0.8
catchSuccessSound:
path: /Audio/Effects/Footsteps/bounce.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Effects/Footsteps/bounce.ogg

View File

@@ -69,7 +69,7 @@
components:
- type: Spellbook
spellActions:
ActionSpawnMagicarpSpell: -1
ActionSpawnMagicarpSpell: null
- type: entity
id: ForceWallSpellbook
@@ -92,7 +92,7 @@
color: gold
- type: Spellbook
spellActions:
ActionForceWall: -1
ActionForceWall: null
- type: entity
id: BlinkBook
@@ -113,7 +113,7 @@
color: gold
- type: Spellbook
spellActions:
ActionBlink: -1
ActionBlink: null
- type: entity
id: SmiteBook
@@ -136,7 +136,7 @@
- state: overlay_blood
- type: Spellbook
spellActions:
ActionSmiteNoReq: -1
ActionSmiteNoReq: null
- type: entity
id: KnockSpellbook
@@ -158,7 +158,7 @@
color: "#98c495"
- type: Spellbook
spellActions:
ActionKnock: -1
ActionKnock: null
- type: entity
id: FireballSpellbook
@@ -182,7 +182,7 @@
shader: unshaded
- type: Spellbook
spellActions:
ActionFireball: -1
ActionFireball: null
- type: entity
id: ScrollRunes
@@ -197,7 +197,7 @@
- state: spell_default
- type: Spellbook
spellActions:
ActionFlashRune: -1
ActionExplosionRune: -1
ActionIgniteRune: -1
ActionStunRune: -1
ActionFlashRune: null
ActionExplosionRune: null
ActionIgniteRune: null
ActionStunRune: null

View File

@@ -352,3 +352,39 @@
- type: Fiber
fiberColor: fibers-white
- type: DnaSubstanceTrace
- type: entity
parent: BaseItem
id: WireBrush
name: wire brush
description: A bristly steel wire brush, perfect for scraping away even the toughest patches of rust.
components:
- type: Sprite
sprite: Objects/Specific/Janitorial/wirebrush.rsi
state: icon
- type: Item
storedSprite:
sprite: Objects/Specific/Janitorial/wirebrush.rsi
state: storage
size: Small
- type: Tag
tags:
- WireBrush
- type: PhysicalComposition
materialComposition:
Steel: 50
Plastic: 50
- type: Tool
qualities:
- Brushing
useSound:
path: /Audio/Items/wirebrushing.ogg
- type: StaticPrice
price: 22
- type: MeleeWeapon
wideAnimationRotation: 45
damage:
types:
Piercing: 3
soundHit:
path: "/Audio/Weapons/bladeslice.ogg"

View File

@@ -257,7 +257,7 @@
damage:
types:
Bloodloss: -0.5 #lowers bloodloss damage
ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
modifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
params:

View File

@@ -20,7 +20,7 @@
activatedSize: Small
- type: ItemToggleHot
- type: Sprite
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
layers:
- state: icon_map
- state: cheap_icon_base
@@ -62,7 +62,7 @@
shader: unshaded
- type: Item
size: Tiny
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
- type: UseDelay
- type: RefillableSolution
solution: Welder
@@ -97,7 +97,7 @@
description: "A dangerously inexpensive plastic lighter, don't burn your thumb!"
components:
- type: Sprite
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
layers:
- state: icon_map
- state: cheap_icon_base
@@ -126,7 +126,7 @@
description: "A rugged metal lighter, lasts quite a while."
components:
- type: Sprite
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
layers:
- state: zippo_icon_base
map: ["base"]
@@ -159,7 +159,7 @@
- type: ItemToggleHot
- type: Item
size: Tiny
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
heldPrefix: zippo
- type: Appearance
- type: GenericVisualizer
@@ -219,7 +219,7 @@
description: "A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever."
components:
- type: Sprite
sprite: Objects/Tools/lighters.rsi
sprite: Objects/Tools/Lighters/lighters.rsi
layers:
- state: zippo_engraved_icon_base
map: ["base"]
@@ -235,3 +235,404 @@
shader: unshaded
- type: StealTarget
stealGroup: FlippoEngravedLighter
- type: entity
abstract: true
parent: BaseItem
id: BaseBrandedLighter
components:
- type: ItemToggle
predictable: false
soundActivate:
path: /Audio/Items/Lighters/zippo_open.ogg
params:
volume: -5
soundDeactivate:
path: /Audio/Items/Lighters/zippo_close.ogg
params:
volume: -5
- type: ItemToggleMeleeWeapon
activatedDamage:
types:
Heat: 1
- type: ItemToggleSize
activatedSize: Small
- type: ItemToggleHot
- type: Item
size: Tiny
- type: Appearance
- type: SolutionContainerManager
solutions:
Welder:
reagents:
- ReagentId: WeldingFuel
Quantity: 12
maxVol: 12
- type: Sprite
layers:
- state: icon
map: [ "base" ]
- state: top
map: [ "top" ]
visible: false
- state: open
map: [ "open" ]
visible: false
- state: flame
map: [ "flame" ]
visible: false
shader: unshaded
- type: GenericVisualizer
visuals:
enum.ToggleableVisuals.Enabled:
flame:
True: { visible: true }
False: { visible: false }
open:
True: { visible: true }
False: { visible: false }
top:
True: { visible: true }
False: { visible: false }
base:
True: { visible: false }
False: { visible: true }
- type: ToggleableVisuals
spriteLayer: lighter_flame
inhandVisuals:
left:
- state: inhand-left-lit
shader: unshaded
right:
- state: inhand-right-lit
shader: unshaded
- type: ItemTogglePointLight
- type: UseDelay
- type: IgnitionSource
ignited: false
- type: entity
parent: [BaseBrandedLighter, BaseSyndicateContraband]
id: SyndicateFlippo
name: Blood-red flippo
description: "A 'Valid' choice in lighters. Contains no copper."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/syndielighter.rsi
- type: Item
sprite: Objects/Tools/Lighters/syndielighter.rsi
- type: Welder
fuelConsumption: 0.005
fuelLitCost: 0.01
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: green
- type: entity
parent: Lighter
id: DiscountDanLighter
name: Discount Dan's lighter
description: "The worst lighter ever produced, lighterburn is inevitable, do not refuel while lit."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/lighters.rsi
layers:
- state: icon_map
- state: discount_icon_base
map: [ "skin" ]
- state: basic_icon_top
- state: lighter_flame
visible: false
shader: unshaded
map: [ "flame" ]
- type: Welder # the single worst lighter invented by mankind
fuelConsumption: 0.2
fuelLitCost: 0.1
tankSafe: false
- type: Item
sprite: Objects/Tools/Lighters/lighters.rsi
- type: ToggleableVisuals
spriteLayer: lighter_flame
inhandVisuals:
left:
- state: inhand-left-flame
shader: unshaded
right:
- state: inhand-right-flame
shader: unshaded
- type: RandomSprite
available:
- skin:
discount_icon_base: ""
- type: PointLight
enabled: false
netsync: false
radius: 1.5
color: yellow
- type: ComponentToggler
components:
- type: DamageOnHolding
damage:
types:
Heat: 2
- type: SolutionContainerManager
solutions:
Welder:
reagents:
- ReagentId: WeldingFuel
Quantity: 3
maxVol: 3
- type: entity
parent: [BaseBrandedLighter, BaseSyndicateContraband]
id: CybersunFlippo
name: CyberSun Flippo
description: "A Sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/cybersun.rsi
- type: Item
sprite: Objects/Tools/Lighters/cybersun.rsi
- type: Welder #
fuelConsumption: 0.005
fuelLitCost: 0.01
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: magenta
- type: entity
parent: [BaseBrandedLighter, BaseSyndicateContraband]
id: InterdyneFlippo
name: Interdyne Flippo
description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/interdyne.rsi
- type: Item
sprite: Objects/Tools/Lighters/interdyne.rsi
- type: Welder #
fuelConsumption: 0.005
fuelLitCost: 0.01
tankSafe: true
- type: ItemToggleMeleeWeapon
activatedDamage:
types:
Radiation: 1
- type: PointLight
enabled: false
netsync: false
radius: 2
color: cyan
- type: entity
parent: [BaseBrandedLighter]
id: NanotrasenFlippo
name: Nanotrasen Flippo
description: "A navy blue luxury flippo, generally handed out to loyal heads of staff instead of a payraise. Fueled with liquid plasma"
components:
- type: Sprite
sprite: Objects/Tools/Lighters/nanotrasen.rsi
- type: Item
sprite: Objects/Tools/Lighters/nanotrasen.rsi
- type: Welder #
fuelConsumption: 0.005
fuelLitCost: 1
fuelReagent: Plasma
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: blue
- type: RefillableSolution
solution: Welder
- type: SolutionContainerManager
solutions:
Welder:
reagents:
- ReagentId: Plasma
Quantity: 10
maxVol: 10
- type: entity
parent: [BaseBrandedLighter, BaseCentcommContraband]
id: CentCommFlippo
name: Gilded CentComm Flippo
description: "An Ornate, jade embossed and gilded flippo frame containing a bluespace powered jet. The latch is secured by a miniature access reader that only responds to CentComm officials. The nicest lighter known to man."
suffix: DO NOT MAP
components:
- type: Sprite
sprite: Objects/Tools/Lighters/centcomm.rsi
- type: Item
sprite: Objects/Tools/Lighters/centcomm.rsi
- type: ItemToggleRequiresLock
requireLocked: false
- type: Welder #
fuelConsumption: 0.0
fuelLitCost: 10
fuelReagent: Plasma
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 4 #Excessively powerful
color: Gold
- type: RefillableSolution
solution: Welder
- type: SolutionContainerManager
solutions:
Welder:
reagents:
- ReagentId: Plasma
Quantity: 999
maxVol: 999
- type: Tool
useSound:
collection: Welder
qualities: Welding
- type: SolutionRegeneration
solution: Welder
generated:
reagents:
- ReagentId: Plasma
Quantity: 0.1
- type: Lock
- type: AccessReader
access: [["CentralCommand"]]
- type: entity
parent: [BaseBrandedLighter, BaseMajorContraband]
id: SpiderclanFlippo
name: Spider-Clan lighter
description: "A high tech jet lighter, engineered to function even in deep space. Runs on a tiny microfusion cell."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/spiderclan.rsi
- type: Item
sprite: Objects/Tools/Lighters/spiderclan.rsi
- type: Welder #
fuelConsumption: 0
fuelLitCost: 0
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: green
- type: entity
parent: [BaseBrandedLighter, BaseSyndicateContraband]
id: WaffleCoFlippo
name: Waffle Co. flippo
description: "A robust mass produced lighter. The Waffle Co. logo turns the spark wheel when pushed up, minimising risk of lighter burns for even the most inept user."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/waffleco.rsi
- type: Item
sprite: Objects/Tools/Lighters/waffleco.rsi
- type: Welder #
fuelConsumption: 0.005
fuelLitCost: 0.05
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: brown
- type: entity
parent: [BaseBrandedLighter]
id: HonkCoFlippo
name: Honk Co. flippo
description: "A slippery gag lighter produced by Honk Co. hidden inside of a real banana peel."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/honkco.rsi
- type: Item
sprite: Objects/Tools/Lighters/honkco.rsi
- type: ComponentToggler
components:
- type: Slippery
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
enabled: false
- type: Physics
bodyType: Dynamic
- type: Fixtures
fixtures:
slips:
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
layer:
- SlipLayer
hard: false
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
density: 10
mask:
- ItemMask
- type: Welder #
fuelConsumption: 0.1
fuelLitCost: 1
tankSafe: true
- type: PointLight
enabled: false
netsync: false
radius: 2
color: yellow
- type: entity
parent: [BaseBrandedLighter]
id: DonkcoLighter
name: Donk Co. flippo
description: "The flippo of choice for the seasoned traitor. A Breaded novelty lighter made by Donk Co. Somehow edible while lit."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/donkco.rsi
- type: Item
sprite: Objects/Tools/Lighters/donkco.rsi
- type: Welder #
fuelConsumption: 0.02
fuelLitCost: 0.1
tankSafe: true
- type: Tag
tags:
- DonkPocket
- Meat
- type: SolutionContainerManager
solutions:
Welder:
reagents:
- ReagentId: WeldingFuel
Quantity: 12
maxVol: 12
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Omnizine
Quantity: 10
- type: FlavorProfile
flavors:
- bread
- meaty
- cheap
- type: ComponentToggler
components:
- type: Food
- type: PointLight
enabled: false
netsync: false
radius: 2
color: orange

View File

@@ -108,3 +108,43 @@
tags:
- Trash
- type: SpaceGarbage
- type: entity
parent: [Matchbox, BaseSyndicateContraband]
id: GorlexMatchbox
name: Gorlex match box
description: "A pneumatic match box styled after the Gorlex Marauders' equipment. Contains 24 matches."
components:
- type: Sprite
sprite: Objects/Tools/Lighters/gorlex.rsi
- type: Item
sprite: Objects/Tools/Lighters/gorlex.rsi
- type: Storage
grid:
- 0,0,11,1
- type: StorageFill
contents:
- id: GorlexMatchstick
amount: 24
- type: Matchbox
- type: entity
name: match stick
parent: [Matchstick, BaseSyndicateContraband]
id: GorlexMatchstick
description: A military grade match stick, used for lighting fine smokables and noncombatants alike.
components:
- type: Sprite
sprite: Objects/Tools/Lighters/gorlexmatch.rsi
layers:
- state: match_unlit
- type: Item
sprite: Objects/Tools/Lighters/gorlexmatch.rsi
heldPrefix: unlit
size: Tiny
- type: PointLight
enabled: false
radius: 3
color: green
- type: Matchstick
duration: 30

View File

@@ -496,7 +496,7 @@
impactEffect: BulletImpactEffectKinetic
damage:
types:
Blunt: 25
Blunt: 15
Structural: 30
# Short lifespan
- type: TimedDespawn
@@ -553,8 +553,8 @@
- MobState
damage:
types:
Blunt: 20
Slash: 5
Blunt: 18
Slash: 4
- type: Projectile
impactEffect: BulletImpactEffectKinetic
damage:
@@ -564,6 +564,21 @@
- type: TimedDespawn
lifetime: 0.4
# Deals less damage, glaive has better HP recovery
- type: entity
id: BulletChargeGlaive
name: leech bolt
parent: BulletCharge
components:
- type: DamageMarkerOnCollide
whitelist:
components:
- MobState
damage:
types:
Blunt: 1
Slash: 5
- type: entity
parent: BaseBullet
id: AnomalousParticleDelta

View File

@@ -54,7 +54,7 @@
name: Hristov
parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
id: WeaponSniperHristov
description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

View File

@@ -296,12 +296,11 @@
Slash: 12
Heat: 12
Structural: 15
# Disabled until the wield active sfx no longer stacks
#- type: ItemToggleActiveSound
# activeSound:
# path: /Audio/Weapons/ebladehum.ogg
# params:
# volume: 3
- type: ItemToggleActiveSound
activeSound:
path: /Audio/Weapons/ebladehum.ogg
params:
volume: 3
- type: ComponentToggler
components:
- type: Sharp
@@ -387,17 +386,6 @@
reflectProb: 1.0
spread: 75
# Nukie variant, reduced reflection rate.
- type: entity
parent: HyperEutacticBlade
id: HyperEutaticBlade
name: hypereutatic-blade
description: Often mistaken for the Hypereutactic Blade. This mass produced, off-brand, knockoff gets the same job done but with less reflection.
components:
- type: Reflect
reflectProb: 0.75
spread: 75
# Borgs
- type: entity
suffix: One-Handed, For Borgs

View File

@@ -106,6 +106,7 @@
enabled: false
radius: 4
# Very high burst damage if you land a mark, while also providing a small amount of healing.
- type: entity
parent: [BaseWeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusher
@@ -132,7 +133,7 @@
- type: LeechOnMarker
leech:
groups:
Brute: -10
Brute: -6
- type: Gun
soundGunshot: /Audio/Weapons/plasma_cutter.ogg
fireRate: 1
@@ -146,25 +147,26 @@
capacity: 1
count: 1
- type: MeleeWeapon
attackRate: 1.5
attackRate: 1
wideAnimationRotation: -135
damage:
types:
Blunt: 10
Slash: 5
Blunt: 6
Slash: 4
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2.5
Slash: 2.5
Blunt: 6
Slash: 2
Structural: 30
- type: GunRequiresWield
- type: DisarmMalus
- type: Prying
# No mark ability in exchange for wideswing, autoattack, and being one-handed
- type: entity
parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherDagger
@@ -194,12 +196,12 @@
- type: ThrowingAngle
angle: 225
# Like a crusher... but better
# Less mark damage in exchange for more healing. Also has a better ratio of blunt to slash damage, but less structural.
- type: entity
parent: [ WeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherGlaive
name: crusher glaive
description: An early design of the proto-kinetic accelerator, in glaive form.
description: An early design of the proto-kinetic accelerator, in glaive form. Provides better healing in exchange for less charged damage.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/crusher_glaive.rsi
@@ -215,11 +217,27 @@
- suitStorage
- type: UseDelay
delay: 1.9
- type: BasicEntityAmmoProvider
proto: BulletChargeGlaive
capacity: 1
count: 1
- type: LeechOnMarker
leech:
groups:
Brute: -21
- type: MeleeWeapon
- type: Tag
tags:
- Pickaxe
- type: MeleeWeapon
attackRate: 1
wideAnimationRotation: -135
damage:
types:
Blunt: 3
Slash: 7
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2
Slash: 6
Structural: 20

View File

@@ -643,6 +643,9 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepFloor
- type: Construction
graph: Table
node: TableXeno
# Fancy tables

View File

@@ -117,7 +117,7 @@
- Cryogenics
- type: entity
parent: BaseStructure
parent: BaseMachine
id: CryoPodDestroyed
name: destroyed cryo pod
description: A cryo pod that has seen better days. It's entirely inoperable; not good for anything but scrap.
@@ -128,22 +128,17 @@
noRot: true
offset: 0, 0.5
state: pod-cracked
- type: Transform
noRot: true
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.90"
bounds: "-0.5,-0.5,0.5,0.5"
density: 200
mask:
- MachineMask
layer:
- MachineLayer
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic
- type: Destructible
thresholds:
- trigger:

View File

@@ -18,8 +18,13 @@
- state: icon
- state: unlit
shader: unshaded
map: ["enum.StasisBedVisualLayers.IsOn"]
- type: StasisBedVisuals
map: ["unlit"]
- type: GenericVisualizer
visuals:
enum.PowerDeviceVisuals.Powered:
unlit:
True: { visible: true }
False: { visible: false }
- type: Appearance
- type: ApcPowerReceiver
powerLoad: 1000

View File

@@ -155,6 +155,62 @@
guides:
- Pumps
- type: entity
parent: GasBinaryBase
id: GasPressureRegulator
name: inlet pressure regulator
description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
placement:
mode: SnapgridCenter
components:
- type: Rotatable
- type: Transform
noRot: false
- type: SubFloorHide
visibleLayers:
- enum.SubfloorLayers.FirstLayer
- type: Sprite
sprite: Structures/Piping/Atmospherics/pump.rsi
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeStraight
map: [ "enum.PipeVisualLayers.Pipe" ]
- state: pumpPressureRegulator
map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
- type: Appearance
- type: GenericVisualizer
visuals:
enum.PressureRegulatorVisuals.State:
enabled:
True: { state: pumpPressureRegulatorOn }
False: { state: pumpPressureRegulator }
- type: PipeColorVisuals
- type: GasPressureRegulator
enabled: false
threshold: 4500
- type: Construction
graph: GasBinary
node: pressureregulator
- type: ActivatableUI
key: enum.GasPressureRegulatorUiKey.Key
blockSpectators: true
- type: ActivatableUIRequiresAnchor
- type: UserInterface
interfaces:
enum.GasPressureRegulatorUiKey.Key:
type: GasPressureRegulatorBoundUserInterface
- type: AmbientSound
enabled: false
volume: -9
range: 5
sound:
path: /Audio/Ambience/Objects/gas_hiss.ogg
- type: AtmosMonitoringConsoleDevice
navMapBlip: GasFlowRegulator
- type: GuideHelp
guides:
- PressureRegulator
- type: entity
parent: GasBinaryBase
id: GasPassiveGate