From dba1d2eb2d27ade907ad3a6dd1600cea4a7028c7 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Sat, 12 Oct 2019 21:24:52 +0300 Subject: [PATCH] Fail-messages from notice-spans to warning-span. --- code/datums/action.dm | 2 +- code/game/objects/items/airlock_painter.dm | 4 ++-- code/game/objects/items/robot/robot_parts.dm | 6 +++--- code/game/objects/structures/ai_core.dm | 2 +- code/game/objects/structures/watercloset.dm | 4 ++-- code/modules/cargo/supplypod_beacon.dm | 2 +- .../food_and_drinks/kitchen_machinery/grill.dm | 2 +- .../mob/living/simple_animal/friendly/dog.dm | 6 +++--- .../living/simple_animal/hostile/giant_spider.dm | 2 +- .../research/xenobiology/xenobio_camera.dm | 16 ++++++++-------- code/modules/shuttle/computer.dm | 4 ++-- code/modules/surgery/organs/autosurgeon.dm | 10 +++++----- code/modules/vehicles/sealed.dm | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/code/datums/action.dm b/code/datums/action.dm index 5b6f8b9475a..8883f077511 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -542,7 +542,7 @@ return //Box closing from here on out. if(!isturf(owner.loc)) //Don't let the player use this to escape mechs/welded closets. - to_chat(owner, "You need more space to activate this implant.") + to_chat(owner, "You need more space to activate this implant!") return if(cooldown < world.time - 100) var/box = new boxtype(owner.drop_location()) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 2001413e55f..b05e40dd639 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -35,10 +35,10 @@ //because you're expecting user input. /obj/item/airlock_painter/proc/can_use(mob/user) if(!ink) - to_chat(user, "There is no toner cartridge installed in [src]!") + to_chat(user, "There is no toner cartridge installed in [src]!") return 0 else if(ink.charges < 1) - to_chat(user, "[src] is out of ink!") + to_chat(user, "[src] is out of ink!") return 0 else return 1 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 604c6679cc8..1b269a19568 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -97,7 +97,7 @@ head = null to_chat(user, "You disassemble the cyborg shell.") else - to_chat(user, "There is nothing to remove from the endoskeleton.") + to_chat(user, "There is nothing to remove from the endoskeleton!") update_icon() /obj/item/robot_suit/proc/put_in_hand_or_drop(mob/living/user, obj/item/I) //normal put_in_hands() drops the item ontop of the player, this drops it at the suit's loc @@ -112,7 +112,7 @@ return TRUE if(!chest) //can't remove a cell if there's no chest to remove it from. - to_chat(user, "[src] has no attached torso.") + to_chat(user, "[src] has no attached torso!") return var/obj/item/stock_parts/cell/temp_cell = user.is_holding_item_of_type(/obj/item/stock_parts/cell) @@ -131,7 +131,7 @@ to_chat(user, "You remove [chest.cell] from [src].") chest.cell = null else - to_chat(user, "The power cell slot in [src]'s torso is empty.") + to_chat(user, "The power cell slot in [src]'s torso is empty!") return to_chat(user, "You [chest.cell ? "replace [src]'s [chest.cell.name] with [temp_cell]" : "insert [temp_cell] into [src]"].") diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 6805c73b5a4..db1badc3983 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -336,7 +336,7 @@ That prevents a few funky behaviors. AI.battery = circuit.battery qdel(src) else //If for some reason you use an empty card on an empty AI terminal. - to_chat(user, "There is no AI loaded on this terminal!") + to_chat(user, "There is no AI loaded on this terminal.") /obj/item/circuitboard/aicore name = "AI core (AI Core Board)" //Well, duh, but best to be consistent diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index af0ffdb2988..e5250a7c0fe 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -153,7 +153,7 @@ else if(exposed) if(!hiddenitem) - to_chat(user, "There is nothing in the drain holder.") + to_chat(user, "There is nothing in the drain holder!") else if(ishuman(user)) user.put_in_hands(hiddenitem) @@ -167,7 +167,7 @@ /obj/structure/urinal/attackby(obj/item/I, mob/living/user, params) if(exposed) if (hiddenitem) - to_chat(user, "There is already something in the drain enclosure.") + to_chat(user, "There is already something in the drain enclosure!") return if(I.w_class > 1) to_chat(user, "[I] is too large for the drain enclosure.") diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 8ca30de9619..5da512cd822 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -81,7 +81,7 @@ if (express_console) unlink_console() else - to_chat(user, "There is no linked console!") + to_chat(user, "There is no linked console.") /obj/item/supplypod_beacon/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/pen)) //give a tag that is visible from the linked express console diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 9d06b3d9149..4755c3c2528 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -45,7 +45,7 @@ if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL))) return ..() else if(!grill_fuel) - to_chat(user, "There is not enough fuel.") + to_chat(user, "There is not enough fuel!") return else if(!grilled_item && user.transferItemToLoc(I, src)) grilled_item = I diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 4b686d72b3d..039fe5a45d8 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -178,7 +178,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from].") + to_chat(usr, "There is nothing to remove from its [remove_from]!") return if("back") if(inventory_back) @@ -187,7 +187,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from].") + to_chat(usr, "There is nothing to remove from its [remove_from]!") return if("collar") if(pcollar) @@ -624,7 +624,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "[src] already has a cute bow!") + to_chat(usr, "[src] already has a cute bow!") return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 26c58d06410..4431de1d189 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -91,7 +91,7 @@ if(spider_ask == "No" || !src || QDELETED(src)) return 1 if(key) - to_chat(user, "Someone else already took this spider.") + to_chat(user, "Someone else already took this spider!") return 1 key = user.key if(directive) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 06d806a6157..dc672d8c56e 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -242,9 +242,9 @@ food.LAssailant = C X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors - to_chat(owner, "[X] now has [X.monkeys] monkeys stored.") + to_chat(owner, "[X] now has [X.monkeys] monkeys stored.") else - to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") else to_chat(owner, "Target is not near a camera. Cannot proceed.") @@ -263,7 +263,7 @@ var/obj/machinery/monkey_recycler/recycler = X.connected_recycler if(!recycler) - to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.") + to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.") return if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/carbon/monkey/M in remote_eye.loc) @@ -273,7 +273,7 @@ X.monkeys += recycler.cube_production X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) - to_chat(owner, "[X] now has [X.monkeys] monkeys available.") + to_chat(owner, "[X] now has [X.monkeys] monkeys available.") else to_chat(owner, "Target is not near a camera. Cannot proceed.") @@ -444,9 +444,9 @@ food.LAssailant = C X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors - to_chat(C, "[X] now has [X.monkeys] monkeys stored.") + to_chat(C, "[X] now has [X.monkeys] monkeys stored.") else - to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") //Pick up monkey /obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M) @@ -458,7 +458,7 @@ var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(M.loc) if(!X.connected_recycler) - to_chat(C, "There is no connected monkey recycler. Use a multitool to link one.") + to_chat(C, "There is no connected monkey recycler. Use a multitool to link one.") return if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) if(!M.stat) @@ -468,4 +468,4 @@ X.monkeys += connected_recycler.cube_production X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) - to_chat(C, "[X] now has [X.monkeys] monkeys available.") + to_chat(C, "[X] now has [X.monkeys] monkeys available.") diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 7ee5a9eab75..b75362c3d4e 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -63,7 +63,7 @@ if(1) to_chat(usr, "Invalid shuttle requested.") else - to_chat(usr, "Unable to comply.") + to_chat(usr, "Unable to comply.") /obj/machinery/computer/shuttle/emag_act(mob/user) if(obj_flags & EMAGGED) @@ -74,4 +74,4 @@ /obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) - shuttleId = port.id \ No newline at end of file + shuttleId = port.id diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index 75deef2d49b..fe4e7965d21 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -24,10 +24,10 @@ /obj/item/autosurgeon/attack_self(mob/user)//when the object it used... if(!uses) - to_chat(user, "[src] has already been used. The tools are dull and won't reactivate.") + to_chat(user, "[src] has already been used. The tools are dull and won't reactivate.") return else if(!storedorgan) - to_chat(user, "[src] currently has no implant stored.") + to_chat(user, "[src] currently has no implant stored.") return storedorgan.Insert(user)//insert stored organ into the user user.visible_message("[user] presses a button on [src], and you hear a short mechanical noise.", "You feel a sharp sting as [src] plunges into your body.") @@ -45,10 +45,10 @@ /obj/item/autosurgeon/attackby(obj/item/I, mob/user, params) if(istype(I, organ_type)) if(storedorgan) - to_chat(user, "[src] already has an implant stored.") + to_chat(user, "[src] already has an implant stored.") return else if(!uses) - to_chat(user, "[src] has already been used up.") + to_chat(user, "[src] has already been used up.") return if(!user.transferItemToLoc(I, src)) return @@ -61,7 +61,7 @@ if(..()) return TRUE if(!storedorgan) - to_chat(user, "There's no implant in [src] for you to remove.") + to_chat(user, "There's no implant in [src] for you to remove!") else var/atom/drop_loc = user.drop_location() for(var/J in src) diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index e2d69fed344..6751ddfe358 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -79,7 +79,7 @@ /obj/vehicle/sealed/proc/remove_key(mob/user) if(!inserted_key) - to_chat(user, "There is no key in [src]!") + to_chat(user, "There is no key in [src]!") return if(!is_occupant(user) || !(occupants[user] & VEHICLE_CONTROL_DRIVE)) to_chat(user, "You must be driving [src] to remove [src]'s key!")