cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8535 from VOREStation/upstream-merge-7352

Browse Source 
[MIRROR] Increase mob default reload time from 1 second to 4 seconds.
This commit is contained in:
Novacat
2020-07-30 15:03:12 -04:00
committed by GitHub
parent 216a8d8c12 53d6c5f233
commit 9578296ca5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/combat.dm
+1 -1
View File
@@ -143,7 +143,7 @@
if(do_after(src, reload_time))
if(reload_sound)
playsound(src, reload_sound, 50, 1)
playsound(src, reload_sound, 70, 1)
reload_count = 0
. = TRUE
else
code/modules/mob/living/simple_mob/simple_mob.dm
+1 -1
View File
@@ -92,7 +92,7 @@
var/needs_reload = FALSE // If TRUE, mob needs to reload occasionally
var/reload_max = 1 // How many shots the mob gets before it has to reload, will not be used if needs_reload is FALSE
var/reload_count = 0 // A counter to keep track of how many shots the mob has fired so far. Reloads when it hits reload_max.
var/reload_time = 1 SECONDS // How long it takes for a mob to reload. This is to buy a player a bit of time to run or fight.
var/reload_time = 4 SECONDS // How long it takes for a mob to reload. This is to buy a player a bit of time to run or fight.
var/reload_sound = 'sound/weapons/flipblade.ogg' // What sound gets played when the mob successfully reloads. Defaults to the same sound as reloading guns. Can be null.
//Mob melee settings