From 882c404c27b78fca7769d4faec4a0f1d99a1f095 Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Wed, 9 Sep 2015 01:01:55 +0100 Subject: [PATCH 1/2] Cooldown now in a var. --- code/game/machinery/droneDispenser.dm | 3 +- .../CosmicScientist-DroneCooldown.yml | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/CosmicScientist-DroneCooldown.yml diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index e54e5254b8f..f3d83f1e795 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -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) diff --git a/html/changelogs/CosmicScientist-DroneCooldown.yml b/html/changelogs/CosmicScientist-DroneCooldown.yml new file mode 100644 index 00000000000..fce7b79a2c2 --- /dev/null +++ b/html/changelogs/CosmicScientist-DroneCooldown.yml @@ -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: N3X15 + +# 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." From 0007f75dabd6c6112eb618c6c290a4ef0d992e52 Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Wed, 9 Sep 2015 01:08:50 +0100 Subject: [PATCH 2/2] Update CosmicScientist-DroneCooldown.yml Whoops N3X15 isn't my name. --- html/changelogs/CosmicScientist-DroneCooldown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/CosmicScientist-DroneCooldown.yml b/html/changelogs/CosmicScientist-DroneCooldown.yml index fce7b79a2c2..65a6b446f7a 100644 --- a/html/changelogs/CosmicScientist-DroneCooldown.yml +++ b/html/changelogs/CosmicScientist-DroneCooldown.yml @@ -22,7 +22,7 @@ ################################# # Your name. -author: N3X15 +author: CosmicScientist # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True