Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retooling Space Damage #8482

Merged
merged 14 commits into from
May 28, 2022
Merged

Retooling Space Damage #8482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c46b73
Merge branch 'space-wizards-master'
EmoGarbage404 Apr 25, 2022
404cb6d
Merge branch 'space-wizards:master' into master
EmoGarbage404 Apr 27, 2022
bc28856
Merge branch 'space-wizards:master' into master
EmoGarbage404 Apr 28, 2022
b78709a
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 1, 2022
c8f849f
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 5, 2022
6ba6110
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 7, 2022
968f756
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 9, 2022
52cca51
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 11, 2022
71d3cb9
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 12, 2022
0a39235
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 13, 2022
f240894
Merge branch 'space-wizards:master' into master
EmoGarbage404 May 13, 2022
df20146
Merge branch 'master' of https://github.com/space-wizards/space-stati…
EmoGarbage404 May 27, 2022
1442766
Merge branch 'space-wizards-master'
EmoGarbage404 May 27, 2022
0441d86
rebalance pressure, airloss, cold
EmoGarbage404 May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@
currentTemperature: 310.15
coldDamage:
types:
Cold : 1 #per second, scales with temperature & other constants
Cold : 0.1 #per second, scales with temperature & other constants
specificHeat: 42
heatDamage:
types:
Heat : 1 #per second, scales with temperature & other constants
Heat : 0.1 #per second, scales with temperature & other constants
- type: MobState
thresholds:
0: !type:NormalMobState {}
Expand Down Expand Up @@ -166,7 +166,7 @@
- type: Barotrauma
damage:
types:
Blunt: 1 #per second, scales with pressure and other constants.
Blunt: 0.15 #per second, scales with pressure and other constants.
- type: ThermalRegulator
metabolismHeat: 800
radiatedHeat: 100
Expand All @@ -178,10 +178,10 @@
- type: Respirator
damage:
types:
Asphyxiation: 3
Asphyxiation: 2
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
- type: Temperature
heatDamageThreshold: 360
coldDamageThreshold: 260
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/human.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.5
Asphyxiation: 1.0
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
- type: Alerts
- type: Actions
- type: Eye
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.5
Asphyxiation: 1.0
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
#Weh
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/vox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.5
Asphyxiation: 1.0
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0

4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
- type: Respirator
damage:
types:
Asphyxiation: 3
Asphyxiation: 2
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
- type: Sprite
netsync: false
noRot: true
Expand Down
7 changes: 3 additions & 4 deletions Resources/Prototypes/Entities/Mobs/Species/human.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.7 #per second, scales with pressure and other constants.
Blunt: 0.15 #per second, scales with pressure and other constants.
- type: DamageOnHighSpeedImpact
damage:
types:
Expand Down Expand Up @@ -190,7 +190,6 @@
Arms:
points: 2
required: false

- type: Physics
bodyType: KinematicController
- type: Fixtures
Expand Down Expand Up @@ -218,10 +217,10 @@
specificHeat: 42
coldDamage:
types:
Cold : 1 #per second, scales with temperature & other constants
Cold: 0.1 #per second, scales with temperature & other constants
heatDamage:
types:
Heat : 1 #per second, scales with temperature & other constants
Heat: 0.1 #per second, scales with temperature & other constants
- type: HumanoidAppearance
- type: Body
template: HumanoidTemplate
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@
specificHeat: 46
coldDamage:
types:
Cold : 1.1 #per second, scales with temperature & other constants
Cold : 0.2 #per second, scales with temperature & other constants
heatDamage:
types:
Heat : 0.9 #per second, scales with temperature & other constants
Heat : 0.1 #per second, scales with temperature & other constants
- type: MovementSpeedModifier
baseWalkSpeed : 2.7
baseSprintSpeed : 4.5
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.4 #per second, scales with pressure and other constants.
Blunt: 0.1 #per second, scales with pressure and other constants.
- type: DamageOnHighSpeedImpact
damage:
types:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/slime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
- type: Barotrauma
damage:
types:
Blunt: 1.4 #per second, scales with pressure and other constants. Twice as much as humans.
Blunt: 0.3 #per second, scales with pressure and other constants. Twice as much as humans.
- type: Reactive
groups:
Flammable: [ Touch ]
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/vox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
- type: Respirator
damage:
types:
Asphyxiation: 3
Asphyxiation: 2
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
- type: HumanoidAppearance
canColorHair: false
canColorFacialHair: false
Expand Down