From a942e145b607b254a0d369b76b231e4d45b63842 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 22 Sep 2018 15:35:18 -0500 Subject: [PATCH] Tweaks emitters and Pacman --- code/modules/power/port_gen.dm | 1 + code/modules/power/singularity/emitter.dm | 54 +++++++++++------------ html/changelogs/Anewbe - Emitters.yml | 36 +++++++++++++++ 3 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 html/changelogs/Anewbe - Emitters.yml diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 3b208cf629..35a860ec1b 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -282,6 +282,7 @@ to_chat(user, "You unsecure the generator from the floor.") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored + return else if(default_deconstruction_screwdriver(user, O)) return else if(default_deconstruction_crowbar(user, O)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 8ac6bfb559..ac4401387a 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -65,18 +65,18 @@ /obj/machinery/power/emitter/proc/activate(mob/user as mob) if(state == 2) if(!powernet) - user << "\The [src] isn't connected to a wire." + to_chat(user, "\The [src] isn't connected to a wire.") return 1 if(!src.locked) if(src.active==1) src.active = 0 - user << "You turn off [src]." + to_chat(user, "You turn off [src].") message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("EMITTER([x],[y],[z]) OFF by [key_name(user)]") investigate_log("turned off by [user.key]","singulo") else src.active = 1 - user << "You turn on [src]." + to_chat(user, "You turn on [src].") src.shot_number = 0 src.fire_delay = get_initial_fire_delay() message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) @@ -84,9 +84,9 @@ investigate_log("turned on by [user.key]","singulo") update_icon() else - user << "The controls are locked!" + to_chat(user, "The controls are locked!") else - user << "\The [src] needs to be firmly secured to the floor first." + to_chat(user, "\The [src] needs to be firmly secured to the floor first.") return 1 @@ -148,7 +148,7 @@ if(W.is_wrench()) if(active) - user << "Turn off [src] first." + to_chat(user, "Turn off [src] first.") return switch(state) if(0) @@ -167,17 +167,17 @@ src.anchored = 0 disconnect_from_network() if(2) - user << "\The [src] needs to be unwelded from the floor." + to_chat(user, "\The [src] needs to be unwelded from the floor.") return if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(active) - user << "Turn off [src] first." + to_chat(user, "Turn off [src] first.") return switch(state) if(0) - user << "\The [src] needs to be wrenched to the floor." + to_chat(user, "\The [src] needs to be wrenched to the floor.") if(1) if (WT.remove_fuel(0,user)) playsound(loc, WT.usesound, 50, 1) @@ -187,10 +187,10 @@ if (do_after(user,20 * WT.toolspeed)) if(!src || !WT.isOn()) return state = 2 - user << "You weld [src] to the floor." + to_chat(user, "You weld [src] to the floor.") connect_to_network() else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") if(2) if (WT.remove_fuel(0,user)) playsound(loc, WT.usesound, 50, 1) @@ -200,44 +200,40 @@ if (do_after(user,20 * WT.toolspeed)) if(!src || !WT.isOn()) return state = 1 - user << "You cut [src] free from the floor." + to_chat(user, "You cut [src] free from the floor.") disconnect_from_network() else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") return if(istype(W, /obj/item/stack/material) && W.get_material_name() == DEFAULT_WALL_MATERIAL) var/amt = Ceiling(( initial(integrity) - integrity)/10) if(!amt) - user << "\The [src] is already fully repaired." + to_chat(user, "\The [src] is already fully repaired.") return var/obj/item/stack/P = W if(P.amount < amt) - user << "You don't have enough sheets to repair this! You need at least [amt] sheets." + to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") return - user << "You begin repairing \the [src]..." + to_chat(user, "You begin repairing \the [src]...") if(do_after(user, 30)) if(P.use(amt)) - user << "You have repaired \the [src]." + to_chat(user, "You have repaired \the [src].") integrity = initial(integrity) return else - user << "You don't have enough sheets to repair this! You need at least [amt] sheets." + to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") return if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(emagged) - user << "The lock seems to be broken." + to_chat(user, "The lock seems to be broken.") return if(src.allowed(user)) - if(active) - src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" - else - src.locked = 0 //just in case it somehow gets locked - user << "The controls can only be locked when [src] is online." + src.locked = !src.locked + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") else - user << "Access denied." + to_chat(user, "Access denied.") return ..() return @@ -274,11 +270,11 @@ var/integrity_percentage = round((integrity / initial(integrity)) * 100) switch(integrity_percentage) if(0 to 30) - user << "\The [src] is close to falling apart!" + to_chat(user, "\The [src] is close to falling apart!") if(31 to 70) - user << "\The [src] is damaged." + to_chat(user, "\The [src] is damaged.") if(77 to 99) - user << "\The [src] is slightly damaged." + to_chat(user, "\The [src] is slightly damaged.") //R-UST port /obj/machinery/power/emitter/proc/get_initial_fire_delay() diff --git a/html/changelogs/Anewbe - Emitters.yml b/html/changelogs/Anewbe - Emitters.yml new file mode 100644 index 0000000000..1400604d07 --- /dev/null +++ b/html/changelogs/Anewbe - Emitters.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: Anewbe + +# 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: + - rscadd: "Emitters can be locked while off, too."