cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update simple_mob_vr.dm

Browse Source
This commit is contained in:
Razgriz
2020-12-23 03:41:01 -07:00
committed by GitHub
parent 3d2f5f8251
commit 83dc173f9c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/simple_mob/simple_mob_vr.dm
View File

@@ -4,15 +4,9 @@
#define SA_ICON_REST 0x04 #define SA_ICON_REST 0x04
/mob/living/simple_mob /mob/living/simple_mob
<<<<<<< HEAD
base_attack_cooldown = 15
||||||| parent of 61234d8d76... Merge pull request #9493 from Novacat/nova-basicfixes
base_attack_cooldown = 10
=======
melee_attack_delay = 1 melee_attack_delay = 1
base_attack_cooldown = 10 base_attack_cooldown = 10
melee_miss_chance = 25 melee_miss_chance = 25
>>>>>>> 61234d8d76... Merge pull request #9493 from Novacat/nova-basicfixes
var/temperature_range = 40 // How close will they get to environmental temperature before their body stops changing its heat var/temperature_range = 40 // How close will they get to environmental temperature before their body stops changing its heat