From e1996cbf9f9218cdc9dd7dfecad5550fbc933bac Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Nov 2019 17:28:52 -0500 Subject: [PATCH 1/2] Merge pull request #6481 from Atermonera/maint_drone_spawn Reduces maintenance drone spawn time to 5 minutes --- .../silicon/robot/drone/drone_manufacturer.dm | 14 ++++---- .../atermonera - maintdronetime.yml | 36 +++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/atermonera - maintdronetime.yml diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 6ce0895947..6bd956c4cc 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -65,7 +65,7 @@ /obj/machinery/drone_fabricator/examine(mob/user) ..(user) if(produce_drones && drone_progress >= 100 && istype(user,/mob/observer/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) - user << "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone." + to_chat(user, "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone.") /obj/machinery/drone_fabricator/proc/create_drone(var/client/player) @@ -113,14 +113,14 @@ return 0 //something is terribly wrong if(jobban_isbanned(src,"Cyborg")) - usr << "You are banned from playing synthetics and cannot spawn as a drone." + to_chat(usr, "You are banned from playing synthetics and cannot spawn as a drone.") return if(!MayRespawn(1)) return var/deathtime = world.time - src.timeofdeath - var/deathtimeminutes = round(deathtime / 600) + var/deathtimeminutes = round(deathtime / (1 MINUTE)) var/pluralcheck = "minute" if(deathtimeminutes == 0) pluralcheck = "" @@ -128,11 +128,11 @@ pluralcheck = " [deathtimeminutes] minute and" else if(deathtimeminutes > 1) pluralcheck = " [deathtimeminutes] minutes and" - var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1) + var/deathtimeseconds = round((deathtime - deathtimeminutes * 1 MINUTE) / 10,1) - if (deathtime < 6000) - usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds." - usr << "You must wait 10 minutes to respawn as a drone!" + if (deathtime < 5 MINUTES) + to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.") + to_chat(usr, "You must wait 5 minutes to respawn as a drone!") return var/list/all_fabricators = list() diff --git a/html/changelogs/atermonera - maintdronetime.yml b/html/changelogs/atermonera - maintdronetime.yml new file mode 100644 index 0000000000..db0d2f3f7d --- /dev/null +++ b/html/changelogs/atermonera - maintdronetime.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 +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Atermonera + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Ghosts can join as drones after only 5 minutes have passed, down from 10." \ No newline at end of file