Bodysystem and damagesystem rework (#1544)

* Things and stuff with grids, unfinished w/ code debug changes.

* Updated submodule and also lost some progress cause I fucked it up xd

* First unfinished draft of the BodySystem. Doesn't compile.

* More changes to make it compile, but still just a framework. Doesn't do anything at the moment.

* Many cleanup changes.

* Revert "Merge branch 'master' of https://github.com/GlassEclipse/space-station-14 into body_system"

This reverts commit ddd4aebbc76cf2a0b7b102f72b93d55a0816c88c, reversing
changes made to 12d0dd752706bdda8879393bd8191a1199a0c978.

* Commit human.yml

* Updated a lot of things to be more classy, more progress overall, etc. etc.

* Latest update with many changes

* Minor changes

* Fixed Travis build bug

* Adds first draft of Body Scanner console, apparently I also forgot to tie Mechanisms into body parts so now a heart just sits in the Torso like a good boy :)

* Commit rest of stuff

* Latest changes

* Latest changes again

* 14 naked cowboys

* Yay!

* Latest changes (probably doesnt compile)

* Surgery!!!!!!!!!~1116y

* Cleaned some stuff up

* More cleanup

* Refactoring of code. Basic surgery path now done.

* Removed readme, has been added to HackMD

* Fixes typo (and thus test errors)

* WIP changes, committing so I can pull latest master changes

* Still working on that god awful merge

* Latest changes

* Latest changes!!

* Beginning of refactor to BoundUserInterface

* Surgery!

* Latest changes - fixes pr change requests and random fixes

* oops

* Fixes bodypart recursion

* Beginning of work on revamping the damage system.

* More latest changes

* Latest changes

* Finished merge

* Commit before removing old healthcode

* Almost done with removing speciescomponent...

* It compiles!!!

* yahoo more work

* Fixes to make it work

* Merge conflict fixes

* Deleting species visualizer was a mistake

* IDE warnings are VERBOTEN

* makes the server not kill itself on startup, some cleanup (#1)

* Namespaces, comments and exception fixes

* Fix conveyor and conveyor switch serialization

SS14 in reactive when

* Move damage, acts and body to shared

Damage cleanup
Comment cleanup

* Rename SpeciesComponent to RotationComponent and cleanup

Damage cleanup
Comment cleanup

* Fix nullable warnings

* Address old reviews

Fix off welder suicide damage type, deathmatch and suspicion

* Fix new test fail with units being able to accept items when unpowered

* Remove RotationComponent, change references to IBodyManagerComponent

* Add a bloodstream to humans

* More cleanups

* Add body conduits, connections, connectors substances and valves

* Revert "Add body conduits, connections, connectors substances and valves"

This reverts commit 9ab0b50e6b15fe98852d7b0836c0cdbf4bd76d20.

* Implement the heart mechanism behavior with the circulatory network

* Added network property to mechanism behaviors

* Changed human organ sprites and added missing ones

* Fix tests

* Add individual body part sprite rendering

* Fix error where dropped mechanisms are not initialized

* Implement client/server body damage

* Make DamageContainer take care of raising events

* Reimplement medical scanner with the new body system

* Improve the medical scanner ui

* Merge conflict fixes

* Fix crash when colliding with something

* Fix microwave suicides and eyes sprite rendering

* Fix nullable reference error

* Fix up surgery client side

* Fix missing using from merge conflict

* Add breathing

*inhale

* Merge conflict fixes

* Fix accumulatedframetime being reset to 0 instead of decreased by the threshold

https://github.com/space-wizards/space-station-14/pull/1617

* Use and add to the new AtmosHelpers

* Fix feet

* Add proper coloring to dropped body parts

* Fix Urist's lungs being too strong

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes

Co-authored-by: GlassEclipse <tsymall5@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2020-08-17 01:42:42 +02:00
committed by GitHub
parent c17dd97383
commit b051261485
276 changed files with 7853 additions and 4737 deletions

View File

@@ -95,6 +95,7 @@
- tubeconnections
- tilewalls
- events
- destroymechanism
CanViewVar: true
CanAdminPlace: true
@@ -184,6 +185,7 @@
- setatmostemp
- tilewalls
- events
- destroymechanism
CanViewVar: true
CanAdminPlace: true
CanScript: true

View File

@@ -4,32 +4,33 @@
name: "human heart (debug)"
components:
- type: Sprite
sprite: Mobs/Parts/organs_human.rsi
state: heart_human
sprite: Mobs/Species/Human/organs.rsi
state: heart-on
- type: Icon
sprite: Mobs/Parts/organs_human.rsi
state: heart_human
sprite: Mobs/Species/Human/organs.rsi
state: heart-on
- type: DroppedMechanism
debugLoadMechanismData: mechanism.Heart.BasicHuman
behaviors:
- Content.Server.Body.Mechanisms.Behaviors.HeartBehavior
- type: mechanism
id: mechanism.Brain.BasicHuman
name: "human brain"
rsiPath: Mobs/Parts/organs_human.rsi
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "brain_human"
description: "The source of incredible, unending intelligence. Honk."
durability: 10
size: 1
compatibility: Biological
behaviors:
- Content.Server.Body.Mechanisms.Behaviors.BrainBehavior
- type: mechanism
id: mechanism.Eyes.BasicHuman
name: "human eyes"
rsiPath: Mobs/Parts/organs_human.rsi
rsiState: "eyes_human"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "eyeballs"
description: "Ocular organ capable of turning light into a colorful visual."
durability: 10
size: 1
@@ -38,28 +39,44 @@
- type: mechanism
id: mechanism.Heart.BasicHuman
name: "human heart"
rsiPath: Mobs/Parts/organs_human.rsi
rsiState: "heart_human"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "heart-on"
description: "Pumps blood throughout a body. Essential for any entity with blood."
durability: 10
size: 1
compatibility: Biological
behaviors:
- Content.Server.Body.Mechanisms.Behaviors.HeartBehavior
- type: mechanism
id: mechanism.Lungs.BasicHuman
name: "human lungs"
rsiPath: Mobs/Parts/organs_human.rsi
rsiState: "lungs_human"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "lungs"
description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
durability: 13
size: 1
compatibility: Biological
behaviors:
- Content.Server.Body.Mechanisms.Behaviors.LungBehavior
- type: mechanism
id: mechanism.Stomach.BasicHuman
name: "human stomach"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "stomach"
description: "Gross. This is hard to stomach."
durability: 13
size: 1
compatibility: Biological
behaviors:
- Content.Server.Body.Mechanisms.Behaviors.StomachBehavior
- type: mechanism
id: mechanism.Liver.BasicHuman
name: "human liver"
rsiPath: Mobs/Parts/organs_human.rsi
rsiState: "liver_human"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "liver"
description: "Filters impurities out of a bloodstream and provides other important functionality to a human."
durability: 15
size: 1
@@ -68,8 +85,8 @@
- type: mechanism
id: mechanism.Kidneys.BasicHuman
name: "human kidneys"
rsiPath: Mobs/Parts/organs_human.rsi
rsiState: "kidneys_human"
rsiPath: Mobs/Species/Human/organs.rsi
rsiState: "kidneys"
description: "Filters toxins out of a bloodstream."
durability: 20
size: 1

View File

@@ -6,9 +6,8 @@
size: 4
compatibility: Universal
implantableParts:
- Arm
- Hand
- Arm
- Hand
- type: mechanism
id: mechanism.HonkModule
@@ -17,4 +16,3 @@
durability: 50
size: 3
compatibility: Universal

View File

@@ -0,0 +1,192 @@
- type: bodyPart
id: bodyPart.Torso.BasicHuman
name: "human torso"
plural: "human torsos"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: "torso_m"
partType: Torso
durability: 100
destroyThreshold: -150
size: 14
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
mechanisms:
- mechanism.Heart.BasicHuman
- mechanism.Lungs.BasicHuman
- mechanism.Stomach.BasicHuman
- mechanism.Liver.BasicHuman
- mechanism.Kidneys.BasicHuman
- type: bodyPart
id: bodyPart.Head.BasicHuman
name: "human head"
plural: "human heads"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: head_m
partType: Head
durability: 50
destroyThreshold: -120
size: 7
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
mechanisms:
- mechanism.Brain.BasicHuman
- mechanism.Eyes.BasicHuman
- type: bodyPart
id: bodyPart.LArm.BasicHuman
name: "left human arm"
plural: "left human arms"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: l_arm
partType: Arm
durability: 40
destroyThreshold: -80
size: 5
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:ExtensionProperty
active: true
reachDistance: 2.4
- type: bodyPart
id: bodyPart.RArm.BasicHuman
name: "right human arm"
plural: "right human arms"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: r_arm
partType: Arm
durability: 40
destroyThreshold: -80
size: 5
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:ExtensionProperty
active: true
reachDistance: 2.4
- type: bodyPart
id: bodyPart.LHand.BasicHuman
name: "left human hand"
plural: "left human hands"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: l_hand
partType: Hand
durability: 30
destroyThreshold: -60
size: 3
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:GraspProperty
active: true
- type: bodyPart
id: bodyPart.RHand.BasicHuman
name: "right human hand"
plural: "right human hands"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: r_hand
partType: Hand
durability: 30
destroyThreshold: -60
size: 3
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:GraspProperty
active: true
- type: bodyPart
id: bodyPart.LLeg.BasicHuman
name: "left human leg"
plural: "left human legs"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: l_leg
partType: Leg
durability: 45
destroyThreshold: -90
size: 6
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:ExtensionProperty
active: true
reachDistance: 3.0
- !type:LegProperty
active: true
speed: 2.6
- type: bodyPart
id: bodyPart.RLeg.BasicHuman
name: "right human leg"
plural: "right human legs"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: r_leg
partType: Leg
durability: 45
destroyThreshold: -90
size: 6
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:ExtensionProperty
active: true
reachDistance: 3.0
- !type:LegProperty
active: true
speed: 2.6
- type: bodyPart
id: bodyPart.LFoot.BasicHuman
name: "left human foot"
plural: "left human feet"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: l_foot
partType: Foot
durability: 30
destroyThreshold: -60
size: 2
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:FootProperty
active: true
- type: bodyPart
id: bodyPart.RFoot.BasicHuman
name: "right human foot"
plural: "right human feet"
rsiPath: Mobs/Species/Human/parts.rsi
rsiState: r_foot
partType: Foot
durability: 30
destroyThreshold: -60
size: 2
compatibility: Biological
damageContainer: biologicalDamageContainer
resistances: defaultResistances
surgeryDataType: Content.Server.Body.Surgery.BiologicalSurgeryData
properties:
- !type:FootProperty
active: true

View File

@@ -0,0 +1,14 @@
- type: bodyPreset
name: "basic human"
id: bodyPreset.BasicHuman
partIDs:
head: bodyPart.Head.BasicHuman
torso: bodyPart.Torso.BasicHuman
right arm: bodyPart.RArm.BasicHuman
left arm: bodyPart.LArm.BasicHuman
right hand: bodyPart.RHand.BasicHuman
left hand: bodyPart.LHand.BasicHuman
right leg: bodyPart.RLeg.BasicHuman
left leg: bodyPart.LLeg.BasicHuman
right foot: bodyPart.RFoot.BasicHuman
left foot: bodyPart.LFoot.BasicHuman

View File

@@ -0,0 +1,44 @@
- type: bodyTemplate
id: bodyTemplate.Humanoid
name: "humanoid"
centerSlot: "torso"
slots:
head: Head
torso: Torso
left arm: Arm
left hand: Hand
right arm: Arm
right hand: Hand
left leg: Leg
left foot: Foot
right leg: Leg
right foot: Foot
connections:
head:
- torso
torso:
- left arm
- right arm
- left leg
- right leg
left arm:
- left hand
right arm:
- right hand
left leg:
- left foot
right leg:
- right foot
layers:
head: "enum.HumanoidVisualLayers.Head"
torso: "enum.HumanoidVisualLayers.Chest"
left arm: "enum.HumanoidVisualLayers.LArm"
left hand: "enum.HumanoidVisualLayers.LHand"
right arm: "enum.HumanoidVisualLayers.RArm"
right hand: "enum.HumanoidVisualLayers.RHand"
left leg: "enum.HumanoidVisualLayers.LLeg"
left foot: "enum.HumanoidVisualLayers.LFoot"
right leg: "enum.HumanoidVisualLayers.RLeg"
right foot: "enum.HumanoidVisualLayers.RFoot"
mechanismLayers:
mechanism.Eyes.BasicHuman: "enum.HumanoidVisualLayers.Eyes"

View File

@@ -15,19 +15,17 @@
right hind paw: Foot
connections:
head:
- torso
- torso
torso:
- left front leg
- right front leg
- left hind leg
- right hind paw
- left front leg
- right front leg
- left hind leg
- right hind paw
left front leg:
- left front paw
- left front paw
right front leg:
- right front paw
- right front paw
left hind leg:
- left hind paw
- left hind paw
right hind leg:
- right hind paw
- right hind paw

View File

@@ -1,95 +0,0 @@
- type: bodyPart
id: bodyPart.Torso.BasicHuman
name: "human torso"
plural: "human torsos"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: "torso_m"
partType: Torso
durability: 100
destroyThreshold: -150
resistance: 4.0
size: 14
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType
mechanisms:
- mechanism.Heart.BasicHuman
- mechanism.Lungs.BasicHuman
- mechanism.Liver.BasicHuman
- mechanism.Kidneys.BasicHuman
- type: bodyPart
id: bodyPart.Head.BasicHuman
name: "human head"
plural: "human heads"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: head_m
partType: Head
durability: 50
destroyThreshold: -120
resistance: 7.0
size: 7
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType
mechanisms:
- mechanism.Brain.BasicHuman
- mechanism.Eyes.BasicHuman
- type: bodyPart
id: bodyPart.Arm.BasicHuman
name: "human arm"
plural: "human arms"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: r_arm
partType: Arm
durability: 40
destroyThreshold: -80
resistance: 3.0
size: 5
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType
properties:
- !type:ArmLength
length: 2.4
- type: bodyPart
id: bodyPart.Hand.BasicHuman
name: "human hand"
plural: "human hands"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: r_hand
partType: Hand
durability: 30
destroyThreshold: -60
resistance: 2.0
size: 3
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType
- type: bodyPart
id: bodyPart.Leg.BasicHuman
name: "human leg"
plural: "human legs"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: r_leg
partType: Leg
durability: 45
destroyThreshold: -90
resistance: 2.0
size: 6
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType
- type: bodyPart
id: bodyPart.Foot.BasicHuman
name: "human foot"
plural: "human feet"
rsiPath: Mobs/Parts/body_human.rsi
rsiState: r_foot
partType: Foot
durability: 30
destroyThreshold: -60
resistance: 3.0
size: 2
compatibility: Biological
surgeryDataType: BiologicalsurgeryDataType

View File

@@ -1,15 +0,0 @@
- type: bodyPreset
name: "basic human"
id: bodyPreset.BasicHuman
partIDs:
head: bodyPart.Head.BasicHuman
torso: bodyPart.Torso.BasicHuman
right arm: bodyPart.Arm.BasicHuman
left arm: bodyPart.Arm.BasicHuman
right hand: bodyPart.Hand.BasicHuman
left hand: bodyPart.Hand.BasicHuman
right leg: bodyPart.Leg.BasicHuman
left leg: bodyPart.Leg.BasicHuman
right foot: bodyPart.Foot.BasicHuman
left foot: bodyPart.Foot.BasicHuman

View File

@@ -1,33 +0,0 @@
- type: bodyTemplate
id: bodyTemplate.Humanoid
name: "humanoid"
centerSlot: "torso"
slots:
head: Head
torso: Torso
left arm: Arm
left hand: Hand
right arm: Arm
right hand: Hand
left leg: Leg
left foot: Foot
right leg: Leg
right foot: Foot
connections:
head:
- torso
torso:
- left arm
- right arm
- left leg
- right leg
left arm:
- left hand
right arm:
- right hand
left leg:
- left foot
right leg:
- right foot

View File

@@ -0,0 +1,13 @@
- type: damageContainer
id: biologicalDamageContainer
activeDamageClasses:
- Brute
- Burn
- Toxin
- Airloss
- type: damageContainer
id: metallicDamageContainer
activeDamageClasses:
- Brute
- Burn

View File

@@ -0,0 +1,56 @@
- type: resistanceSet
id: defaultResistances
coefficients:
Blunt: 1.0
Piercing: 1.0
Heat: 1.0
Disintegration: 1.0
Cellular: 1.0
DNA: 1.0
Asphyxiation: 1.0
flatReductions:
Blunt: 0
Piercing: 0
Heat: 0
Disintegration: 0
Cellular: 0
DNA: 0
Asphyxiation: 0
- type: resistanceSet
id: dionaResistances
coefficients:
Blunt: 0.5
Piercing: 0.7
Heat: 1.8
Disintegration: 1.8
Cellular: 1.0
DNA: 1.0
Asphyxiation: 1.0
flatReductions:
Blunt: 0
Piercing: 0
Heat: 0
Disintegration: 0
Cellular: 0
DNA: 0
Asphyxiation: 0
- type: resistanceSet
id: metallicResistances
coefficients:
Blunt: 0.7
Piercing: 0.7
Heat: 1.0
Disintegration: 1.0
Cellular: 0.0
DNA: 0.0
Asphyxiation: 0.0
flatReductions:
Blunt: 0
Piercing: 0
Heat: 0
Disintegration: 0
Cellular: 0
DNA: 0
Asphyxiation: 0

View File

@@ -17,9 +17,8 @@
- VaultImpassable
- type: SnapGrid
offset: Center
- type: Damageable
- type: Destructible
thresholdvalue: 50
maxHP: 50
- type: UserInterface
interfaces:
- key: enum.InstrumentUiKey.Key

View File

@@ -15,7 +15,7 @@
- type: InteractionOutline
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: Physics
- type: ShuttleController
- type: Strap

View File

@@ -22,10 +22,9 @@
- type: IconSmooth
key: generic
base: solid_
- type: Damageable
- type: Destructible
thresholdvalue: 50
spawnondestroy: SteelSheet1
maxHP: 50
spawnOnDestroy: SteelSheet1
# TODO: drop wood instead of steel when destroyed when that's added
- type: entity
@@ -39,7 +38,6 @@
- type: IconSmooth
key: wood
base: wood_
- type: Damageable
- type: Destructible
thresholdvalue: 50
spawnondestroy: SteelSheet1
maxHP: 50
spawnOnDestroy: SteelSheet1

View File

@@ -28,9 +28,8 @@
- VaultImpassable
- type: Clickable
- type: InteractionOutline
- type: Damageable
- type: Breakable
threshold: 150
maxHP: 150
- type: GravityGenerator
- type: UserInterface
interfaces:

View File

@@ -34,9 +34,8 @@
- type: SnapGrid
offset: Center
- type: MedicalScanner
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: Appearance
visuals:
- type: MedicalScannerVisualizer

View File

@@ -50,9 +50,8 @@
nodeGroupID: HVPower
- type: PowerConsumer
drawRate: 50
- type: Damageable
- type: Breakable
thresholdvalue: 100
maxHP: 100
- type: Anchorable
- type: entity
@@ -290,9 +289,8 @@
supply: 1500
- type: SnapGrid
offset: Center
- type: Damageable
- type: Breakable
thresholdvalue: 100
maxHP: 100
#Depriciated, to be removed from maps

View File

@@ -30,8 +30,8 @@
- SmallImpassable
- type: SnapGrid
offset: Center
- type: Damageable
- type: Breakable
maxHP: 50
- type: UserInterface
interfaces:
- key: enum.VendingMachineUiKey.Key

View File

@@ -41,9 +41,8 @@
anchored: false
- type: EntityStorage
- type: PlaceableSurface
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: Appearance
visuals:
- type: StorageVisualizer

View File

@@ -24,10 +24,9 @@
IsScrapingFloor: true
- type: Physics
mass: 15
anchored: false
- type: Damageable
Anchored: false
- type: Destructible
thresholdvalue: 10
maxHP: 10
- type: Solution
maxVol: 1500
caps: 2

View File

@@ -36,9 +36,8 @@
capacity: 60
CanWeldShut: false
- type: PlaceableSurface
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: Appearance
visuals:
- type: StorageVisualizer

View File

@@ -16,9 +16,8 @@
shapes:
- !type:PhysShapeAabb
layer: [MobMask]
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: Occluder
sizeX: 32
sizeY: 32

View File

@@ -14,10 +14,9 @@
shapes:
- !type:PhysShapeAabb
layer: [MobMask, Opaque]
- type: Damageable
- type: Destructible
thresholdvalue: 50
spawnondestroy: SteelSheet1
maxHP: 50
spawnOnDestroy: SteelSheet1
- type: SnapGrid
offset: Edge

View File

@@ -24,9 +24,8 @@
layer:
- VaultImpassable
- SmallImpassable
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: SnapGrid
offset: Center
- type: LowWall

View File

@@ -25,10 +25,9 @@
- MobImpassable
- VaultImpassable
- SmallImpassable
- type: Damageable
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
maxHP: 100
spawnOnDestroy: Girder
- type: Occluder
sizeX: 32
sizeY: 32
@@ -50,8 +49,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/brick.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: brick
@@ -66,8 +65,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/clock.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: clock
@@ -82,8 +81,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/clown.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: clown
@@ -99,8 +98,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/cult.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: cult
@@ -115,8 +114,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/debug.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: debug
@@ -131,8 +130,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/diamond.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: diamond
@@ -148,8 +147,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/gold.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: gold
@@ -164,8 +163,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/ice.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: ice
@@ -180,8 +179,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/metal.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: metal
@@ -196,8 +195,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/plasma.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: plasma
@@ -212,8 +211,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/plastic.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: plastic
@@ -230,8 +229,8 @@
sprite: Constructible/Structures/Walls/solid.rsi
state: rgeneric
- type: Destructible
thresholdvalue: 300
spawnondestroy: Girder
health: 300
spawnOnDestroy: Girder
- type: ReinforcedWall
key: walls
base: solid
@@ -248,8 +247,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/riveted.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: riveted
@@ -264,8 +263,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/sandstone.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: sandstone
@@ -280,8 +279,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/silver.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: silver
@@ -297,9 +296,9 @@
- type: Icon
sprite: Constructible/Structures/Walls/solid.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
destroysound: /Audio/Effects/metalbreak.ogg
health: 100
spawnOnDestroy: Girder
destroySound: /Audio/effects/metalbreak.ogg
- type: IconSmooth
key: walls
base: solid
@@ -314,8 +313,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/uranium.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: uranium
@@ -330,8 +329,8 @@
- type: Icon
sprite: Constructible/Structures/Walls/wood.rsi
- type: Destructible
thresholdvalue: 100
spawnondestroy: Girder
health: 100
spawnOnDestroy: Girder
- type: IconSmooth
key: walls
base: wood

View File

@@ -27,9 +27,8 @@
- MobImpassable
- VaultImpassable
- SmallImpassable
- type: Damageable
- type: Destructible
thresholdvalue: 100
maxHP: 100
- type: SnapGrid
offset: Center
- type: Airtight

View File

@@ -34,14 +34,11 @@
layer:
- Opaque
- MobImpassable
- type: Species
Template: Human
HeatResistance: 323
- type: BodyManager
BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman
baseTemplate: bodyTemplate.Humanoid
basePreset: bodyPreset.BasicHuman
- type: MobStateManager
- type: HeatResistance
- type: Damageable
- type: CombatMode
- type: Teleportable
- type: CharacterInfo

View File

@@ -36,14 +36,12 @@
layer:
- Opaque
- MobImpassable
- type: Species
Template: Human
HeatResistance: 323
- type: BodyManager
BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman
baseTemplate: bodyTemplate.Humanoid
basePreset: bodyPreset.BasicHuman
- type: Metabolism
- type: MobStateManager
- type: HeatResistance
- type: Damageable
- type: CombatMode
- type: Teleportable
- type: FootstepSound

View File

@@ -28,7 +28,7 @@
digestionDelay: 20
# StatusEffects
- type: Stunnable
# EndStatusEffects
# Other
- type: Inventory
- type: Clickable
- type: InteractionOutline
@@ -38,34 +38,35 @@
layers:
- map: ["enum.HumanoidVisualLayers.Chest"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_chest_m
sprite: Mobs/Species/Human/parts.rsi
state: torso_m
- map: ["enum.HumanoidVisualLayers.Head"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_head_m
- sprite: Mobs/Customization/eyes.rsi
state: eyes
sprite: Mobs/Species/Human/parts.rsi
state: head_m
- map: ["enum.HumanoidVisualLayers.Eyes"]
color: "#008800"
sprite: Mobs/Customization/eyes.rsi
state: eyes
- map: ["enum.HumanoidVisualLayers.RArm"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_arm
sprite: Mobs/Species/Human/parts.rsi
state: r_arm
- map: ["enum.HumanoidVisualLayers.LArm"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_arm
sprite: Mobs/Species/Human/parts.rsi
state: l_arm
- map: ["enum.HumanoidVisualLayers.RLeg"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_leg
sprite: Mobs/Species/Human/parts.rsi
state: r_leg
- map: ["enum.HumanoidVisualLayers.LLeg"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_leg
sprite: Mobs/Species/Human/parts.rsi
state: l_leg
- shader: StencilClear
sprite: Mobs/Species/human.rsi
state: human_l_leg
sprite: Mobs/Species/Human/parts.rsi
state: l_leg
- shader: StencilMask
map: ["enum.HumanoidVisualLayers.StencilMask"]
sprite: Mobs/Customization/masking_helpers.rsi
@@ -75,12 +76,20 @@
shader: StencilDraw
- map: ["enum.HumanoidVisualLayers.LHand"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_hand
sprite: Mobs/Species/Human/parts.rsi
state: l_hand
- map: ["enum.HumanoidVisualLayers.RHand"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_hand
sprite: Mobs/Species/Human/parts.rsi
state: r_hand
- map: ["enum.HumanoidVisualLayers.LFoot"]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: l_foot
- map: ["enum.HumanoidVisualLayers.RFoot"]
color: "#e8b59b"
sprite: Mobs/Species/Human/parts.rsi
state: r_foot
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.GLOVES"]
- map: ["enum.Slots.SHOES"]
@@ -101,8 +110,8 @@
- map: ["hand-left"]
- map: ["hand-right"]
- type: Icon
sprite: Mobs/Species/human.rsi
state: human_basic
sprite: Mobs/Species/Human/parts.rsi
state: full
- type: Physics
mass: 85
- type: Collidable
@@ -116,17 +125,20 @@
layer:
- Opaque
- MobImpassable
- type: Species
Template: Human
HeatResistance: 323
- type: BodyManager
BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman
baseTemplate: bodyTemplate.Humanoid
basePreset: bodyPreset.BasicHuman
- type: Metabolism
needsGases:
Oxygen: 0.006365740
producesGases:
Oxygen: 0.004774305
CarbonDioxide: 0.001591435
- type: MobStateManager
- type: HeatResistance
- type: Damageable
- type: Appearance
visuals:
- type: SpeciesVisualizer
- type: RotationVisualizer
- type: BuckleVisualizer
- type: CombatMode
- type: Teleportable
@@ -163,55 +175,51 @@
- type: Sprite
netsync: false
drawdepth: Mobs
layers:
- map: ["enum.HumanoidVisualLayers.Chest"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_chest_m
sprite: Mobs/Species/Human/parts.rsi
state: torso_m
- map: ["enum.HumanoidVisualLayers.Head"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_head_m
- sprite: Mobs/Customization/eyes.rsi
state: eyes
sprite: Mobs/Species/Human/parts.rsi
state: head_m
- map: ["enum.HumanoidVisualLayers.Eyes"]
color: "#008800"
sprite: Mobs/Customization/eyes.rsi
state: eyes
- map: ["enum.HumanoidVisualLayers.RArm"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_arm
sprite: Mobs/Species/Human/parts.rsi
state: r_arm
- map: ["enum.HumanoidVisualLayers.LArm"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_arm
sprite: Mobs/Species/Human/parts.rsi
state: l_arm
- map: ["enum.HumanoidVisualLayers.RLeg"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_leg
sprite: Mobs/Species/Human/parts.rsi
state: r_leg
- map: ["enum.HumanoidVisualLayers.LLeg"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_leg
sprite: Mobs/Species/Human/parts.rsi
state: l_leg
- shader: StencilClear
- shader: StencilMask
map: ["enum.HumanoidVisualLayers.StencilMask"]
sprite: Mobs/Customization/masking_helpers.rsi
state: female_full
visible: false
- map: ["enum.Slots.INNERCLOTHING"]
shader: StencilDraw
- map: ["enum.HumanoidVisualLayers.LHand"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_l_hand
sprite: Mobs/Species/Human/parts.rsi
state: l_hand
- map: ["enum.HumanoidVisualLayers.RHand"]
color: "#e8b59b"
sprite: Mobs/Species/human.rsi
state: human_r_hand
sprite: Mobs/Species/Human/parts.rsi
state: r_hand
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.GLOVES"]
- map: ["enum.Slots.SHOES"]
@@ -231,14 +239,11 @@
- map: ["enum.Slots.HEAD"]
- map: ["hand-left"]
- map: ["hand-right"]
- type: Icon
sprite: Mobs/Species/human.rsi
state: human_basic
sprite: Mobs/Species/Human/parts.rsi
state: full
- type: Physics
mass: 85
- type: Collidable
shapes:
- !type:PhysShapeAabb
@@ -250,17 +255,14 @@
- SmallImpassable
layer:
- MobImpassable
- type: Species
Template: Human
HeatResistance: 323
- type: BodyManager
baseTemplate: bodyTemplate.Humanoid
basePreset: bodyPreset.BasicHuman
- type: MobStateManager
- type: Damageable
- type: Appearance
visuals:
- type: SpeciesVisualizer
- type: RotationVisualizer
- type: HumanoidAppearance
- type: Grammar
proper: true

View File

@@ -6,7 +6,7 @@
components:
- type: DroppedBodyPart
- type: Sprite
texture: Mobs/Parts/Organs/eyes_grey.png
texture: Mobs/Species/Human/parts.rsi/torso_m.png
- type: Icon
- type: UserInterface
interfaces:
@@ -21,9 +21,9 @@
components:
- type: DroppedMechanism
- type: Sprite
texture: Mobs/Parts/Organs/eyes_grey.png
texture: Mobs/Parts/Organs/eyeballs.png
- type: Icon
- type: UserInterface
interfaces:
- key: enum.GenericSurgeryUiKey.Key
type: GenericSurgeryBoundUserInterface
type: GenericSurgeryBoundUserInterface

View File

@@ -27,7 +27,7 @@
components:
- type: Stack
- type: Item
- type: Healing
#- type: Healing
- type: entity
name: ointment
@@ -39,9 +39,9 @@
texture: Objects/Specific/Medical/ointment.png
- type: Icon
texture: Objects/Specific/Medical/ointment.png
- type: Healing
heal: 10
damage: Heat
#- type: Healing
# heal: 10
# damage: Heat
- type: Stack
max: 5
count: 5
@@ -57,9 +57,9 @@
texture: Objects/Specific/Medical/brutepack.png
- type: Icon
texture: Objects/Specific/Medical/brutepack.png
- type: Healing
heal: 10
damage: Brute
#- type: Healing
# heal: 10
# damage: Brute
- type: Stack
max: 5
count: 5

View File

@@ -11,9 +11,6 @@
- key: enum.GenericSurgeryUiKey.Key
type: GenericSurgeryBoundUserInterface
- type: entity
name: scalpel
parent: BaseSurgeryTool
@@ -23,19 +20,15 @@
- type: SurgeryTool
surgeryType: Incision
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: scalpel
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: scalpel
- type: ItemCooldown
- type: MeleeWeapon
- type: entity
name: retractor
parent: BaseSurgeryTool
@@ -45,19 +38,15 @@
- type: SurgeryTool
surgeryType: Retraction
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: retractor
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: retractor
- type: ItemCooldown
- type: MeleeWeapon
- type: entity
name: cautery
parent: BaseSurgeryTool
@@ -67,19 +56,15 @@
- type: SurgeryTool
surgeryType: Cauterization
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: cautery
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: cautery
- type: ItemCooldown
- type: MeleeWeapon
- type: entity
name: drill
parent: BaseSurgeryTool
@@ -89,19 +74,15 @@
- type: SurgeryTool
surgeryType: Drilling
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: drill
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: drill
- type: ItemCooldown
- type: MeleeWeapon
- type: entity
name: bone saw
parent: BaseSurgeryTool
@@ -111,19 +92,15 @@
- type: SurgeryTool
surgeryType: Amputation
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: bone_saw
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: bone_saw
- type: ItemCooldown
- type: MeleeWeapon
- type: entity
name: hemostat
parent: BaseSurgeryTool
@@ -133,14 +110,11 @@
- type: SurgeryTool
surgeryType: VesselCompression
baseOperateTime: 3
- type: Sprite
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: hemostat
- type: Icon
sprite: Objects/Specific/Medical/surgery_tools.rsi
state: hemostat
- type: ItemCooldown
- type: MeleeWeapon
- type: MeleeWeapon

View File

@@ -6,4 +6,4 @@
components:
- type: Projectile
damages:
Brute: 70
Piercing: 70

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 27
Piercing: 27
- type: entity
id: BulletClRifleFlash
@@ -16,7 +16,7 @@
components:
- type: Projectile
damages:
Brute: 27
Piercing: 27
- type: entity
id: BulletClRifleHV
@@ -26,7 +26,7 @@
components:
- type: Projectile
damages:
Brute: 32
Piercing: 32
- type: entity
id: BulletClRiflePractice
@@ -36,7 +36,7 @@
components:
- type: Projectile
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletClRifleRubber
@@ -46,4 +46,4 @@
components:
- type: Projectile
damages:
Brute: 3
Blunt: 3

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 28
Piercing: 28
- type: entity
id: BulletLRifleFlash
@@ -16,7 +16,7 @@
components:
- type: Projectile
damages:
Brute: 28
Piercing: 28
- type: entity
id: BulletLRifleHV
@@ -26,7 +26,7 @@
components:
- type: Projectile
damages:
Brute: 30
Piercing: 30
- type: entity
id: BulletLRiflePractice
@@ -36,7 +36,7 @@
components:
- type: Projectile
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletLRifleRubber
@@ -46,4 +46,4 @@
components:
- type: Projectile
damages:
Brute: 3
Blunt: 3

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 32
Piercing: 32
- type: entity
id: BulletMagnumFlash
@@ -16,7 +16,7 @@
components:
- type: Projectile
damages:
Brute: 32
Piercing: 32
- type: entity
id: BulletMagnumHV
@@ -26,7 +26,7 @@
components:
- type: Projectile
damages:
Brute: 35
Piercing: 35
- type: entity
id: BulletMagnumPractice
@@ -36,7 +36,7 @@
components:
- type: Projectile
damages:
Brute: 1
Blunt: 1
- type: entity
id: BulletMagnumRubber
@@ -46,4 +46,4 @@
components:
- type: Projectile
damages:
Brute: 3
Blunt: 3

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 24
Piercing: 24
- type: entity
id: BulletPistolFlash
@@ -16,7 +16,7 @@
components:
- type: Projectile
damages:
Brute: 24
Piercing: 24
- type: entity
id: BulletPistolHV
@@ -26,7 +26,7 @@
components:
- type: Projectile
damages:
Brute: 28
Piercing: 28
- type: entity
id: BulletPistolPractice
@@ -36,7 +36,7 @@
components:
- type: Projectile
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletPistolRubber
@@ -46,4 +46,4 @@
components:
- type: Projectile
damages:
Brute: 3
Blunt: 3

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 25
Piercing: 25
- type: entity
id: BulletSRifleFlash
@@ -16,7 +16,7 @@
components:
- type: Projectile
damages:
Brute: 25
Piercing: 25
- type: entity
id: BulletSRifleHV
@@ -26,7 +26,7 @@
components:
- type: Projectile
damages:
Brute: 30
Piercing: 30
- type: entity
id: BulletSRiflePractice
@@ -36,7 +36,7 @@
components:
- type: Projectile
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletSRifleRubber
@@ -46,4 +46,4 @@
components:
- type: Projectile
damages:
Brute: 3
Blunt: 3

View File

@@ -9,7 +9,7 @@
state: base
- type: Projectile
damages:
Brute: 13
Piercing: 13
- type: entity
id: PelletShotgunBeanbag
@@ -22,7 +22,7 @@
state: base
- type: Projectile
damages:
Brute: 10
Blunt: 10
- type: StunnableProjectile
- type: entity
@@ -36,7 +36,7 @@
state: base
- type: Projectile
damages:
Brute: 13
Piercing: 13
- type: entity
id: PelletShotgunFlash
@@ -49,7 +49,7 @@
state: base
- type: Projectile
damages:
Brute: 13
Blunt: 13
- type: entity
id: PelletShotgunIncendiary
@@ -62,7 +62,7 @@
state: base
- type: Projectile
damages:
Brute: 13
Blunt: 13
- type: entity
id: PelletShotgunPractice
@@ -75,4 +75,4 @@
state: base
- type: Projectile
damages:
Brute: 1
Blunt: 1

View File

@@ -6,7 +6,7 @@
components:
- type: Projectile
damages:
Brute: 1
Blunt: 1
- type: entity
id: BulletDonkSoft
@@ -27,4 +27,4 @@
state: foamdart
- type: Projectile
damages:
Brute: 1
Blunt: 1

View File

@@ -21,9 +21,8 @@
heavyImpactRange: 2
lightImpactRange: 4
flashRange: 7
- type: Damageable
- type: Destructible
thresholdvalue: 10
maxHP: 10
- type: Appearance
visuals:
- type: TimerTriggerVisualizer
@@ -48,9 +47,8 @@
- type: OnUseTimerTrigger
delay: 3.5
- type: FlashExplosive
- type: Damageable
- type: Destructible
thresholdvalue: 10
maxHP: 10
- type: Appearance
visuals:
- type: TimerTriggerVisualizer
@@ -79,9 +77,8 @@
heavyImpactRange: 5
lightImpactRange: 7
flashRange: 10
- type: Damageable
- type: Destructible
thresholdvalue: 10
maxHP: 10
- type: Appearance
visuals:
- type: TimerTriggerVisualizer

View File

@@ -7,6 +7,7 @@
spriteName: Objects/Weapons/Guns/Projectiles/laser.png
muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png
impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png
damageType: Heat
damage: 10
- type: entity
@@ -18,6 +19,7 @@
spriteName: Objects/Weapons/Guns/Projectiles/heavy_laser.png
muzzleFlash: Objects/Weapons/Guns/Projectiles/heavy_laser_muzzle.png
impactFlash: Objects/Weapons/Guns/Projectiles/heavy_laser_impact.png
damageType: Heat
damage: 30
- type: entity
@@ -29,4 +31,5 @@
spriteName: Objects/Weapons/Guns/Projectiles/xray.png
muzzleFlash: Objects/Weapons/Guns/Projectiles/xray_muzzle.png
impactFlash: Objects/Weapons/Guns/Projectiles/xray_impact.png
damageType: Heat
damage: 60

View File

@@ -28,7 +28,7 @@
- type: Projectile
soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
damages:
Brute: 20
Piercing: 20
- type: entity
id: BulletBaseFlash
@@ -39,7 +39,7 @@
- type: Projectile
soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
damages:
Brute: 10
Piercing: 10
- type: FlashProjectile
range: 1
@@ -51,7 +51,7 @@
components:
- type: Projectile
damages:
Brute: 12
Piercing: 12
- type: entity
id: BulletBasePractice
@@ -61,7 +61,7 @@
components:
- type: Projectile
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletBaseRubber
@@ -72,7 +72,7 @@
- type: Projectile
soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
damages:
Brute: 3
Blunt: 3
- type: StunnableProjectile
paralyzeAmount: 2
@@ -222,7 +222,7 @@
deleteOnCollide: true
soundHit: /Audio/Guns/Hits/snap.ogg
damages:
Brute: 2
Blunt: 2
- type: entity
id: BulletCap

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 573 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

View File

@@ -1,81 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13",
"states": [
{
"name": "head_m",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "torso_m",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_arm",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_arm",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_hand",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_hand",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_leg",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_leg",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "l_foot",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "r_foot",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

View File

@@ -1,53 +0,0 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13",
"states": [
{
"name": "brain_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "eyes_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "heart_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "kidneys_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "liver_human",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "lungs_human",
"directions": 1,
"delays": [
[1.0]
]
},
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 B

View File

@@ -0,0 +1,121 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/7489d8e74693f9ca811e4f8a921de10ed96c619e/icons/obj/surgery.dmi",
"states": [
{
"name": "appendix",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "appendixinflamed",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "brain",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "ears",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "eyeballs",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "heart-off",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "heart-on",
"directions": 1,
"delays": [
[
0.6,
0.1,
0.1
]
]
},
{
"name": "kidneys",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "liver",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "lungs",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "stomach",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "tonguenormal",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

View File

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 486 B

View File

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 442 B

View File

Before

Width:  |  Height:  |  Size: 435 B

After

Width:  |  Height:  |  Size: 435 B

View File

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

View File

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@@ -0,0 +1,236 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
"states": [
{
"name": "full",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "head_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "head_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "l_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_arm",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_foot",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_hand",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "r_leg",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "torso_m",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
}
]
}

View File

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

View File

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 785 B

After

Width:  |  Height:  |  Size: 785 B

View File

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

View File

@@ -1 +0,0 @@
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "human_basic", "directions": 1, "delays": [[1.0]]}, {"name": "human_chest_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_chest_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}