From c25c2d9f1f6793d4e9d75fb68b253cf9983cf402 Mon Sep 17 00:00:00 2001 From: Nerezza Date: Sun, 20 Nov 2016 03:24:47 -0600 Subject: [PATCH] Some work on making APCs better Grammar fixes, more grammar fixes, a couple bug fixes, a few more grammer fixes. Oh I also went ahead and to_chatted them user <Disconnect wires first." + to_chat(user,"Disconnect the wires first.") return playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues + to_chat(user,"You begin to remove the power control board...") //lpeters - fixed grammar issues //Ner - grrrrrr if(do_after(user, 50)) if (has_electronics==1) has_electronics = 0 if ((stat & BROKEN)) user.visible_message(\ - "[user.name] has broken the power control board inside [src.name]!",\ + "[user.name] has broken the charred power control board inside [src.name]!",\ "You broke the charred power control board and remove the remains.", "You hear a crack!") //ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0 @@ -450,81 +451,81 @@ update_icon() else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || hacker) ) if(coverlocked && !(stat & MAINT)) - user << "The cover is locked and cannot be opened." + to_chat(user,"The cover is locked and cannot be opened.") return else opened = 1 update_icon() else if (istype(W, /obj/item/weapon/cell) && opened) // trying to put a cell inside if(cell) - user << "There is a power cell already installed." + to_chat(user,"The [src.name] already has a power cell installed.") return if (stat & MAINT) - user << "There is no connector for your power cell." + to_chat(user,"You need to install the wiring and electronics first.") return if(W.w_class != ITEMSIZE_NORMAL) - user << "\The [W] is too [W.w_class < 3? "small" : "large"] to fit here." + to_chat(user,"\The [W] is too [W.w_class < 3? "small" : "large"] to work here.") return user.drop_item() W.forceMove(src) cell = W user.visible_message(\ - "[user.name] has inserted the power cell to [src.name]!",\ + "[user.name] has inserted a power cell into [src.name]!",\ "You insert the power cell.") chargecount = 0 update_icon() else if (istype(W, /obj/item/weapon/screwdriver)) // haxing if(opened) if (cell) - user << "Close the APC first." //Less hints more mystery! + to_chat(user,"Remove the power cell first.") return else if (has_electronics==1 && terminal) has_electronics = 2 stat &= ~MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You screw the circuit electronics into place." + to_chat(user,"You screw the circuit electronics into place.") else if (has_electronics==2) has_electronics = 1 stat |= MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You unfasten the electronics." + to_chat(user,"You unfasten the electronics.") else /* has_electronics==0 */ - user << "There is nothing to secure." + to_chat(user,"There is nothing to secure.") return update_icon() else wiresexposed = !wiresexposed - user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" + to_chat(user,"The wires have been [wiresexposed ? "exposed" : "unexposed"].") update_icon() else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card if(emagged) - user << "The interface is broken." + to_chat(user,"The panel is unresponsive.") else if(opened) - user << "You must close the cover to swipe an ID card." + to_chat(user,"You must close the cover to swipe an ID card.") else if(wiresexposed) - user << "You must close the panel" + to_chat(user,"You must close the wire panel.") else if(stat & (BROKEN|MAINT)) - user << "Nothing happens." + to_chat(user,"Nothing happens.") else if(hacker) - user << "Access denied." + to_chat(user,"Access denied.") else if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the APC interface." + to_chat(user,"You [ locked ? "lock" : "unlock"] the APC interface.") update_icon() else - user << "Access denied." + to_chat(user,"Access denied.") else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) var/turf/T = loc if(istype(T) && !T.is_plating()) - user << "You must remove the floor plating in front of the APC first." + to_chat(user,"You must remove the floor plating in front of the APC first.") return var/obj/item/stack/cable_coil/C = W if(C.get_amount() < 10) - user << "You need ten lengths of cable for APC." + to_chat(user,"You need ten lengths of cable for that.") return user.visible_message("[user.name] adds cables to the APC frame.", \ "You start adding cables to the APC frame...") @@ -547,9 +548,9 @@ else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2) var/turf/T = loc if(istype(T) && !T.is_plating()) - user << "You must remove the floor plating in front of the APC first." + to_chat(user,"You must remove the floor plating in front of the APC first.") return - user.visible_message("[user.name] dismantles the power terminal from [src].", \ + user.visible_message("[user.name] starts dismantling the [src]'s power terminal.", \ "You begin to cut the cables...") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50)) @@ -561,7 +562,7 @@ if(usr.stunned) return new /obj/item/stack/cable_coil(loc,10) - user << "You cut the cables and dismantle the power terminal." + to_chat(user,"You cut the cables and dismantle the power terminal.") qdel(terminal) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN))) user.visible_message("[user.name] inserts the power control board into [src].", \ @@ -570,17 +571,17 @@ if(do_after(user, 10)) if(has_electronics==0) has_electronics = 1 - user << "You place the power control board inside the frame." + to_chat(user,"You place the power control board inside the frame.") qdel(W) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN))) - user << "You cannot put the board inside, the frame is damaged." + to_chat(user,"The [src] is too broken for that. Repair it first.") return else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal) var/obj/item/weapon/weldingtool/WT = W if (WT.get_fuel() < 3) - user << "You need more welding fuel to complete this task." + to_chat(user,"You need more welding fuel to complete this task.") return - user.visible_message("[user.name] welds [src].", \ + user.visible_message("[user.name] begins cutting apart [src] with the [WT.name].", \ "You start welding the APC frame...", \ "You hear welding.") playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) @@ -589,37 +590,29 @@ if (emagged || (stat & BROKEN) || opened==2) new /obj/item/stack/material/steel(loc) user.visible_message(\ - "[src] has been cut apart by [user.name] with the weldingtool.",\ + "[src] has been cut apart by [user.name] with the [WT.name].",\ "You disassembled the broken APC frame.",\ "You hear welding.") else new /obj/item/frame/apc(loc) user.visible_message(\ - "[src] has been cut from the wall by [user.name] with the weldingtool.",\ + "[src] has been cut from the wall by [user.name] with the [WT.name].",\ "You cut the APC frame from the wall.",\ "You hear welding.") qdel(src) return - else if (istype(W, /obj/item/frame/apc) && opened && emagged) - emagged = 0 - if (opened==2) - opened = 1 - user.visible_message(\ - "[user.name] has replaced the damaged APC frontal panel with a new one.",\ - "You replace the damaged APC frontal panel with a new one.") - qdel(W) - update_icon() - else if (istype(W, /obj/item/frame/apc) && opened && ((stat & BROKEN) || hacker)) - if (has_electronics) - user << "You cannot repair this APC until you remove the electronics still inside." + else if (istype(W, /obj/item/frame/apc) && opened && ((stat & BROKEN) || hacker || emagged)) + if(cell) + to_chat(user, "You need to remove the power cell first.") return - user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\ - "You begin to replace the damaged APC frame...") + user.visible_message("[user.name] begins replacing the damaged APC cover with a new one.",\ + "You begin to replace the damaged APC cover...") if(do_after(user, 50)) user.visible_message(\ - "[user.name] has replaced the damaged APC frame with new one.",\ - "You replace the damaged APC frame with new one.") + "[user.name] has replaced the damaged APC cover with a new one.",\ + "You replace the damaged APC cover with a new one.") qdel(W) + emagged = 0 stat &= ~BROKEN // Malf AI, removes the APC from AI's hacked APCs list. if(hacker && hacker.hacked_apcs && (src in hacker.hacked_apcs)) @@ -632,13 +625,16 @@ if (((stat & BROKEN) || hacker) \ && !opened \ && W.force >= 5 \ - && W.w_class >= ITEMSIZE_NORMAL \ - && prob(20) ) - opened = 2 - user.visible_message("The APC cover was knocked down with the [W.name] by [user.name]!", \ - "You knock down the APC cover with your [W.name]!", \ - "You hear bang") - update_icon() + && W.w_class >= ITEMSIZE_NORMAL ) + user.visible_message("The [src.name] has been hit with the [W.name] by [user.name]!", \ + "You hit the [src.name] with your [W.name]!", \ + "You hear a bang!") + if(prob(20)) + opened = 2 + user.visible_message("The APC cover was knocked down with the [W.name] by [user.name]!", \ + "You knock down the APC cover with your [W.name]!", \ + "You hear a bang!") + update_icon() else if (istype(user, /mob/living/silicon)) return src.attack_hand(user) @@ -646,30 +642,29 @@ (istype(W, /obj/item/device/multitool) || \ istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/assembly/signaler))) return src.attack_hand(user) - user.visible_message("The [src.name] has been hit with the [W.name] by [user.name]!", \ - "You hit the [src.name] with your [W.name]!", \ - "You hear bang") + //Placeholder until someone can do take_damage() for APCs or something. + to_chat(user,"The [W.name] doesn't look like it'd do much damage to [src.name] right now.") // attack with hand - remove cell (if cover open) or interact with the APC /obj/machinery/power/apc/emag_act(var/remaining_charges, var/mob/user) if (!(emagged || hacker)) // trying to unlock with an emag card if(opened) - user << "You must close the cover to swipe an ID card." + to_chat(user,"You must close the cover to do that.") else if(wiresexposed) - user << "You must close the panel first" + to_chat(user,"You must close the wire panel first.") else if(stat & (BROKEN|MAINT)) - user << "Nothing happens." + to_chat(user,"The [src] isn't working.") else flick("apc-spark", src) if (do_after(user,6)) if(prob(50)) emagged = 1 locked = 0 - user << "You emag the APC interface." + to_chat(user,"You emag the APC interface.") update_icon() else - user << "You fail to [ locked ? "unlock" : "lock"] the APC interface." + to_chat(user,"The APC interface refused to unlock.") return 1 /obj/machinery/power/apc/attack_hand(mob/user) @@ -684,7 +679,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - user.visible_message("\red [user.name] slashes at the [src.name]!", "\blue You slash at the [src.name]!") + user.visible_message("[user.name] slashes at the [src.name]!", "You slash at the [src.name]!") playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.IsAllCut() @@ -692,12 +687,12 @@ if(beenhit >= pick(3, 4) && wiresexposed != 1) wiresexposed = 1 src.update_icon() - src.visible_message("\red The [src.name]'s cover flies open, exposing the wires!") + src.visible_message("The [src.name]'s cover flies open, exposing the wires!") else if(wiresexposed == 1 && allcut == 0) wires.CutAll() src.update_icon() - src.visible_message("\red The [src.name]'s wires are shredded!") + src.visible_message("The [src.name]'s wires are shredded!") else beenhit += 1 return @@ -711,7 +706,6 @@ src.cell = null user.visible_message("[user.name] removes the power cell from [src.name]!",\ "You remove the power cell.") - //user << "You remove the power cell." charging = 0 src.update_icon() return @@ -726,6 +720,7 @@ if(wiresexposed && !istype(user, /mob/living/silicon/ai)) wires.Interact(user) + return //The panel is visibly dark when the wires are exposed, so we shouldn't be able to interact with it. return ui_interact(user) @@ -735,7 +730,7 @@ return var/list/data = list( - "locked" = (locked && !emagged) ? 1 : 0, + "locked" = locked, "isOperating" = operating, "externalPower" = main_status, "powerCellStatus" = cell ? cell.percent() : null, @@ -822,17 +817,16 @@ if(isobserver(user) && is_admin(user) ) //This is to allow nanoUI interaction by ghost admins. return 1 if (user.stat) - user << "You must be conscious to use [src]!" return 0 if(inoperable()) return 0 if(!user.IsAdvancedToolUser()) return 0 if(user.restrained()) - user << "You must have free hands to use [src]." + to_chat(user,"Your hands must be free to use [src].") return 0 if(user.lying) - user << "You must stand to use [src]!" + to_chat(user,"You must stand to use [src]!") return 0 autoflag = 5 if (istype(user, /mob/living/silicon)) @@ -847,14 +841,14 @@ if(aidisabled && !permit) if(!loud) - user << "\The [src] have AI control disabled!" + to_chat(user,"\The AI control for [src] has been disabled!") return 0 else if (!in_range(src, user) || !istype(src.loc, /turf)) return 0 var/mob/living/carbon/human/H = user if (istype(H) && prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + to_chat(user,"You momentarily forget how to use [src].") return 0 return 1 @@ -869,10 +863,10 @@ if(isobserver(usr) ) var/mob/observer/dead/O = usr //Added to allow admin nanoUI interactions. if(!O.can_admin_interact() ) //NanoUI /should/ make this not needed, but better safe than sorry. - usr << "Try as you might, your ghostly fingers can't press the buttons." + to_chat(usr,"Try as you might, your ghostly fingers can't press the buttons.") return 1 else - usr << "You must unlock the panel to use this!" + to_chat(usr,"You must unlock the panel to use this!") return 1 if (href_list["lock"]) @@ -912,7 +906,7 @@ else if (href_list["toggleaccess"]) if(istype(usr, /mob/living/silicon)) if(emagged || (stat & (BROKEN|MAINT))) - usr << "The APC does not respond to the command." + to_chat(usr,"The APC does not respond to the command.") else locked = !locked update_icon() @@ -1186,9 +1180,8 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on) /obj/machinery/power/apc/proc/set_broken() // Aesthetically much better! - src.visible_message("[src]'s screen flickers with warnings briefly!") spawn(rand(2,5)) - src.visible_message("[src]'s screen suddenly explodes in rain of sparks and small debris!") + src.visible_message("[src]'s screen flickers suddenly, then explodes in a rain of sparks and small debris!") stat |= BROKEN operating = 0 update_icon()