Merge pull request #11668 from CosmicScientist/DroneCooldown

Drone dispenser's cooldown now in a var
This commit is contained in:
Razharas
2015-09-10 18:29:46 +03:00
2 changed files with 38 additions and 1 deletions
+2 -1
View File
@@ -9,6 +9,7 @@
var/glass = 0
var/droneMadeRecently = 0
var/outputDirection = SOUTH
var/cooldownTime = 1800 //3 minutes
/obj/machinery/droneDispenser/New()
..()
@@ -70,7 +71,7 @@
new /obj/item/drone_shell(T)
use_power(1000)
icon_state = "recharge"
spawn(1800) //3 minute cooldown between shells
spawn(cooldownTime)
icon_state = "[initial(icon_state)]"
droneMadeRecently = 0
playsound(src, 'sound/machines/ping.ogg', 50, 1)
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
# tgs (TG-ported fixes?)
#################################
# Your name.
author: CosmicScientist
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Drone dispenser now has a var for its cooldown, get var editing."