cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4970 from Jordie0608/nothingwittyhere

Browse Source 
Fixes 'atoms' typo in unsuitable_atmos_damage
This commit is contained in:
Cheridan
2014-09-29 12:57:08 -05:00
parent 74fcfb6f0f b27dbcba1d
commit 094010444f
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/drone.dm
+1 -1
View File
@@ -15,7 +15,7 @@
maxHealth = 30
heat_damage_per_tick = 0
cold_damage_per_tick = 0
unsuitable_atoms_damage = 0
unsuitable_atmos_damage = 0
wander = 0
speed = 0
ventcrawler = 2
code/modules/mob/living/simple_animal/hostile/alien.dm
+1 -1
View File
@@ -28,7 +28,7 @@
max_co2 = 0
min_n2 = 0
max_n2 = 0
unsuitable_atoms_damage = 15
unsuitable_atmos_damage = 15
faction = list("alien")
status_flags = CANPUSH
minbodytemp = 0
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+1 -1
View File
@@ -8,7 +8,7 @@
max_co2 = 0
min_n2 = 0
max_n2 = 0
unsuitable_atoms_damage = 15
unsuitable_atmos_damage = 15
faction = list("mining")
environment_smash = 2
minbodytemp = 0
code/modules/mob/living/simple_animal/hostile/pirate.dm
+1 -1
View File
@@ -28,7 +28,7 @@
max_co2 = 5
min_n2 = 0
max_n2 = 0
unsuitable_atoms_damage = 15
unsuitable_atmos_damage = 15
var/corpse = /obj/effect/landmark/mobcorpse/pirate
var/weapon1 = /obj/item/weapon/melee/energy/sword/pirate
code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+1 -1
View File
@@ -37,4 +37,4 @@
maxbodytemp = 370
heat_damage_per_tick = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp
cold_damage_per_tick = 10 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
unsuitable_atoms_damage = 10
unsuitable_atmos_damage = 10
code/modules/mob/living/simple_animal/hostile/russian.dm
+1 -1
View File
@@ -29,7 +29,7 @@
max_co2 = 5
min_n2 = 0
max_n2 = 0
unsuitable_atoms_damage = 15
unsuitable_atmos_damage = 15
faction = list("russian")
status_flags = CANPUSH
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+1 -1
View File
@@ -30,7 +30,7 @@
max_co2 = 5
min_n2 = 0
max_n2 = 0
unsuitable_atoms_damage = 15
unsuitable_atmos_damage = 15
faction = list("syndicate")
status_flags = CANPUSH
code/modules/mob/living/simple_animal/simple_animal.dm
+2 -2
View File
@@ -46,7 +46,7 @@
var/max_co2 = 5
var/min_n2 = 0
var/max_n2 = 0
var/unsuitable_atoms_damage = 2 //This damage is taken when atmos doesn't fit all the requirements above
var/unsuitable_atmos_damage = 2 //This damage is taken when atmos doesn't fit all the requirements above
//LETTING SIMPLE ANIMALS ATTACK? WHAT COULD GO WRONG. Defaults to zero so Ian can still be cuddly
@@ -206,7 +206,7 @@
adjustBruteLoss(heat_damage_per_tick)
if(!atmos_suitable)
adjustBruteLoss(unsuitable_atoms_damage)
adjustBruteLoss(unsuitable_atmos_damage)
return 1
/mob/living/simple_animal/Bumped(AM as mob|obj)