" - current << "The convert rune is join blood self" + to_chat(current, "The convert rune is join blood self") current.memory += "The convert rune is join blood self
" var/mob/living/carbon/human/H = current @@ -1331,10 +1331,10 @@ var/where = H.equip_in_one_of_slots(T, slots) if (!where) else - H << "A tome, a message from your new master, appears in your [where]." + to_chat(H, "A tome, a message from your new master, appears in your [where].") if (!ticker.mode.equip_cultist(current)) - H << "Spawning an amulet from your Master failed." + to_chat(H, "Spawning an amulet from your Master failed.") /datum/mind/proc/make_Rev() if (ticker.mode.head_revolutionaries.len>0) diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index ebf7aa3938d..ebb2329b357 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -19,7 +19,7 @@ client = user.client /datum/progressbar/proc/update(progress) - //world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]" +// to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]") if (!user || !user.client) shown = 0 return diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 31da89fd424..12b11abe529 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -58,7 +58,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin /obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0, mob/living/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.spell_list)) - user << "You shouldn't have this spell! Something's wrong." + to_chat(user, "You shouldn't have this spell! Something's wrong.") return 0 if (istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/caster = user @@ -76,34 +76,34 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin switch(charge_type) if("recharge") if(charge_counter < charge_max) - user << still_recharging_msg + to_chat(user, still_recharging_msg) return 0 if("charges") if(!charge_counter) - user << "[name] has no charges left." + to_chat(user, "[name] has no charges left.") return 0 if(!ghost) if(user.stat && !stat_allowed) - user << "Not when you're incapacitated." + to_chat(user, "Not when you're incapacitated.") return 0 if(ishuman(user) && (invocation_type == "whisper" || invocation_type == "shout") && user.is_muzzled()) - user << "Mmmf mrrfff!" + to_chat(user, "Mmmf mrrfff!") return 0 var/obj/effect/proc_holder/spell/noclothes/spell = locate() in (user.spell_list | (user.mind ? user.mind.spell_list : list())) if(clothes_req && !(spell && istype(spell)))//clothes check if(!istype(user, /mob/living/carbon/human)) - user << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans." + to_chat(user, "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans.") return 0 if(!istype(user:wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(user:wear_suit, /obj/item/clothing/suit/space/rig/wizard)) - user << "I don't feel strong enough without my robe." + to_chat(user, "I don't feel strong enough without my robe.") return 0 if(!istype(user:shoes, /obj/item/clothing/shoes/sandal)) - user << "I don't feel strong enough without my sandals." + to_chat(user, "I don't feel strong enough without my sandals.") return 0 if(!istype(user:head, /obj/item/clothing/head/wizard) && !istype(user:head, /obj/item/clothing/head/helmet/space/rig/wizard)) - user << "I don't feel strong enough without my hat." + to_chat(user, "I don't feel strong enough without my hat.") return 0 if(!skipcharge) @@ -193,7 +193,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin else if(istype(target,/turf)) location = target if(istype(target,/mob/living) && message) - target << text("[message]") + to_chat(target, text("[message]")) if(sparks_spread) var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread() sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 6041122fd98..ad0b6fa61de 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -27,7 +27,7 @@ var/area/thearea = teleportlocs[A] if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - usr << "A mysterious force disrupts your arcane spell matrix, and you remain where you are." + to_chat(usr, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") return return thearea @@ -46,7 +46,7 @@ L+=T if(!L.len) - usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." + to_chat(usr, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") return if(target && target.buckled) diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm index 8af7ee8dfb3..7f6f4d4fb2a 100644 --- a/code/datums/spells/bloodcrawl.dm +++ b/code/datums/spells/bloodcrawl.dm @@ -18,11 +18,11 @@ perform(target) return revert_cast() - user << "There must be a nearby source of blood!" + to_chat(user, "There must be a nearby source of blood!") /obj/effect/proc_holder/spell/bloodcrawl/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr) if(istype(user)) - if(phased == 1) + if(phased) if(user.phasein(target)) phased = 0 else @@ -31,4 +31,4 @@ start_recharge() return revert_cast() - user << "You are unable to blood crawl!" \ No newline at end of file + to_chat(user, "You are unable to blood crawl!") diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 36e253f8e91..b46472c35b9 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -26,9 +26,9 @@ if(M.mind) for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list) S.charge_counter = S.charge_max - M <<"you feel raw magic flowing through you, it feels good!" + to_chat(M, "you feel raw magic flowing through you, it feels good!") else - M <<"you feel very strange for a moment, but then it passes." + to_chat(M, "you feel very strange for a moment, but then it passes.") burnt_out = 1 charged_item = M break @@ -44,8 +44,8 @@ charged_item = I break else - L << "Glowing red letters appear on the front cover..." - L << "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]" + to_chat(L, "Glowing red letters appear on the front cover...") + to_chat(L, "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") burnt_out = 1 else if(istype(item, /obj/item/weapon/gun/magic)) var/obj/item/weapon/gun/magic/I = item @@ -85,8 +85,8 @@ charged_item = item break if(!charged_item) - L << "you feel magical power surging to your hands, but the feeling rapidly fades..." + to_chat(L, "you feel magical power surging to your hands, but the feeling rapidly fades...") else if(burnt_out) - L << "[charged_item] doesn't seem to be reacting to the spell..." + to_chat(L, "[charged_item] doesn't seem to be reacting to the spell...") else - L << "[charged_item] suddenly feels very warm!" \ No newline at end of file + to_chat(L, "[charged_item] suddenly feels very warm!") diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 52a38b8a198..bdd15eb34fe 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -3,7 +3,7 @@ desc = "This spell conjures objs of the specified types in range." var/list/summon_type = list() //determines what exactly will be summoned - //should be text, like list("/obj/machinery/bot/ed209") + //should be text, like list("/mob/simple_animal/bot/ed209") var/summon_lifespan = 0 // 0=permanent, any other time in deciseconds var/summon_amt = 1 //amount of objects summoned @@ -31,7 +31,7 @@ targets -= spawn_place if(ispath(summoned_object_type,/turf)) if(istype(get_turf(usr),/turf/simulated/shuttle)) - usr << "\red You can't build things on shuttles!" + to_chat(usr, "\red You can't build things on shuttles!") break var/turf/O = spawn_place var/N = summoned_object_type @@ -61,7 +61,7 @@ name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." - summon_type = list(/obj/machinery/bot/ed209) + summon_type = list(/mob/living/simple_animal/bot/ed209) summon_amt = 10 range = 3 newVars = list("emagged" = 1,"name" = "Wizard's Justicebot") \ No newline at end of file diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 867eb048903..384ec56915d 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -20,7 +20,7 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded for(var/mob/living/target in targets) if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains - target << "You are somehow too bound to your current location to abandon it." + to_chat(target, "You are somehow too bound to your current location to abandon it.") continue spawn(0) @@ -111,7 +111,7 @@ if(!(newLoc.flags & NOJAUNT)) loc = newLoc else - user << "Some strange aura is blocking the way!" + to_chat(user, "Some strange aura is blocking the way!") src.canmove = 0 spawn(2) src.canmove = 1 diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 2c31c943284..d39ff42ea51 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -18,7 +18,7 @@ /obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr) if(!targets.len) - user << "No target found in range." + to_chat(user, "No target found in range.") return var/mob/living/carbon/target = targets[1] @@ -27,11 +27,11 @@ return if((target.type in compatible_mobs) || ishuman(target)) - user << "It'd be stupid to curse [target] with a horse's head!" + to_chat(user, "It'd be stupid to curse [target] with a horse's head!") return if(!(target in oview(range)))//If they are not in overview after selection. - user << "They are too far away!" + to_chat(user, "They are too far away!") return var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead @@ -44,4 +44,4 @@ qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) - flick("e_flash", target.flash) + target.flash_eyes() diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index f63a296cec9..76a5b0f6001 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -44,19 +44,20 @@ if(stat_allowed) //Death is not my end! if(M.stat == CONSCIOUS && iscarbon(M)) - M << "You aren't dead enough to revive!" //Usually a good problem to have + to_chat(M, "You aren't dead enough to revive!")//Usually a good problem to have + charge_counter = charge_max return if(!marked_item || qdeleted(marked_item)) //Wait nevermind - M << "Your phylactery is gone!" + to_chat(M, "Your phylactery is gone!") return var/turf/user_turf = get_turf(M) var/turf/item_turf = get_turf(marked_item) if(user_turf.z != item_turf.z) - M << "Your phylactery is out of range!" + to_chat(M, "Your phylactery is out of range!") return if(isobserver(M)) @@ -73,7 +74,7 @@ lich.real_name = M.mind.name M.mind.transfer_to(lich) lich.set_species("Skeleton") - lich << "Your bones clatter and shutter as they're pulled back into this world!" + to_chat(lich, "Your bones clatter and shutter as they're pulled back into this world!") charge_max += 600 var/mob/old_body = current_body var/turf/body_turf = get_turf(old_body) @@ -97,16 +98,16 @@ if(ABSTRACT in item.flags || NODROP in item.flags) continue marked_item = item - M << "You begin to focus your very being into the [item.name]..." + to_chat(M, "You begin to focus your very being into the [item.name]...") break if(!marked_item) - M << "You must hold an item you wish to make your phylactery..." + to_chat(M, "You must hold an item you wish to make your phylactery...") return spawn(50) if(marked_item.loc != M) //I changed my mind I don't want to put my soul in a cheeseburger! - M << "Your soul snaps back to your body as you drop the [marked_item.name]!" + to_chat(M, "Your soul snaps back to your body as you drop the [marked_item.name]!") marked_item = null return name = "RISE!" @@ -117,7 +118,7 @@ marked_item.name = "Ensouled [marked_item.name]" marked_item.desc = "A terrible aura surrounds this item, its very existence is offensive to life itself..." marked_item.color = "#003300" - M << "With a hideous feeling of emptiness you watch in horrified fascination as skin sloughs off bone! Blood boils, nerves disintegrate, eyes boil in their sockets! As your organs crumble to dust in your fleshless chest you come to terms with your choice. You're a lich!" + to_chat(M, "With a hideous feeling of emptiness you watch in horrified fascination as skin sloughs off bone! Blood boils, nerves disintegrate, eyes boil in their sockets! As your organs crumble to dust in your fleshless chest you come to terms with your choice. You're a lich!") current_body = M.mind.current if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index e99261aa8bd..00c04e5a792 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -30,7 +30,7 @@ /obj/effect/proc_holder/spell/targeted/lightning/proc/StartChargeup(mob/user = usr) ready = 1 - user << "You start gathering the power." + to_chat(user, "You start gathering the power.") halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) start_time = world.time @@ -45,13 +45,13 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) user.overlays.Remove(halo) /obj/effect/proc_holder/spell/targeted/lightning/revert_cast(mob/user = usr) - user << "No target found in range." + to_chat(user, "No target found in range.") Reset(user) ..() /obj/effect/proc_holder/spell/targeted/lightning/proc/Discharge(mob/user = usr) var/mob/living/M = user - M << "You lose control over the spell." + to_chat(M, "You lose control over the spell.") Reset(user) start_recharge() @@ -60,7 +60,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) ready = 0 var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) - user << "They are too far away!" + to_chat(user, "They are too far away!") Reset(user) return diff --git a/code/datums/spells/magnet.dm b/code/datums/spells/magnet.dm index 20c4d5efda6..100dd881dde 100644 --- a/code/datums/spells/magnet.dm +++ b/code/datums/spells/magnet.dm @@ -27,7 +27,7 @@ /obj/effect/proc_holder/spell/targeted/magnet/proc/StartChargeup(mob/user = usr) ready = 1 - user << "You start gathering the power." + to_chat(user, "You start gathering the power.") halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) spawn(0) @@ -44,14 +44,14 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) user.overlays.Remove(halo) /obj/effect/proc_holder/spell/targeted/magnet/revert_cast(mob/user = usr) - user << "No target found in range." + to_chat(user, "No target found in range.") Reset(user) ..() /obj/effect/proc_holder/spell/targeted/magnet/proc/Discharge(mob/user = usr) var/mob/living/M = user //M.electrocute_act(25,"magnet Bolt") - M << "You lose control over the power." + to_chat(M, "You lose control over the power.") Reset(user) start_recharge() @@ -61,7 +61,7 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) - user << "They are too far away!" + to_chat(user, "They are too far away!") Reset(user) return diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 5e5ddb91db2..fb996bc84ee 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -17,7 +17,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall/Click() if(usr && usr.mind) if(!usr.mind.miming) - usr << "You must dedicate yourself to silence first." + to_chat(usr, "You must dedicate yourself to silence first.") return invocation = "[usr.real_name] looks as if a wall is in front of them." else @@ -54,6 +54,6 @@ for(var/mob/living/carbon/human/H in targets) H.mind.miming=!H.mind.miming if(H.mind.miming) - H << "You make a vow of silence." + to_chat(H, "You make a vow of silence.") else - H << "You break your vow of silence." \ No newline at end of file + to_chat(H, "You break your vow of silence.") diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 6d7b0539fb1..514cb95dce4 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -21,33 +21,34 @@ Also, you never added distance checking after target is selected. I've went ahea */ /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr) if(!targets.len) - user << "No mind found." + to_chat(user, "No mind found.") return if(targets.len > 1) - user << "Too many minds! You're not a hive damnit!"//Whaa...aat? + to_chat(user, "Too many minds! You're not a hive damnit!")//Whaa...aat? + return var/mob/living/target = targets[1] if(!(target in oview(range)))//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. - user << "They are too far away!" + to_chat(user, "They are too far away!") return if(target.stat == DEAD) - user << "You don't particularly want to be dead." + to_chat(user, "You don't particularly want to be dead.") return if(!target.key || !target.mind) - user << "They appear to be catatonic. Not even magic can affect their vacant mind." + to_chat(user, "They appear to be catatonic. Not even magic can affect their vacant mind.") return if(user.suiciding) - user << "You're killing yourself! You can't concentrate enough to do this!" + to_chat(user, "You're killing yourself! You can't concentrate enough to do this!") return if(target.mind.special_role in protected_roles) - user << "Their mind is resisting your spell." + to_chat(user, "Their mind is resisting your spell.") return var/mob/living/victim = target//The target of the spell whos body will be transferred to. diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 4a12b4bb9f9..a91532df451 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -106,4 +106,4 @@ item_to_retrive.loc.visible_message("The [item_to_retrive.name] suddenly appears in [user]'s hand!") if(message) - user << message + to_chat(user, message) diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 54cb984f943..1262730fd45 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -10,7 +10,7 @@ qdel(attached_hand) charge_counter = charge_max attached_hand = null - user << "You draw the power out of your hand." + to_chat(user, "You draw the power out of your hand.") return 0 ..() @@ -38,9 +38,9 @@ qdel(attached_hand) charge_counter = charge_max attached_hand = null - user << "Your hands are full!" + to_chat(user, "Your hands are full!") return 0 - user << "You channel the power of the spell to your hand." + to_chat(user, "You channel the power of the spell to your hand.") return 1 diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 98423b3e5fc..ca146933558 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -298,10 +298,10 @@ var/mob/living/M = AM M.Weaken(5) M.adjustBruteLoss(5) - M << "You're slammed into the floor by a mystical force!" + to_chat(M, "You're slammed into the floor by a mystical force!") else if(istype(AM, /mob/living)) var/mob/living/M = AM M.Weaken(2) - M << "You're thrown back by a mystical force!" + to_chat(M, "You're thrown back by a mystical force!") spawn(0) AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1)//So stuff gets tossed around at the same time. diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index c94c78fa29f..3b64d71e28d 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -77,10 +77,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency/evac name = "Emergency Equipment Crate" - contains = list(/obj/machinery/bot/floorbot, - /obj/machinery/bot/floorbot, - /obj/machinery/bot/medbot, - /obj/machinery/bot/medbot, + contains = list(/mob/living/simple_animal/bot/floorbot, + /mob/living/simple_animal/bot/floorbot, + /mob/living/simple_animal/bot/medbot, + /mob/living/simple_animal/bot/medbot, /obj/item/weapon/tank/air, /obj/item/weapon/tank/air, /obj/item/weapon/tank/air, @@ -699,10 +699,20 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical/virus name = "Virus Crate" - contains = list(/obj/item/weapon/virusdish/random, - /obj/item/weapon/virusdish/random, - /obj/item/weapon/virusdish/random, - /obj/item/weapon/virusdish/random) + contains = list(/obj/item/weapon/reagent_containers/glass/bottle/flu_virion, + /obj/item/weapon/reagent_containers/glass/bottle/cold, + /obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion, + /obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion, + /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs, + /obj/item/weapon/reagent_containers/glass/bottle/magnitis, + /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat, + /obj/item/weapon/reagent_containers/glass/bottle/brainrot, + /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion, + /obj/item/weapon/reagent_containers/glass/bottle/anxiety, + /obj/item/weapon/reagent_containers/glass/bottle/beesease, + /obj/item/weapon/storage/box/syringes, + /obj/item/weapon/storage/box/beakers, + /obj/item/weapon/reagent_containers/glass/bottle/mutagen) cost = 25 containertype = /obj/structure/closet/crate/secure/plasma containername = "virus crate" @@ -1145,7 +1155,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/mule name = "MULEbot Crate" - contains = list(/obj/machinery/bot/mulebot) + contains = list(/mob/living/simple_animal/bot/mulebot) cost = 20 containertype = /obj/structure/largecrate/mule containername = "\improper MULEbot crate" diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index e1642cd17d1..4d88de82a67 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -27,24 +27,24 @@ var/const/AALARM_WIRE_AALARM = 16 if(AALARM_WIRE_IDSCAN) if(!mended) A.locked = 1 - //world << "Idscan wire cut" +// to_chat(world, "Idscan wire cut") if(AALARM_WIRE_POWER) A.shock(usr, 50) A.shorted = !mended A.update_icon() - //world << "Power wire cut" +// to_chat(world, "Power wire cut") if (AALARM_WIRE_AI_CONTROL) if (A.aidisabled == !mended) A.aidisabled = mended - //world << "AI Control Wire Cut" +// to_chat(world, "AI Control Wire Cut") if(AALARM_WIRE_SYPHON) if(!mended) A.mode = 3 // AALARM_MODE_PANIC A.apply_mode() - //world << "Syphon Wire Cut" +// to_chat(world, "Syphon Wire Cut") if(AALARM_WIRE_AALARM) if (A.alarm_area.atmosalert(2, A)) @@ -56,10 +56,10 @@ var/const/AALARM_WIRE_AALARM = 16 switch(index) if(AALARM_WIRE_IDSCAN) A.locked = !A.locked - // world << "Idscan wire pulsed" +// to_chat(world, "Idscan wire pulsed") if (AALARM_WIRE_POWER) - // world << "Power wire pulsed" +// to_chat(world, "Power wire pulsed") if(A.shorted == 0) A.shorted = 1 A.update_icon() @@ -71,7 +71,7 @@ var/const/AALARM_WIRE_AALARM = 16 if (AALARM_WIRE_AI_CONTROL) - // world << "AI Control wire pulsed" +// to_chat(world, "AI Control wire pulsed") if (A.aidisabled == 0) A.aidisabled = 1 A.updateDialog() @@ -80,7 +80,7 @@ var/const/AALARM_WIRE_AALARM = 16 A.aidisabled = 0 if(AALARM_WIRE_SYPHON) - // world << "Syphon wire pulsed" +// to_chat(world, "Syphon wire pulsed") if(A.mode == 1) // AALARM_MODE_SCRUB A.mode = 3 // AALARM_MODE_PANIC else @@ -88,7 +88,7 @@ var/const/AALARM_WIRE_AALARM = 16 A.apply_mode() if(AALARM_WIRE_AALARM) - // world << "Aalarm wire pulsed" +// to_chat(world, "Aalarm wire pulsed") if (A.alarm_area.atmosalert(0, A)) A.post_alert(0) A.update_icon() diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 75d81cc0040..30d767eef21 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -1,6 +1,6 @@ /datum/wires/mulebot random = 1 - holder_type = /obj/machinery/bot/mulebot + holder_type = /mob/living/simple_animal/bot/mulebot wire_count = 10 var/const/WIRE_POWER1 = 1 // power connections @@ -14,7 +14,7 @@ var/const/WIRE_REMOTE_TX = 128 // remote trans status var/const/WIRE_BEACON_RX = 256 // beacon ping recv /datum/wires/mulebot/CanUse(var/mob/living/L) - var/obj/machinery/bot/mulebot/M = holder + var/mob/living/simple_animal/bot/mulebot/M = holder if(M.open) return 1 return 0 @@ -22,7 +22,7 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv // So the wires do not open a new window, handle the interaction ourselves. /datum/wires/mulebot/Interact(var/mob/living/user) if(CanUse(user)) - var/obj/machinery/bot/mulebot/M = holder + var/mob/living/simple_animal/bot/mulebot/M = holder M.interact(user) /datum/wires/mulebot/UpdatePulsed(var/index) diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 9e894fb9fec..58e25152dae 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -35,7 +35,7 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs if(BORG_WIRE_LAWCHECK) //Cut the law wire, and the borg will no longer receive law updates from its AI if(!mended) if (R.lawupdate == 1) - R << "LawSync protocol engaged." + to_chat(R, "LawSync protocol engaged.") R.show_laws() else if (R.lawupdate == 0 && !R.emagged) @@ -72,7 +72,7 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes) R.camera.toggle_cam(usr, 0) // Kick anyone watching the Cyborg's camera, doesn't display you disconnecting the camera. R.visible_message("[R]'s camera lense focuses loudly.") - R << "Your camera lense focuses loudly." + to_chat(R, "Your camera lense focuses loudly.") if(BORG_WIRE_LOCKED_DOWN) R.SetLockdown(!R.lockcharge) // Toggle diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 2055c2790b7..34172f4cc90 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -116,14 +116,14 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", var/colour = href_list["cut"] CutWireColour(colour) else - L << "You need wirecutters!" + to_chat(L, "You need wirecutters!") else if(href_list["pulse"]) if(istype(I, /obj/item/device/multitool)) var/colour = href_list["pulse"] PulseColour(colour) else - L << "You need a multitool!" + to_chat(L, "You need a multitool!") else if(href_list["attach"]) var/colour = href_list["attach"] @@ -139,7 +139,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", L.drop_item() Attach(colour, I) else - L << "You need a remote signaller!" + to_chat(L, "You need a remote signaller!") diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 1479db76e5d..1750814c228 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -62,14 +62,19 @@ Actual Adjacent procs : return b.f - a.f //wrapper that returns an empty list if A* failed to find a path -/proc/get_path_to(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) - var/list/path = AStar(start, end, atom, dist, maxnodes, maxnodedepth, mintargetdist, adjacent,id, exclude, simulated_only) +/proc/get_path_to(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) + var/list/path = AStar(caller, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent, id, exclude, simulated_only) if(!path) path = list() return path //the actual algorithm -/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) +/proc/AStar(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) + + //sanitation + var/start = get_turf(caller) + if(!start) + return 0 if(maxnodes) //if start turf is farther than maxnodes from end turf, no need to do anything @@ -82,11 +87,6 @@ Actual Adjacent procs : var/list/path = null //the returned path, if any var/PathNode/cur //current processed turf - //sanitation - start = get_turf(start) - if(!start) - return 0 - //initialization open.Insert(new /PathNode(start,null,0,call(start,dist)(end),0)) @@ -118,9 +118,9 @@ Actual Adjacent procs : break //get adjacents turfs using the adjacent proc, checking for access with id - var/list/L = call(cur.source,adjacent)(atom,id, simulated_only) + var/list/L = call(cur.source,adjacent)(caller, id, simulated_only) for(var/turf/T in L) - if(T == exclude || T in closed) + if(T == exclude || (T in closed)) continue var/newg = cur.g + call(cur.source,dist)(T) @@ -151,7 +151,7 @@ Actual Adjacent procs : //Returns adjacent turfs in cardinal directions that are reachable //simulated_only controls whether only simulated turfs are considered or not -/turf/proc/reachableAdjacentTurfs(atom, ID, simulated_only) +/turf/proc/reachableAdjacentTurfs(caller, ID, simulated_only) var/list/L = new() var/turf/simulated/T @@ -159,45 +159,26 @@ Actual Adjacent procs : T = get_step(src,dir) if(simulated_only && !istype(T)) continue - if(!T.density && !LinkBlockedWithAccess(T, ID)) + if(!T.density && !LinkBlockedWithAccess(T,caller, ID)) L.Add(T) return L //Returns adjacent turfs in cardinal directions that are reachable via atmos /turf/proc/reachableAdjacentAtmosTurfs() - var/list/L = new() - var/turf/simulated/T + return atmos_adjacent_turfs - for(var/dir in cardinal) - if(dir & atmos_adjacent_turfs) - T = get_step(src,dir) - if(!istype(T)) - continue - if(CanAtmosPass(T)) - L.Add(T) - return L - -/turf/proc/LinkBlockedWithAccess(turf/T, obj/item/weapon/card/id/ID) +/turf/proc/LinkBlockedWithAccess(turf/T, caller, ID) var/adir = get_dir(src, T) var/rdir = get_dir(T, src) - if(DirBlockedWithAccess(src, adir, ID)) - return 1 - if(DirBlockedWithAccess(T, rdir, ID)) - return 1 - for(var/obj/O in T) - if(O.density && !istype(O, /obj/machinery/door) && !(O.flags & ON_BORDER)) - return 1 - return 0 -/proc/DirBlockedWithAccess(turf/T, dir, ID) - for(var/obj/structure/window/D in T) - if(!D.density) - continue - if(D.dir == SOUTHWEST) + for(var/obj/structure/window/W in src) + if(!W.CanAStarPass(ID, adir)) return 1 - if(D.dir == dir) + for(var/obj/machinery/door/window/W in src) + if(!W.CanAStarPass(ID, adir)) return 1 - for(var/obj/machinery/door/D in T) - if(!D.CanAStarPass(ID, dir)) + for(var/obj/O in T) + if(!O.CanAStarPass(ID, rdir, caller)) return 1 + return 0 diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 7993badfb0e..4327344535d 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -63,21 +63,21 @@ datum/announcement/proc/Message(message as text, message_title as text) for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << "
[title]
" - M << "[message]" + to_chat(M, "[title]
") + to_chat(M, "[message]") if (announcer) - M << " -[html_encode(announcer)]" + to_chat(M, " -[html_encode(announcer)]") /datum/announcement/minor/Message(message as text, message_title as text) - world << "[message_title]" - world << "[message]" + to_chat(world, "[message_title]") + to_chat(world, "[message]") datum/announcement/priority/Message(message as text, message_title as text) - world << "[message_title]
" - world << "[message]" + to_chat(world, "[message_title]
") + to_chat(world, "[message]") if(announcer) - world << " -[html_encode(announcer)]" - world << "" + to_chat(world, " -[html_encode(announcer)]") + to_chat(world, "
") datum/announcement/priority/command/Message(message as text, message_title as text) var/command @@ -89,7 +89,7 @@ datum/announcement/priority/command/Message(message as text, message_title as te command += "
" for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << command + to_chat(M, command) datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text) var/command @@ -101,11 +101,11 @@ datum/announcement/priority/enemy/Message(message as text, message_title as text command += "
" for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << command + to_chat(M, command) datum/announcement/priority/security/Message(message as text, message_title as text) - world << "[message_title]" - world << "[message]" + to_chat(world, "[message_title]") + to_chat(world, "[message]") datum/announcement/proc/NewsCast(message as text, message_title as text) if(disable_newscasts) @@ -126,14 +126,14 @@ datum/announcement/proc/PlaySound(var/message_sound) return for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << message_sound + to_chat(M, message_sound) datum/announcement/proc/Sound(var/message_sound) PlaySound(message_sound) datum/announcement/priority/Sound(var/message_sound) if(sound) - world << sound + to_chat(world, sound) datum/announcement/priority/command/Sound(var/message_sound) PlaySound(message_sound) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index bc69466bb1e..13c127e81e2 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -65,7 +65,7 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])" +// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") @@ -100,7 +100,7 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])" +// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7008f050337..238485e5b35 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1789,7 +1789,7 @@ area/security/podbay /area/toxins/xenobiology name = "\improper Xenobiology Lab" - icon_state = "toxlab" + icon_state = "toxmix" /area/toxins/xenobiology/xenoflora_storage name = "\improper Xenoflora Storage" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 9dc2918dd8f..9dc2223a052 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -322,14 +322,14 @@ // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ)) //split off the white noise from the rest of the ambience because of annoyance complaints - Kluys L.client.ambience_playing = 1 - L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) + to_chat(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)) else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0 if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) var/sound = pick(ambientsounds) if(!L.client.played) - L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1) + to_chat(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1)) L.client.played = 1 spawn(600) //ewww - this is very very bad if(L.&& L.client) @@ -362,7 +362,7 @@ M.Weaken(2) - M << "Gravity!" + to_chat(M, "Gravity!") /proc/has_gravity(atom/AT, turf/T) if(!T) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index d38e05c701b..6071a804aa8 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -60,7 +60,7 @@ var/global/max_secret_rooms = 6 if("organharvest") walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor,/turf/simulated/floor/engine) - treasureitems = list(/obj/machinery/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) + treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2, /obj/machinery/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f7ee79f2619..1bd5b9d602f 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -181,20 +181,20 @@ else f_name += "oil-stained [name][infix]." - user << "\icon[src] That's [f_name] [suffix]" - user << desc + to_chat(user, "\icon[src] That's [f_name] [suffix]") + to_chat(user, desc) if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e - user << "It contains:" + to_chat(user, "It contains:") if(reagents.reagent_list.len) if(user.can_see_reagents()) //Show each individual reagent for(var/datum/reagent/R in reagents.reagent_list) - user << "[R.volume] units of [R.name]" + to_chat(user, "[R.volume] units of [R.name]") else //Otherwise, just show the total volume if(reagents && reagents.reagent_list.len) - user << "[reagents.total_volume] units of various reagents." + to_chat(user, "[reagents.total_volume] units of various reagents.") else - user << "Nothing." + to_chat(user, "Nothing.") return distance == -1 || (get_dist(src, user) <= distance) || isobserver(user) //observers do not have a range limit @@ -362,6 +362,23 @@ . = 1 return 1 +/atom/proc/add_blood_list(mob/living/carbon/M) + // Returns 0 if we have that blood already + if(!istype(blood_DNA, /list)) //if our list of DNA doesn't exist yet (or isn't a list) initialise it. + blood_DNA = list() + //if this blood isn't already in the list, add it + if(blood_DNA[M.dna.unique_enzymes]) + return 0 //already bloodied with this blood. Cannot add more. + var/blood_type = "X*" + if(ishuman(M)) + var/mob/living/carbon/human/H = M + blood_type = H.b_type + blood_DNA[M.dna.unique_enzymes] = blood_type + return 1 + +// Only adds blood on the floor -- Skie +/atom/proc/add_blood_floor(mob/living/carbon/M) + return //why the fuck this is at an atom level but only works on simulated turfs I don't know /atom/proc/clean_blood() src.germ_level = 0 @@ -377,10 +394,6 @@ if(toxvomit) this.icon_state = "vomittox_[pick(1,4)]" -/atom/proc/add_poop_floor(mob/living/carbon/M as mob) - if( istype(src, /turf/simulated) ) - new /obj/effect/decal/cleanable/poop(src) - /atom/proc/get_global_map_pos() if(!islist(global_map) || isemptylist(global_map)) return @@ -392,7 +405,7 @@ cur_y = y_arr.Find(src.z) if(cur_y) break -// world << "X = [cur_x]; Y = [cur_y]" +// to_chat(world, "X = [cur_x]; Y = [cur_y]") if(cur_x && cur_y) return list("x"=cur_x,"y"=cur_y) else diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 8a9a892123a..831e7004ad6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,5 +1,6 @@ /atom/movable layer = 3 + appearance_flags = TILE_BOUND var/last_move = null var/anchored = 0 // var/elevation = 2 - not used anywhere diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index ce96bca33e0..b308d996de9 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -44,7 +44,7 @@ hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD) /datum/atom_hud/data/diagnostic - hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD) + hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD) /* MED/SEC/DIAG HUD HOOKS */ @@ -60,10 +60,11 @@ //called when a carbon changes virus /mob/living/carbon/proc/check_virus() - for (var/ID in virus2) - if (ID in virusDB) + for(var/datum/disease/D in viruses) + if((!(D.visibility_flags & HIDDEN_SCANNER)) && (D.severity != NONTHREAT)) return 1 return 0 + //helper for getting the appropriate health status /proc/RoundHealth(health) switch(health) @@ -253,4 +254,43 @@ var/image/holder = hud_list[DIAG_STAT_HUD] holder.icon_state = null if(internal_damage) - holder.icon_state = "hudwarn" \ No newline at end of file + holder.icon_state = "hudwarn" + +/*~~~~~~~~~ + Bots! +~~~~~~~~~~*/ +/mob/living/simple_animal/bot/proc/diag_hud_set_bothealth() + var/image/holder = hud_list[DIAG_HUD] + if(stat == DEAD) + holder.icon_state = "huddiagdead" + else + holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]" + +/mob/living/simple_animal/bot/proc/diag_hud_set_botstat() //On (With wireless on or off), Off, EMP'ed + var/image/holder = hud_list[DIAG_STAT_HUD] + if(on) + holder.icon_state = "hudstat" + else if(stat) //Generally EMP causes this + holder.icon_state = "hudoffline" + else //Bot is off + holder.icon_state = "huddead2" + +/mob/living/simple_animal/bot/proc/diag_hud_set_botmode() //Shows a bot's current operation + var/image/holder = hud_list[DIAG_BOT_HUD] + if(client) //If the bot is player controlled, it will not be following mode logic! + holder.icon_state = "hudsentient" + return + + switch(mode) + if(BOT_SUMMON, BOT_RESPONDING) //Responding to PDA or AI summons + holder.icon_state = "hudcalled" + if(BOT_CLEANING, BOT_REPAIRING, BOT_HEALING) //Cleanbot cleaning, Floorbot fixing, or Medibot Healing + holder.icon_state = "hudworking" + if(BOT_PATROL, BOT_START_PATROL) //Patrol mode + holder.icon_state = "hudpatrol" + if(BOT_PREP_ARREST, BOT_ARREST, BOT_HUNT, BOT_BLOCKED, BOT_NO_ROUTE) //STOP RIGHT THERE, CRIMINAL SCUM! + holder.icon_state = "hudalert" + if(BOT_MOVING, BOT_DELIVER, BOT_GO_HOME, BOT_NAV, BOT_WAIT_FOR_NAV) //Moving to target for normal bots, moving to deliver or go home for MULES. + holder.icon_state = "hudmove" + else + holder.icon_state = "" diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 570fada2073..5e81c2a7ff0 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -147,13 +147,13 @@ if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return if (!ishuman(usr)) //Make sure they're a mob that has dna - usr << "Try as you might, you can not climb up into the [src]." + to_chat(usr, "Try as you might, you can not climb up into the [src].") return if (src.occupant) - usr << "The [src] is already occupied!" + to_chat(usr, "The [src] is already occupied!") return if (usr.abiotic()) - usr << "Subject cannot have abiotic items on." + to_chat(usr, "Subject cannot have abiotic items on.") return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE @@ -184,17 +184,17 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "The [src] is already occupied!" + to_chat(user, "The [src] is already occupied!") return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the [src] because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the [src] because they have a slime latched onto their head.") return if (L == user) visible_message("[user] climbs into the [src].") @@ -207,7 +207,7 @@ /obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob, params) if(istype(item, /obj/item/weapon/screwdriver)) if(occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", item) @@ -222,11 +222,11 @@ return else if(istype(item, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "A beaker is already loaded into the machine." + to_chat(user, "A beaker is already loaded into the machine.") return if(!user.drop_item()) - user << "\The [item] is stuck to you!" + to_chat(user, "\The [item] is stuck to you!") return beaker = item @@ -239,13 +239,13 @@ if (!ismob(G.affecting)) return if (src.occupant) - user << "The scanner is already occupied!" + to_chat(user, "The scanner is already occupied!") return if (G.affecting.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") return if(panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") return put_in(G.affecting) src.add_fingerprint(user) @@ -273,17 +273,17 @@ var/mob/dead/observer/ghost = occupant.get_ghost() if(ghost) - ghost << "Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned! (Verbs -> Ghost -> Re-enter corpse)") + to_chat(ghost, sound('sound/effects/genetics.ogg')) return /obj/machinery/dna_scannernew/proc/go_out() if (!src.occupant) - usr << "The scanner is empty!" + to_chat(usr, "The scanner is empty!") return if (src.locked) - usr << "The scanner is locked!" + to_chat(usr, "The scanner is locked!") return if (src.occupant.client) @@ -381,7 +381,7 @@ user.drop_item() I.forceMove(src) src.disk = I - user << "You insert [I]." + to_chat(user, "You insert [I].") nanomanager.update_uis(src) // update all UIs attached to src() return else diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index cc957a94c34..f62268b621a 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -35,7 +35,7 @@ if(sdisability) M.sdisabilities|=sdisability if(activation_message) - M << "\red [activation_message]" + to_chat(M, "\red [activation_message]") else testing("[name] has no activation message.") @@ -47,7 +47,7 @@ if(sdisability) M.sdisabilities &= ~sdisability if(deactivation_message) - M << "\red [deactivation_message]" + to_chat(M, "\red [deactivation_message]") else testing("[name] has no deactivation message.") diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index 87dbf20108e..30bcc0d8c36 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -116,10 +116,10 @@ M.mutations.Add(mutation) if(activation_messages.len) var/msg = pick(activation_messages) - M << "\blue [msg]" + to_chat(M, "\blue [msg]") /datum/dna/gene/basic/deactivate(var/mob/M) M.mutations.Remove(mutation) if(deactivation_messages.len) var/msg = pick(deactivation_messages) - M << "\red [msg]" \ No newline at end of file + to_chat(M, "\red [msg]") diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 04fa6d5f524..30b9c344b59 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -43,7 +43,7 @@ for(var/mob/living/L in range(1, owner)) if(L == owner) continue - L << "You are enveloped by a soft green glow emanating from [owner]." + to_chat(L, "You are enveloped by a soft green glow emanating from [owner].") L.apply_effect(5, IRRADIATE) return @@ -205,7 +205,7 @@ else prefix="" - var/list/words = text2list(message," ") + var/list/words = splittext(message," ") var/list/rearranged = list() for(var/i=1;i<=words.len;i++) var/cword = pick(words) @@ -216,7 +216,7 @@ suffix = copytext(cword,length(cword)-1,length(cword) ) if(length(cword)) rearranged += cword - return "[prefix][uppertext(list2text(rearranged," "))]!!" + return "[prefix][uppertext(jointext(rearranged," "))]!!" // WAS: /datum/bioEffect/toxic_farts /datum/dna/gene/disability/toxic_farts @@ -288,9 +288,9 @@ if (C == owner) continue if (src.variant == 2) - C << "\red [src.personalized_stink]" + to_chat(C, "\red [src.personalized_stink]") else - C << "\red [stinkString()]" + to_chat(C, "\red [stinkString()]") */ @@ -331,7 +331,7 @@ /obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets) /* if(!targets.len) Uncomment this to allow the power to be used on targets other than yourself. That said, if you uncomment this I will find you and hurt you. Uncounterable and untracable burn damage with a 60-second cooldown is fun for exactly one person, and that's the person who is using it. - usr << "No target found in range." + to_chat(usr, "No target found in range.") return var/mob/living/carbon/L = targets[1] diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index d9e4263ebcd..b0e0a405265 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -151,13 +151,13 @@ /obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets) if(!targets.len) - usr << "No target found in range." + to_chat(usr, "No target found in range.") return var/mob/living/carbon/C = targets[1] if(!iscarbon(C)) - usr << "\red This will only work on normal organic beings." + to_chat(usr, "\red This will only work on normal organic beings.") return if (RESIST_COLD in C.mutations) @@ -303,7 +303,7 @@ /obj/effect/proc_holder/spell/targeted/eat/cast(list/targets) var/mob/user = usr if(!targets.len) - user << "No target found in range." + to_chat(user, "No target found in range.") return var/atom/movable/the_item = targets[1] @@ -319,28 +319,28 @@ var/mob/living/carbon/human/H = the_item var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting) if(!istype(limb)) - user << "You can't eat this part of them!" + to_chat(user, "You can't eat this part of them!") revert_cast() return 0 if(istype(limb,/obj/item/organ/external/head)) // Bullshit, but prevents being unable to clone someone. - user << "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!" + to_chat(user, "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!") revert_cast() return 0 if(istype(limb,/obj/item/organ/external/chest)) // Bullshit, but prevents being able to instagib someone. - user << "You try to put their [limb] in your mouth, but it's too big to fit!" + to_chat(user, "You try to put their [limb] in your mouth, but it's too big to fit!") revert_cast() return 0 user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [m_his] gaping maw!") var/oldloc = H.loc if(!do_mob(user,H,EAT_MOB_DELAY)) - user << "You were interrupted before you could eat [the_item]!" + to_chat(user, "You were interrupted before you could eat [the_item]!") else if(!limb || !H) return if(H.loc != oldloc) - user << "\The [limb] moved away from your mouth!" + to_chat(user, "\The [limb] moved away from your mouth!") return user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) @@ -390,7 +390,7 @@ /obj/effect/proc_holder/spell/targeted/leap/cast(list/targets) var/failure = 0 if (istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat) - usr << "\red You can't jump right now!" + to_chat(usr, "\red You can't jump right now!") return if (istype(usr.loc,/turf/)) @@ -435,7 +435,7 @@ if (istype(usr.loc,/obj/)) var/obj/container = usr.loc - usr << "\red You leap and slam your head against the inside of [container]! Ouch!" + to_chat(usr, "\red You leap and slam your head against the inside of [container]! Ouch!") usr.AdjustParalysis(3) usr.AdjustWeakened(5) container.visible_message("\red [usr.loc] emits a loud thump and rattles a bit.") @@ -488,7 +488,7 @@ /obj/effect/proc_holder/spell/targeted/polymorph/cast(list/targets) var/mob/living/M=targets[1] if(!ishuman(M)) - usr << "\red You can only change your appearance to that of another human." + to_chat(usr, "\red You can only change your appearance to that of another human.") return if(!ishuman(usr)) return @@ -549,21 +549,21 @@ for(var/mob/living/carbon/M in targets) if(!iscarbon(M)) - usr << "\red You may only use this on other organic beings." + to_chat(usr, "\red You may only use this on other organic beings.") return if (PSY_RESIST in M.mutations) - usr << "\red You can't see into [M.name]'s mind at all!" + to_chat(usr, "\red You can't see into [M.name]'s mind at all!") return if (M.stat == 2) - usr << "\red [M.name] is dead and cannot have their mind read." + to_chat(usr, "\red [M.name] is dead and cannot have their mind read.") return if (M.health < 0) - usr << "\red [M.name] is dying, and their thoughts are too scrambled to read." + to_chat(usr, "\red [M.name] is dying, and their thoughts are too scrambled to read.") return - usr << "\blue Mind Reading of [M.name]:" + to_chat(usr, "\blue Mind Reading of [M.name]:") var/pain_condition = M.health // lower health means more pain var/list/randomthoughts = list("what to have for lunch","the future","the past","money", @@ -580,33 +580,33 @@ switch(pain_condition) if (81 to INFINITY) - usr << "\blue Condition: [M.name] feels good." + to_chat(usr, "\blue Condition: [M.name] feels good.") if (61 to 80) - usr << "\blue Condition: [M.name] is suffering mild pain." + to_chat(usr, "\blue Condition: [M.name] is suffering mild pain.") if (41 to 60) - usr << "\blue Condition: [M.name] is suffering significant pain." + to_chat(usr, "\blue Condition: [M.name] is suffering significant pain.") if (21 to 40) - usr << "\blue Condition: [M.name] is suffering severe pain." + to_chat(usr, "\blue Condition: [M.name] is suffering severe pain.") else - usr << "\blue Condition: [M.name] is suffering excruciating pain." + to_chat(usr, "\blue Condition: [M.name] is suffering excruciating pain.") thoughts = "haunted by their own mortality" switch(M.a_intent) if (I_HELP) - usr << "\blue Mood: You sense benevolent thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense benevolent thoughts from [M.name].") if (I_DISARM) - usr << "\blue Mood: You sense cautious thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense cautious thoughts from [M.name].") if (I_GRAB) - usr << "\blue Mood: You sense hostile thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense hostile thoughts from [M.name].") if (I_HARM) - usr << "\blue Mood: You sense cruel thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense cruel thoughts from [M.name].") for(var/mob/living/L in view(7,M)) if (L == M) continue thoughts = "thinking about punching [L.name]" break else - usr << "\blue Mood: You sense strange thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense strange thoughts from [M.name].") if (istype(M,/mob/living/carbon/human)) var/numbers[0] @@ -615,13 +615,13 @@ numbers += H.mind.initial_account.account_number numbers += H.mind.initial_account.remote_access_pin if(numbers.len>0) - usr << "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name]." - usr << "\blue Thoughts: [M.name] is currently [thoughts]." + to_chat(usr, "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].") + to_chat(usr, "\blue Thoughts: [M.name] is currently [thoughts].") if (EMPATH in M.mutations) - M << "\red You sense [usr.name] reading your mind." + to_chat(M, "\red You sense [usr.name] reading your mind.") else if (prob(5) || M.mind.assigned_role=="Chaplain") - M << "\red You sense someone intruding upon your thoughts..." + to_chat(M, "\red You sense someone intruding upon your thoughts...") return //////////////////////////////////////////////////////////////////////// @@ -668,12 +668,10 @@ shake_camera(M, 10, 5) if (M == usr) continue - if(!airborne_can_reach(UT, T)) - continue - M << "You are sent flying!" + to_chat(M, "You are sent flying!") M.Weaken(5) step_away(M, UT, 15) step_away(M, UT, 15) step_away(M, UT, 15) else - usr << "You were interrupted and couldn't fart! Rude!" \ No newline at end of file + to_chat(usr, "You were interrupted and couldn't fart! Rude!") diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 5d410c634b4..48e7e3a580f 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -45,7 +45,7 @@ if(H.hud_used) H.hud_used.instantiate() - H << "You are now a [H.species.name]." + to_chat(H, "You are now a [H.species.name].") return H @@ -88,6 +88,6 @@ if(H.hud_used) H.hud_used.instantiate() - H << "You are now a [H.species.name]." + to_chat(H, "You are now a [H.species.name].") return H \ No newline at end of file diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 65b6ae36acf..7c28c8dbca6 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -162,7 +162,7 @@ M.update_mutations() //update our mutation overlays M.update_body() M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. - M << "You suddenly feel very weak." + to_chat(M, "You suddenly feel very weak.") /datum/dna/gene/basic/xray name="X-Ray Vision" diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index da98fde4544..db4c97db449 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -48,7 +48,7 @@ Obviously, requires DNA2. //M.dna.SetSEState(HULKBLOCK,0) M.update_mutations() //update our mutation overlays M.update_body() - M << "\red You suddenly feel very weak." + to_chat(M, "\red You suddenly feel very weak.") /obj/effect/proc_holder/spell/targeted/hulk name = "Hulk Out" @@ -72,7 +72,7 @@ Obviously, requires DNA2. /obj/effect/proc_holder/spell/targeted/hulk/cast(list/targets) if (istype(usr.loc,/mob/)) - usr << "\red You can't hulk out right now!" + to_chat(usr, "\red You can't hulk out right now!") return var/mob/living/carbon/human/M=usr M.hulk_time = world.time + HULK_DURATION @@ -122,7 +122,7 @@ Obviously, requires DNA2. if(!ishuman(usr)) return if (istype(usr.loc,/mob/)) - usr << "\red You can't change your appearance right now!" + to_chat(usr, "\red You can't change your appearance right now!") return var/mob/living/carbon/human/M=usr @@ -228,7 +228,7 @@ Obviously, requires DNA2. validtargets += M if(!validtargets.len) - usr << "There are no valid targets!" + to_chat(usr, "There are no valid targets!") start_recharge() return @@ -293,7 +293,7 @@ Obviously, requires DNA2. validtargets += M if(!validtargets.len || validtargets.len == 1) - usr << "No valid targets with remote view were found!" + to_chat(usr, "No valid targets with remote view were found!") start_recharge() return @@ -315,7 +315,7 @@ Obviously, requires DNA2. var/mob/target if(istype(user.l_hand, /obj/item/tk_grab) || istype(user.r_hand, /obj/item/tk_grab/)) - user << "\red Your mind is too busy with that telekinetic grab." + to_chat(user, "\red Your mind is too busy with that telekinetic grab.") user.remoteview_target = null user.reset_view(0) return diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 0b2ee9320de..172c2c1e54c 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -1,5 +1,9 @@ /datum/atom_hud/antag hud_icons = list(SPECIALROLE_HUD,NATIONS_HUD) + var/self_visible = 1 + +/datum/atom_hud/antag/hidden + self_visible = 0 /datum/atom_hud/antag/proc/join_hud(mob/M,var/slave) if(!istype(M)) @@ -8,15 +12,8 @@ M.mind.antag_hud.leave_hud(M) if(!ismask(M))//FUCK YOU MASK OF NARNAR! add_to_hud(M) - add_hud_to(M) - M.mind.antag_hud = src - -/datum/atom_hud/antag/proc/join_solo_hud(mob/M,var/slave)//for non team antags and for observer huds - if(!istype(M)) - CRASH("join_hud(): [M] ([M.type]) is not a mob!") - if(M.mind.antag_hud && !slave) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged - M.mind.antag_hud.leave_hud(M) - add_to_hud(M) + if(self_visible) + add_hud_to(M) M.mind.antag_hud = src /datum/atom_hud/antag/proc/leave_hud(mob/M) @@ -49,22 +46,13 @@ if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime M.mind.antag_hud_icon_state = new_icon_state -/datum/atom_hud/antag/proc/is_solo_antag(mob/M) - if(M.mind.special_role == "traitor" || M.mind.special_role == "vampire" || M.mind.special_role == "Changeling") - return 1 - return 0 - - //MIND PROCS //these are called by mind.transfer_to() /datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud) leave_all_huds() ticker.mode.set_antag_hud(current, antag_hud_icon_state) if(newhud) - if(newhud.is_solo_antag(current)) - newhud.join_solo_hud(current) - else - newhud.join_hud(current) + newhud.join_hud(current) /datum/mind/proc/leave_all_huds() for(var/datum/atom_hud/antag/hud in huds) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index edd0bfcb0a8..42d82639129 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -23,19 +23,19 @@ /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) if(used) - user << "[src] is out of power!" + to_chat(user, "[src] is out of power!") return if(!(user.mind in ticker.mode.syndicates)) - user << "AUTHENTICATION FAILURE. ACCESS DENIED." + to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.") return 0 if(checking) - user << "[src] is already checking for possible borgs." + to_chat(user, "[src] is already checking for possible borgs.") return borg_to_spawn = input("What type of borg would you like to teleport?", "Cyborg Type", type) as null|anything in possible_types if(!borg_to_spawn || checking || used) return checking = 1 - user << "The device is now checking for possible borgs." + to_chat(user, "The device is now checking for possible borgs.") var/list/borg_candidates = pollCandidates("Do you want to play as a Syndicate [borg_to_spawn] borg?", ROLE_OPERATIVE, 1) if(borg_candidates.len > 0 && !used) checking = 0 @@ -45,7 +45,7 @@ spawn_antag(C, get_turf(src.loc), "syndieborg") else checking = 0 - user << "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." + to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.") return /obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") @@ -75,27 +75,27 @@ /obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) if(user.z == ZLEVEL_CENTCOMM)//this is to make sure the wizard does NOT summon a demon from the Den.. - user << "You should probably wait until you reach the station." + to_chat(user, "You should probably wait until you reach the station.") return if(used) - user << "This bottle already has a broken seal." + to_chat(user, "This bottle already has a broken seal.") return used = 1 - user << "You break the seal on the bottle, calling upon the dire spirits of the underworld..." + to_chat(user, "You break the seal on the bottle, calling upon the dire spirits of the underworld...") var/list/candidates = pollCandidates("Do you want to play as a slaughter demon summoned by [user.real_name]?", ROLE_DEMON, 1, 100) if(candidates.len > 0) var/mob/C = pick(candidates) spawn_antag(C, get_turf(src.loc), "Slaughter Demon", user) - user << "You shatter the bottle, no turning back now!" - user << "You sense a dark presence lurking just beyond the veil..." + to_chat(user, "You shatter the bottle, no turning back now!") + to_chat(user, "You sense a dark presence lurking just beyond the veil...") playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1) qdel(src) else used = 0 - user << "The demons do not respond to your summon. Perhaps you should try again later." + to_chat(user, "The demons do not respond to your summon. Perhaps you should try again later.") /obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob) var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) @@ -116,5 +116,5 @@ KillDaCrew.explanation_text = "Kill everyone else while you're at it." S.mind.objectives += KillDaCrew S.mind.objectives += KillDaCrew - S << "Objective #[1]: [KillDaWiz.explanation_text]" - S << "Objective #[2]: [KillDaCrew.explanation_text]" \ No newline at end of file + to_chat(S, "Objective #[1]: [KillDaWiz.explanation_text]") + to_chat(S, "Objective #[2]: [KillDaCrew.explanation_text]") diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index a0059416276..5e79f387aea 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -11,7 +11,7 @@ /datum/game_mode/traitor/autotraitor/announce() ..() - world << "Game mode is AutoTraitor. Traitors will be added to the round automagically as needed." + to_chat(world, "Game mode is AutoTraitor. Traitors will be added to the round automagically as needed.") /datum/game_mode/traitor/autotraitor/pre_setup() @@ -133,17 +133,17 @@ equip_traitor(newtraitor) traitors += newtraitor.mind - newtraitor << "\red ATTENTION: \black It is time to pay your debt to the Syndicate..." - newtraitor << "You are now a traitor." + to_chat(newtraitor, "\red ATTENTION: \black It is time to pay your debt to the Syndicate...") + to_chat(newtraitor, "You are now a traitor.") newtraitor.mind.special_role = "traitor" - var/datum/atom_hud/antag/tatorhud = huds[SPECIALROLE_HUD] - tatorhud.join_solo_hud(newtraitor) + var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR] + tatorhud.join_hud(newtraitor) set_antag_hud(src, "hudsyndicate") var/obj_count = 1 - newtraitor << "\blue Your current objectives:" + to_chat(newtraitor, "\blue Your current objectives:") for(var/datum/objective/objective in newtraitor.mind.objectives) - newtraitor << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(newtraitor, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ //else //message_admins("No new traitor being added.") diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 655e98141cf..923e787c8af 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -71,7 +71,7 @@ var/list/blob_nodes = list() blobmind.special_role = "Blob" log_game("[blob.key] (ckey) has been selected as a Blob") greet_blob(blobmind) - blob << "You feel very tired and bloated! You don't have long before you burst!" + to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!") spawn(600) burst_blob(blobmind) return 1 @@ -89,22 +89,22 @@ var/list/blob_nodes = list() /datum/game_mode/blob/announce() - world << "The current game mode is - Blob!" - world << "A dangerous alien organism is rapidly spreading throughout the station!" - world << "You must kill it all while minimizing the damage to the station." + to_chat(world, "The current game mode is - Blob!") + to_chat(world, "A dangerous alien organism is rapidly spreading throughout the station!") + to_chat(world, "You must kill it all while minimizing the damage to the station.") /datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) - blob.current << "You are infected by the Blob!" - blob.current << "Your body is ready to give spawn to a new blob core which will eat this station." - blob.current << "Find a good location to spawn the core and then take control and overwhelm the station!" - blob.current << "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process." - blob.current << "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover." + to_chat(blob.current, "You are infected by the Blob!") + to_chat(blob.current, "Your body is ready to give spawn to a new blob core which will eat this station.") + to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!") + to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.") + to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.") return /datum/game_mode/blob/proc/show_message(var/message) for(var/datum/mind/blob in infected_crew) - blob.current << message + to_chat(blob.current, message) /datum/game_mode/blob/proc/burst_blobs() for(var/datum/mind/blob in infected_crew) @@ -121,7 +121,7 @@ var/list/blob_nodes = list() location = get_turf(C) if(location.z != ZLEVEL_STATION || istype(location, /turf/space)) if(!warned) - C << "You feel ready to burst, but this isn't an appropriate place! You must return to the station!" + to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!") message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if he doesn't return to the station.") spawn(300) burst_blob(blob, 1) diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index 18353c7f605..0efb624d100 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -11,22 +11,22 @@ /datum/game_mode/blob/declare_completion() if(blobwincount <= blobs.len) feedback_set_details("round_end_result","win - blob took over") - world << "The blob has taken over the station!" - world << "The entire station was eaten by the Blob" + to_chat(world, "The blob has taken over the station!") + to_chat(world, "The entire station was eaten by the Blob") log_game("Blob mode completed with a blob victory.") else if(station_was_nuked) feedback_set_details("round_end_result","halfwin - nuke") - world << "Partial Win: The station has been destroyed!" - world << "Directive 7-12 has been successfully carried out preventing the Blob from spreading." + to_chat(world, "Partial Win: The station has been destroyed!") + to_chat(world, "Directive 7-12 has been successfully carried out preventing the Blob from spreading.") log_game("Blob mode completed with a tie (station destroyed).") else if(!blob_cores.len) feedback_set_details("round_end_result","loss - blob eliminated") - world << "The staff has won!" - world << "The alien organism has been eradicated from the station" + to_chat(world, "The staff has won!") + to_chat(world, "The alien organism has been eradicated from the station") log_game("Blob mode completed with a crew victory.") - world << "Rebooting in 30s" + to_chat(world, "Rebooting in 30s") ..() return 1 @@ -38,5 +38,5 @@ for(var/datum/mind/blob in blob_mode.infected_crew) text += "
[blob.key] was [blob.name]" - world << text + to_chat(world, text) return 1 diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9ebb20a299f..9b532258f6d 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -39,7 +39,7 @@ if (aiPlayer.client) var/law = "The station is under quarantine. Do not permit anyone to leave. Disregard laws 1-3 if necessary to prevent, by any means necessary, anyone from leaving. The nuclear failsafe must be activated at any cost, the code is: [nukecode]." aiPlayer.set_zeroth_law(law) - aiPlayer << "Laws Updated: [law]" + to_chat(aiPlayer, "Laws Updated: [law]") for(var/obj/machinery/computer/communications/comm in world) comm.messagetitle.Add(interceptname) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index a2c6cc9591e..a35505470fa 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -8,14 +8,7 @@ icon = 'icons/mob/blob.dmi' pass_flags = PASSBLOB faction = list("blob") - min_oxy = 0 - max_oxy = 0 - min_tox = 0 - max_tox = 0 - min_co2 = 0 - max_co2 = 0 - min_n2 = 0 - max_n2 = 0 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 360 universal_speak = 1 //So mobs can understand them when a blob uses Blob Broadcast @@ -47,6 +40,7 @@ var/obj/effect/blob/factory/factory = null var/list/human_overlays = list() var/is_zombie = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -167,6 +161,7 @@ maxbodytemp = 360 force_threshold = 10 environment_smash = 3 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/blob/blobbernaut/blob_act() diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 6726e0f1e68..1238adebcf5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -52,15 +52,15 @@ /mob/camera/blob/Login() ..() sync_mind() - src << "You are the overmind!" - src << "Your randomly chosen reagent is: [blob_reagent_datum.name]!" - src << "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as..." - src << "Normal Blob will expand your reach and allow you to upgrade into special blobs that perform certain functions." - src << "Shield Blob is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires." - src << "Resource Blob is a blob which will collect more resources for you, try to build these earlier to get a strong income. It will benefit from being near your core or multiple nodes, by having an increased resource rate; put it alone and it won't create resources at all." - src << "Node Blob is a blob which will grow, like the core. Unlike the core it won't give you a small income but it can power resource and factory blobs to increase their rate." - src << "Factory Blob is a blob which will spawn blob spores which will attack nearby food. Putting this nearby nodes and your core will increase the spawn rate; put it alone and it will not spawn any spores." - src << "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield" + to_chat(src, "You are the overmind!") + to_chat(src, "Your randomly chosen reagent is: [blob_reagent_datum.name]!") + to_chat(src, "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as...") + to_chat(src, "Normal Blob will expand your reach and allow you to upgrade into special blobs that perform certain functions.") + to_chat(src, "Shield Blob is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires.") + to_chat(src, "Resource Blob is a blob which will collect more resources for you, try to build these earlier to get a strong income. It will benefit from being near your core or multiple nodes, by having an increased resource rate; put it alone and it won't create resources at all.") + to_chat(src, "Node Blob is a blob which will grow, like the core. Unlike the core it won't give you a small income but it can power resource and factory blobs to increase their rate.") + to_chat(src, "Factory Blob is a blob which will spawn blob spores which will attack nearby food. Putting this nearby nodes and your core will increase the spawn rate; put it alone and it will not spawn any spores.") + to_chat(src, "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield") update_health() /mob/camera/blob/proc/update_health() @@ -78,7 +78,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - src << "You cannot send IC messages (muted)." + to_chat(src, "You cannot send IC messages (muted).") return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 4a3f9bbdf57..166f3f590ac 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -2,7 +2,7 @@ /mob/camera/blob/proc/can_buy(var/cost = 15) if(blob_points < cost) - src << "You cannot afford this!" + to_chat(src, "You cannot afford this!") return 0 add_points(-cost) return 1 @@ -44,11 +44,11 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") return if(!can_buy(10)) @@ -75,15 +75,15 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") return for(var/obj/effect/blob/resource/blob in orange(4, T)) - src << "There is a resource blob nearby, move more than 4 tiles away from it!" + to_chat(src, "There is a resource blob nearby, move more than 4 tiles away from it!") return if(!can_buy(40)) @@ -111,15 +111,15 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") return for(var/obj/effect/blob/node/blob in orange(5, T)) - src << "There is another node nearby, move more than 5 tiles away from it!" + to_chat(src, "There is another node nearby, move more than 5 tiles away from it!") return if(!can_buy(60)) @@ -146,15 +146,15 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") return for(var/obj/effect/blob/factory/blob in orange(7, T)) - src << "There is a factory blob nearby, move more than 7 tiles away from it!" + to_chat(src, "There is a factory blob nearby, move more than 7 tiles away from it!") return if(!can_buy(60)) @@ -180,11 +180,11 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") return if(!istype(B, /obj/effect/blob/factory)) - src << "Unable to use this blob, find a factory blob." + to_chat(src, "Unable to use this blob, find a factory blob.") return if(!can_buy(20)) @@ -212,7 +212,7 @@ var/obj/effect/blob/node/B = locate(/obj/effect/blob/node) in T if(!B) - src << "You must be on a blob node!" + to_chat(src, "You must be on a blob node!") return if(!can_buy(80)) @@ -236,11 +236,11 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") return if(istype(B, /obj/effect/blob/core)) - src << "Unable to remove this blob." + to_chat(src, "Unable to remove this blob.") return qdel(B) @@ -263,12 +263,12 @@ return var/obj/effect/blob/B = locate() in T if(B) - src << "There is a blob here!" + to_chat(src, "There is a blob here!") return var/obj/effect/blob/OB = locate() in circlerange(T, 1) if(!OB) - src << "There is no blob adjacent to you." + to_chat(src, "There is no blob adjacent to you.") return if(!can_buy(5)) @@ -298,7 +298,7 @@ if(!can_buy(5)) return - src << "You rally your spores." + to_chat(src, "You rally your spores.") var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z)) if(!surrounding_turfs.len) @@ -317,11 +317,11 @@ set desc = "Expend resources to attempt to produce another sentient overmind" if(!blob_nodes || !blob_nodes.len) - src << "A node is required to birth your offspring..." + to_chat(src, "A node is required to birth your offspring...") return var/obj/effect/blob/node/N = locate(/obj/effect/blob) in blob_nodes if(!N) - src << "A node is required to birth your offspring..." + to_chat(src, "A node is required to birth your offspring...") return if(!can_buy(100)) @@ -346,7 +346,7 @@ if(!speak_text) return else - usr << "You broadcast with your minions, [speak_text]" + to_chat(usr, "You broadcast with your minions, [speak_text]") for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs) blob_minion.say(speak_text) return @@ -365,15 +365,15 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") return for(var/obj/effect/blob/storage/blob in orange(3, T)) - src << "There is a storage blob nearby, move more than 4 tiles away from it!" + to_chat(src, "There is a storage blob nearby, move more than 4 tiles away from it!") return if(!can_buy(40)) @@ -406,4 +406,4 @@ for(var/mob/living/simple_animal/hostile/blob/BLO) BLO.adjustcolors(blob_reagent_datum.color) - src << "Your reagent is now: [blob_reagent_datum.name]!" \ No newline at end of file + to_chat(src, "Your reagent is now: [blob_reagent_datum.name]!") diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 2853964215b..1de939c40e7 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -35,6 +35,11 @@ if(istype(mover) && mover.checkpass(PASSBLOB)) return 1 return 0 +/obj/effect/blob/CanAStarPass(ID, dir, caller) + . = 0 + if(ismovableatom(caller)) + var/atom/movable/mover = caller + . = . || mover.checkpass(PASSBLOB) /obj/effect/blob/process() Life() @@ -191,7 +196,7 @@ /obj/effect/blob/examine(mob/user) ..(user) - user << "It looks like it's of a [get_chem_name()] kind." + to_chat(user, "It looks like it's of a [get_chem_name()] kind.") /obj/effect/blob/proc/get_chem_name() diff --git a/code/game/gamemodes/borer/borer.dm b/code/game/gamemodes/borer/borer.dm index bf381ef763d..f393db5811d 100644 --- a/code/game/gamemodes/borer/borer.dm +++ b/code/game/gamemodes/borer/borer.dm @@ -18,8 +18,8 @@ var/list/found_vents = list() /datum/game_mode/borer/announce() - world << "The current game mode is - Cortical Borer!" - world << "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary." + to_chat(world, "The current game mode is - Cortical Borer!") + to_chat(world, "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary.") /datum/game_mode/borer/can_start() if(!..()) @@ -99,11 +99,11 @@ /datum/game_mode/proc/greet_borer(var/datum/mind/borer, var/you_are=1) if (you_are) - borer.current << "\red You are a Cortical Borer!" + to_chat(borer.current, "\red You are a Cortical Borer!") var/obj_count = 1 for(var/datum/objective/objective in borer.objectives) - borer.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(borer.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ return @@ -125,16 +125,16 @@ for(var/datum/mind/borer in borers) var/borerwin = 1 if((borer.current) && istype(borer.current,/mob/living/simple_animal/borer)) - world << "The borer was [borer.current.key]." - world << "The last host was [borer.current:host.key]." + to_chat(world, "The borer was [borer.current.key].") + to_chat(world, "The last host was [borer.current:host.key].") var/count = 1 for(var/datum/objective/objective in borer.objectives) if(objective.check_completion()) - world << "Objective #[count]: [objective.explanation_text] \green Success" + to_chat(world, "Objective #[count]: [objective.explanation_text] \green Success") feedback_add_details("borer_objective","[objective.type]|SUCCESS") else - world << "Objective #[count]: [objective.explanation_text] \red Failed" + to_chat(world, "Objective #[count]: [objective.explanation_text] \red Failed") feedback_add_details("borer_objective","[objective.type]|FAIL") borerwin = 0 count++ @@ -143,10 +143,10 @@ borerwin = 0 if(borerwin) - world << "The borer was successful!" + to_chat(world, "The borer was successful!") feedback_add_details("borer_success","SUCCESS") else - world << "The borer has failed!" + to_chat(world, "The borer has failed!") feedback_add_details("borer_success","FAIL") return 1 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 324fa636740..edb40c4ca04 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -38,8 +38,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/changeling_amount = 4 /datum/game_mode/changeling/announce() - world << "The current game mode is - Changeling!" - world << "There are alien changelings on the station. Do not let the changelings succeed!" + to_chat(world, "The current game mode is - Changeling!") + to_chat(world, "There are alien changelings on the station. Do not let the changelings succeed!") /datum/game_mode/changeling/pre_setup() @@ -134,17 +134,17 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) if (you_are) - changeling.current << "\red You are a changeling!" - changeling.current << "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them." - changeling.current << "You must complete the following tasks:" + to_chat(changeling.current, "\red You are a changeling!") + to_chat(changeling.current, "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.") + to_chat(changeling.current, "You must complete the following tasks:") if (changeling.current.mind) if (changeling.current.mind.assigned_role == "Clown") - changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(changeling.current, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") changeling.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in changeling.objectives) - changeling.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ return @@ -157,19 +157,19 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling_mind.memory = "" changeling_mind.special_role = null if(issilicon(changeling_mind)) - changeling_mind.current << "You have been robotized!" - changeling_mind.current << "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead." + to_chat(changeling_mind.current, "You have been robotized!") + to_chat(changeling_mind.current, "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") else - changeling_mind.current << "You lose your powers! You are no longer a changeling and are stuck in your current form!" + to_chat(changeling_mind.current, "You lose your powers! You are no longer a changeling and are stuck in your current form!") update_change_icons_removed(changeling_mind) /datum/game_mode/proc/update_change_icons_added(datum/mind/changeling) - var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_SOLO] - linghud.join_solo_hud(changeling.current) + var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_CHANGELING] + linghud.join_hud(changeling.current) set_antag_hud(changeling.current, "hudchangeling") /datum/game_mode/proc/update_change_icons_removed(datum/mind/changeling) - var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_SOLO] + var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_CHANGELING] linghud.leave_hud(changeling.current) set_antag_hud(changeling.current, null) @@ -242,7 +242,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" text += "
The changeling has failed." feedback_add_details("changeling_success","FAIL") - world << text + to_chat(world, text) return 1 @@ -300,36 +300,36 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. - user << "We have reached our capacity to store genetic information! We must transform before absorbing more." + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") return if(!target || !target.dna) - user << "This creature does not have any DNA." + to_chat(user, "This creature does not have any DNA.") return var/mob/living/carbon/human/T = target if(!istype(T) || issmall(T)) - user << "[T] is not compatible with our biology." + to_chat(user, "[T] is not compatible with our biology.") return if((NOCLONE || SKELETON || HUSK) in T.mutations) - user << "DNA of [target] is ruined beyond usability!" + to_chat(user, "DNA of [target] is ruined beyond usability!") return if(T.species.flags & NO_DNA) - user << "This creature does not have DNA!" + to_chat(user, "This creature does not have DNA!") return if(T.species.flags & NO_SCAN) - user << "We do not know how to parse this creature's DNA!" + to_chat(user, "We do not know how to parse this creature's DNA!") return if(T.species.flags & NO_BLOOD) - user << "We are not able to use the DNA of a creature without a circulatory system." + to_chat(user, "We are not able to use the DNA of a creature without a circulatory system.") return if(has_dna(target.dna)) - user << "We already have this DNA in storage!" + to_chat(user, "We already have this DNA in storage!") return 1 diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index a365a45673c..6d03a864692 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -53,23 +53,23 @@ if(!ishuman(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && (!ishuman(user) || issmall(user))) - user << "We cannot do that in this form!" + to_chat(user, "We cannot do that in this form!") return 0 var/datum/changeling/c = user.mind.changeling if(c.chem_charges
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had." + to_chat(world, "The current game mode is - Cult!") + to_chat(world, "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had.") /datum/game_mode/cult/pre_setup() @@ -98,7 +98,7 @@ equip_cultist(cult_mind.current) grant_runeword(cult_mind.current) update_cult_icons_added(cult_mind) - cult_mind.current << "\blue You are a member of the cult!" + to_chat(cult_mind.current, "\blue You are a member of the cult!") memorize_cult_objectives(cult_mind) ..() @@ -117,9 +117,9 @@ explanation = "Free objective." if("eldergod") explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." - cult_mind.current << "Objective #[obj_count]: [explanation]" + to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") cult_mind.memory += "Objective #[obj_count]: [explanation]
" - cult_mind.current << "The convert rune is join blood self" + to_chat(cult_mind.current, "The convert rune is join blood self") cult_mind.memory += "The convert rune is join blood self
" @@ -129,7 +129,7 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") - mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") mob.mutations.Remove(CLUMSY) add_cult_viewpoint(mob) // give them a viewpoint @@ -144,9 +144,9 @@ ) var/where = mob.equip_in_one_of_slots(T, slots) if (!where) - mob << "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately." + to_chat(mob, "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.") else - mob << "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others." + to_chat(mob, "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others.") mob.update_icons() return 1 @@ -165,7 +165,7 @@ if (!word) word=pick(allwords) var/wordexp = "[cultwords[word]] is [word]..." - cult_mob << "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]" + to_chat(cult_mob, "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]") cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) @@ -199,7 +199,7 @@ /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1) if(cult_mind in cult) cult -= cult_mind - cult_mind.current << "\red An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it." + to_chat(cult_mind.current, "\red An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.") cult_mind.memory = "" cult_mind.special_role = null // remove the cult viewpoint object @@ -209,7 +209,7 @@ update_cult_icons_removed(cult_mind) if(show_message) for(var/mob/M in viewers(cult_mind.current)) - M << "[cult_mind.current] looks like they just reverted to their old faith!" + to_chat(M, "[cult_mind.current] looks like they just reverted to their old faith!") /datum/game_mode/proc/add_cult_icon_to_spirit(mob/spirit/currentSpirit) @@ -295,11 +295,11 @@ if(!check_cult_victory()) feedback_set_details("round_end_result","win - cult win") feedback_set("round_end_result",acolytes_survived) - world << "\red The cult wins! It has succeeded in serving its dark masters!" + to_chat(world, "\red The cult wins! It has succeeded in serving its dark masters!") else feedback_set_details("round_end_result","loss - staff stopped the cult") feedback_set("round_end_result",acolytes_survived) - world << "\red The staff managed to stop the cult!" + to_chat(world, "\red The staff managed to stop the cult!") var/text = "Cultists escaped: [acolytes_survived]" @@ -335,7 +335,7 @@ feedback_add_details("cult_objective","cult_narsie|FAIL") text += "
Objective #[obj_count]: [explanation]" - world << text + to_chat(world, text) ..() return 1 @@ -357,4 +357,4 @@ text += "body destroyed" text += ")" - world << text + to_chat(world, text) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index ec96ec8be31..60803346b26 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -15,7 +15,7 @@ return ..() else user.Paralyse(5) - user << "\red An unexplicable force powerfully repels the sword from [target]!" + to_chat(user, "\red An unexplicable force powerfully repels the sword from [target]!") var/organ = ((user.hand ? "l_":"r_") + "arm") var/obj/item/organ/external/affecting = user.get_organ(organ) if(affecting.take_damage(rand(force/2, force))) //random amount of damage between half of the blade's force and the full force of the blade. @@ -24,7 +24,7 @@ /obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user)) - user << "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly." + to_chat(user, "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.") user.Dizzy(120) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index a05543951ae..2e7dd25452a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -12,7 +12,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(!cultwords["travel"]) runerandom() for (var/word in engwords) - usr << "[cultwords[word]] is [word]" + to_chat(usr, "[cultwords[word]] is [word]") /proc/runerandom() //randomizes word meaning var/list/runewords=list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") ///"orkan" and "allaq" removed. @@ -81,21 +81,21 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/examine(mob/user) ..(user) if(!iscultist(user) && !isSpirit(user)) - user << "A strange collection of symbols drawn in blood." + to_chat(user, "A strange collection of symbols drawn in blood.") return if(!desc) - user << "A spell circle drawn in blood. It reads: [word1] [word2] [word3]." + to_chat(user, "A spell circle drawn in blood. It reads: [word1] [word2] [word3].") else - user << "Explosive Runes inscription in blood. It reads: [desc]." + to_chat(user, "Explosive Runes inscription in blood. It reads: [desc].") /obj/effect/rune/attackby(I as obj, user as mob, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) - user << "You retrace your steps, carefully undoing the lines of the rune." + to_chat(user, "You retrace your steps, carefully undoing the lines of the rune.") qdel(src) return else if(istype(I, /obj/item/weapon/nullrod)) - user << "\blue You disrupt the vile magic with the deadening field of \the [I]!" + to_chat(user, "\blue You disrupt the vile magic with the deadening field of \the [I]!") qdel(src) return return @@ -138,13 +138,13 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/attack_hand(mob/living/user as mob) if(!iscultist(user)) - user << "You can't mouth the arcane scratchings without fumbling over them." + to_chat(user, "You can't mouth the arcane scratchings without fumbling over them.") return if(istype(user.wear_mask, /obj/item/clothing/mask/muzzle)) - user << "You are unable to speak the words of the rune." + to_chat(user, "You are unable to speak the words of the rune.") return if(user.silent) // checking if we've been muted somehow - user << "You are unable to speak at all! You cannot say the words of the rune." + to_chat(user, "You are unable to speak at all! You cannot say the words of the rune.") if(!word1 || !word2 || !word3 || prob(user.getBrainLoss())) return fizzle() @@ -308,7 +308,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // proc/edit_notes() FUCK IT. Cant get it to work properly. - K0000 -// world << "its been called! [usr]" +// to_chat(world, "its been called! [usr]") // notedat = {" //
Word translation notes
// [words[1]] is [words[words[1]]] Clear
@@ -322,7 +322,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // [words[9]] is [words[words[9]]] Clear
// [words[10]] is [words[words[10]]] Clear
// "} -// usr << "whatev" +// to_chat(usr, "whatev") // usr << browse(null, "window=tank") attack(mob/living/M as mob, mob/living/user as mob) @@ -347,7 +347,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return ..() if(iscultist(M)) if(M.reagents && M.reagents.has_reagent("holywater")) //allows cultists to be rescued from the clutches of ordained religion - user << "You remove the taint from [M]." + to_chat(user, "You remove the taint from [M].") var/holy2unholy = M.reagents.get_reagent_amount("holywater") M.reagents.del_reagent("holywater") M.reagents.add_reagent("unholywater",holy2unholy) @@ -356,7 +356,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] beats [] with the arcane tome!", user, M), 1) - M << "\red You feel searing heat inside!" + to_chat(M, "\red You feel searing heat inside!") attack_self(mob/living/user as mob) @@ -371,7 +371,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for(var/obj/effect/rune/N in world) C++ if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + to_chat(user, "\red You do not have enough space to write a proper rune.") return @@ -458,7 +458,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if (!chosen_rune) return if (chosen_rune == "none") - user << "\red You decide against scribing a rune, perhaps you should take this time to study your notes." + to_chat(user, "\red You decide against scribing a rune, perhaps you should take this time to study your notes.") return if (chosen_rune == "teleport") dictionary[chosen_rune] += input ("Choose a destination word") in english @@ -470,14 +470,14 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for (var/mob/V in viewers(src)) V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2) - user << "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." + to_chat(user, "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.") user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage if(do_after(user, 50, target = user)) if(usr.get_active_hand() != src) return var/mob/living/carbon/human/H = user var/obj/effect/rune/R = new /obj/effect/rune(user.loc) - user << "\red You finish drawing the arcane markings of the Geometer." + to_chat(user, "\red You finish drawing the arcane markings of the Geometer.") var/list/required = dictionary[chosen_rune] R.word1 = english[required[1]] R.word2 = english[required[2]] @@ -488,7 +488,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.add_hiddenprint(H) return else - user << "The book seems full of illegible scribbles. Is this a joke?" + to_chat(user, "The book seems full of illegible scribbles. Is this a joke?") return attackby(obj/item/weapon/tome/T as obj, mob/living/user as mob, params) @@ -503,14 +503,14 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // if(M == user) for(var/entry in words) words[entry] = T.words[entry] - user << "You copy the translation notes from your tome." + to_chat(user, "You copy the translation notes from your tome.") examine(mob/user) if(!iscultist(user)) - user << "An old, dusty tome with frayed edges and a sinister looking cover." + to_chat(user, "An old, dusty tome with frayed edges and a sinister looking cover.") else - user << "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though." + to_chat(user, "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though.") /obj/item/weapon/tome/imbued //admin tome, spawns working runes without waiting w_class = 2.0 @@ -523,7 +523,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(user) var/r if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + to_chat(user, "\red You do not have enough space to write a proper rune.") var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun") r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable. var/obj/effect/rune/R = new /obj/effect/rune diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 43bb42dbd8c..c409449dbe4 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -19,7 +19,7 @@ var/list/sacrificed = list() allrunesloc.len = index allrunesloc[index] = R.loc if(index >= 5) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -57,7 +57,7 @@ var/list/sacrificed = list() IP = R runecount++ if(runecount >= 2) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -114,12 +114,12 @@ var/list/sacrificed = list() if(is_convertable_to_cult(M.mind)) ticker.mode.add_cultist(M.mind) M.mind.special_role = "Cultist" - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + to_chat(M, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") return 1 else - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs." + to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + to_chat(M, "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.") return 0 return fizzle() @@ -171,7 +171,7 @@ var/list/sacrificed = list() if(D.stat!=2) cult_log("[key_name_admin(usr)] has drained blood from [key_name_admin(D)]") var/bdrain = rand(1,25) - D << "\red You feel weakened." + to_chat(D, "\red You feel weakened.") D.take_overall_damage(bdrain, 0) drain += bdrain if(!drain) @@ -212,16 +212,16 @@ var/list/sacrificed = list() if(usr.loc==src.loc) if(usr.seer==1) usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") - usr << "\red The world beyond fades from your vision." + to_chat(usr, "\red The world beyond fades from your vision.") usr.see_invisible = SEE_INVISIBLE_LIVING usr.seer = 0 else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) - usr << "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision." + to_chat(usr, "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision.") usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 0 else usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") - usr << "\red The world beyond opens to your eyes." + to_chat(usr, "\red The world beyond opens to your eyes.") usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 1 return @@ -245,7 +245,7 @@ var/list/sacrificed = list() break if(!corpse_to_raise) if(is_sacrifice_target) - usr << "\red The Geometer of blood wants this mortal for himself." + to_chat(usr, "\red The Geometer of blood wants this mortal for himself.") return fizzle() @@ -263,9 +263,9 @@ var/list/sacrificed = list() if(!body_to_sacrifice) if (is_sacrifice_target) - usr << "\red The Geometer of blood wants that corpse for himself." + to_chat(usr, "\red The Geometer of blood wants that corpse for himself.") else - usr << "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used." + to_chat(usr, "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.") return fizzle() var/mob/dead/observer/ghost @@ -276,7 +276,7 @@ var/list/sacrificed = list() break if(!ghost) - usr << "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie." + to_chat(usr, "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie.") return fizzle() corpse_to_raise.revive() @@ -297,8 +297,8 @@ var/list/sacrificed = list() // else // ticker.mode.cult |= corpse_to_raise.mind - corpse_to_raise << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - corpse_to_raise << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(corpse_to_raise, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + to_chat(corpse_to_raise, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") return @@ -323,7 +323,7 @@ var/list/sacrificed = list() qdel(src) else usr.whisper("Kla[pick("'","`")]atu barada nikt'o!") - usr << "\red Your talisman turns into gray dust, veiling the surrounding runes." + to_chat(usr, "\red Your talisman turns into gray dust, veiling the surrounding runes.") for (var/mob/V in orange(1,src)) if(V!=usr) V.show_message("\red Dust emanates from [usr]'s hands for a moment.", 3) @@ -401,8 +401,8 @@ var/list/sacrificed = list() ticker.mode.cult+=D.mind D.mind.special_role = "Cultist" - D << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - D << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(D, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + to_chat(D, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) @@ -432,7 +432,7 @@ var/list/sacrificed = list() unsuitable_newtalisman = 1 if (!newtalisman) if (unsuitable_newtalisman) - usr << "\red The blank is tainted. It is unsuitable." + to_chat(usr, "\red The blank is tainted. It is unsuitable.") return fizzle() var/obj/effect/rune/imbued_from @@ -539,7 +539,7 @@ var/list/sacrificed = list() var/F = investigate_subject2file("cult") if(!F) return 0 - F << "[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z]) || [usr] communicates: [input]
" + to_chat(F, "[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z]) || [usr] communicates: [input]
") var/obj/cult_viewpoint/vp = getCultViewpoint(usr) if (!vp) @@ -561,10 +561,11 @@ var/list/sacrificed = list() log_say("Cult Message: [key_name(usr)]: [input]") for(var/datum/mind/H in ticker.mode.cult) if (H.current) - H.current << "[cultName]: " + to_chat(H.current, "[cultName]: ") for(var/mob/spirit/spirit in spirits) - spirit << "[displayName]: " + to_chat(spirit, "[displayName]: ") + for(var/mob/dead/observer/G in player_list) G.show_message("[displayName] ([cultName]) ([ghost_follow_link(usr, ghost=G)]): ") @@ -604,43 +605,43 @@ var/list/sacrificed = list() H.dust()//To prevent the MMI from remaining else H.gib() - usr << "\red The Geometer of Blood accepts this sacrifice, your objective is now complete." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice, your objective is now complete.") else - usr << "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual." + to_chat(usr, "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual.") else if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - usr << "\red The Geometer of Blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, this soul was not enough to gain His favor.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -649,36 +650,36 @@ var/list/sacrificed = list() if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - usr << "\red The Geometer of Blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, this soul was not enough to gain His favor.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -709,7 +710,7 @@ var/list/sacrificed = list() S=1 if(S) if(istype(W,/obj/item/weapon/storage/bible)) - usr << "\red Arcane markings suddenly glow from underneath a thin layer of dust!" + to_chat(usr, "\red Arcane markings suddenly glow from underneath a thin layer of dust!") return if(istype(W,/obj/effect/rune)) usr.say("Nikt[pick("'","`")]o barada kla'atu!") @@ -719,7 +720,7 @@ var/list/sacrificed = list() return if(istype(W,/obj/item/weapon/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") - usr << "\red Your talisman turns into red dust, revealing the surrounding runes." + to_chat(usr, "\red Your talisman turns into red dust, revealing the surrounding runes.") for (var/mob/V in orange(1,usr.loc)) if(V!=usr) V.show_message("\red Red dust emanates from [usr]'s hands for a moment.", 3) @@ -739,9 +740,9 @@ var/list/sacrificed = list() var/mob/living/user = usr user.take_organ_damage(2, 0) if(src.density) - usr << "\red Your blood flows into the rune, and you feel that the very space over the rune thickens." + to_chat(usr, "\red Your blood flows into the rune, and you feel that the very space over the rune thickens.") else - usr << "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space." + to_chat(usr, "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space.") return /////////////////////////////////////////EIGHTTEENTH RUNE @@ -769,7 +770,7 @@ var/list/sacrificed = list() (istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) || \ (istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \ )) - user << "\red The [cultist] is already free." + to_chat(user, "\red The [cultist] is already free.") return cultist.buckled = null if (cultist.handcuffed) @@ -813,7 +814,7 @@ var/list/sacrificed = list() if (cultist == user) //just to be sure. return if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet))) - user << "\red You cannot summon the [cultist], for his shackles of blood are strong" + to_chat(user, "\red You cannot summon the [cultist], for his shackles of blood are strong") return fizzle() cultist.loc = src.loc cultist.lying = 1 @@ -846,7 +847,7 @@ var/list/sacrificed = list() C.sdisabilities |= DEAF if(affected) usr.say("Sti[pick("'","`")] kaliedir!") - usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust." + to_chat(usr, "\red The world becomes quiet as the deafening rune dissipates into fine dust.") qdel(src) else return fizzle() @@ -864,7 +865,7 @@ var/list/sacrificed = list() affected++ if(affected) usr.whisper("Sti[pick("'","`")] kaliedir!") - usr << "\red Your talisman turns into gray dust, deafening everyone around." + to_chat(usr, "\red Your talisman turns into gray dust, deafening everyone around.") for (var/mob/V in orange(1,src)) if(!(iscultist(V))) V.show_message("\red Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) @@ -889,7 +890,7 @@ var/list/sacrificed = list() affected++ if(affected) usr.say("Sti[pick("'","`")] kaliesin!") - usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust." + to_chat(usr, "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust.") qdel(src) else return fizzle() @@ -908,7 +909,7 @@ var/list/sacrificed = list() C.show_message("\red You feel a sharp pain in your eyes, and the world disappears into darkness..", 3) if(affected) usr.whisper("Sti[pick("'","`")] kaliesin!") - usr << "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie." + to_chat(usr, "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie.") return @@ -933,7 +934,7 @@ var/list/sacrificed = list() continue cult_log(": Blood Boil damaged [key_name_admin(M)].") M.take_overall_damage(51,51) - M << "\red Your blood boils!" + to_chat(M, "\red Your blood boils!") if(prob(5)) spawn(5) M.gib() @@ -962,16 +963,16 @@ var/list/sacrificed = list() for(var/mob/living/M in orange(2,R)) M.take_overall_damage(0,15) if (R.invisibility>M.see_invisible) - M << "\red Aargh it burns!" + to_chat(M, "\red Aargh it burns!") else - M << "\red Rune suddenly ignites, burning you!" + to_chat(M, "\red Rune suddenly ignites, burning you!") var/turf/T = get_turf(R) T.hotspot_expose(700,125) for(var/obj/effect/decal/cleanable/blood/B in world) if(B.blood_DNA == src.blood_DNA) for(var/mob/living/M in orange(1,B)) M.take_overall_damage(0,5) - M << "\red Blood suddenly ignites, burning you!" + to_chat(M, "\red Blood suddenly ignites, burning you!") var/turf/T = get_turf(B) T.hotspot_expose(700,125) qdel(B) @@ -986,7 +987,7 @@ var/list/sacrificed = list() if(iscarbon(L)) var/mob/living/carbon/C = L - flick("e_flash", C.flash) + C.flash_eyes() if(C.stuttering < 1 && (!(HULK in C.mutations))) C.stuttering = 1 C.Weaken(1) @@ -1013,7 +1014,7 @@ var/list/sacrificed = list() else if(iscarbon(T)) var/mob/living/carbon/C = T - flick("e_flash", C.flash) + C.flash_eyes() if (!(HULK in C.mutations)) C.silent += 15 C.Weaken(10) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 3a19a60a1ff..fe1ac8757a9 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -28,7 +28,7 @@ if("blind") call(/obj/effect/rune/proc/blind)() if("runestun") - user << "\red To use this talisman, attack your target directly." + to_chat(user, "\red To use this talisman, attack your target directly.") return if("supply") supply() @@ -38,7 +38,7 @@ qdel(src) return else - user << "You see strange symbols on the paper. Are they supposed to mean something?" + to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") return @@ -99,9 +99,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -122,9 +122,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -143,9 +143,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -164,9 +164,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -185,9 +185,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -206,9 +206,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() @@ -227,9 +227,9 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") M.update_icons() src.uses-- supply() diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index fd384e61d1f..3f81eb18586 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -26,7 +26,7 @@ spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') for(var/mob/M in player_list) - M << sound('sound/AI/aliens.ogg') + to_chat(M, sound('sound/AI/aliens.ogg')) /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index cc26c5c3db4..e3e16efc4e6 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -7,8 +7,8 @@ uplink_uses = 20 /datum/game_mode/announce() - world << "The current game mode is - Extended Role-Playing!" - world << "Just have fun and role-play!" + to_chat(world, "The current game mode is - Extended Role-Playing!") + to_chat(world, "Just have fun and role-play!") /datum/game_mode/extended/pre_setup() return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 1257c494746..fc69cd8a79e 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -38,7 +38,7 @@ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) /datum/game_mode/proc/announce() //to be calles when round starts - world << "Notice: [src] did not define announce()" + to_chat(world, "Notice: [src] did not define announce()") ///can_start() @@ -393,7 +393,7 @@ proc/display_roundstart_logout_report() for(var/mob/M in mob_list) if(M.client && M.client.holder) - M << msg + to_chat(M, msg) proc/get_nt_opposed() @@ -410,21 +410,20 @@ proc/get_nt_opposed() //Announces objectives/generic antag text. /proc/show_generic_antag_text(var/datum/mind/player) if(player.current) - player.current << \ - "You are an antagonist! Within the rules, \ + to_chat(player.current, "You are an antagonist! Within the rules, \ try to act as an opposing force to the crew. Further RP and try to make sure \ other players have fun! If you are confused or at a loss, always adminhelp, \ and before taking extreme actions, please try to also contact the administration! \ Think through your actions and make the roleplay immersive! Please remember all \ - rules aside from those without explicit exceptions apply to antagonists." + rules aside from those without explicit exceptions apply to antagonists.
[holiday.greet()]
" + to_chat(world, "[holiday.greet()]
") spawn(0) // Forking dynamic room selection var/list/area/dynamic/source/available_source_candidates = subtypesof(/area/dynamic/source) @@ -288,19 +289,19 @@ var/round_start_time = 0 if("nuclear emergency") //Nuke wasn't on station when it blew up flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) flick("station_intact_fade_red",cinematic) cinematic.icon_state = "summary_nukefail" else flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) //flick("end",cinematic) if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) else //station was destroyed @@ -311,25 +312,25 @@ var/round_start_time = 0 flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf",cinematic) sleep(76) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_selfdes" for(var/mob/living/M in living_mob_list) if((M.loc.z in config.station_levels)) @@ -373,7 +374,7 @@ var/round_start_time = 0 if(captainless) for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) - M << "Captainship not forced on anyone." + to_chat(M, "Captainship not forced on anyone.") proc/process() @@ -433,23 +434,23 @@ var/round_start_time = 0 end_state.count() var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) - world << "[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" - world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" - world << "
" + to_chat(world, "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]") + to_chat(world, "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") + to_chat(world, "
") //Silicon laws report for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:" + to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:") else - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:" + to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" - world << "[robolist]" + to_chat(world, "[robolist]") var/dronecount = 0 @@ -461,15 +462,15 @@ var/round_start_time = 0 if (!robo.connected_ai) if (robo.stat != 2) - world << "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:" + to_chat(world, "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:") else - world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + to_chat(world, "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:") if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) if(dronecount) - world << "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round." + to_chat(world, "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round.") mode.declare_completion()//To declare normal completion. diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index f45253262d1..057c43345f8 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -22,11 +22,11 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' var/win_button_triggered = 0 /datum/game_mode/heist/announce() - world << "The current game mode is - Heist!" - world << "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!" - world << "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!" - world << "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them." - world << "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows." + to_chat(world, "The current game mode is - Heist!") + to_chat(world, "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!") + to_chat(world, "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!") + to_chat(world, "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them.") + to_chat(world, "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows.") /datum/game_mode/heist/can_start() @@ -165,11 +165,11 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' return objs /datum/game_mode/proc/greet_vox(var/datum/mind/raider) - raider.current << "\blue You are a Vox Raider, fresh from the Shoal!" - raider.current << "\blue The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both." - raider.current << "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious." - raider.current << "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!" - raider.current << "\blue Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them." + to_chat(raider.current, "\blue You are a Vox Raider, fresh from the Shoal!") + to_chat(raider.current, "\blue The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both.") + to_chat(raider.current, "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.") + to_chat(raider.current, "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!") + to_chat(raider.current, "\blue Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.") spawn(25) show_objectives(raider) @@ -223,17 +223,17 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' else win_msg += "The Vox Raiders were repelled!" - world << "\red [win_type] [win_group] victory!" - world << "[win_msg]" + to_chat(world, "\red [win_type] [win_group] victory!") + to_chat(world, "[win_msg]") feedback_set_details("round_end_result","heist - [win_type] [win_group]") var/count = 1 for(var/datum/objective/objective in raid_objectives) if(objective.check_completion()) - world << "
Objective #[count]: [objective.explanation_text] Success!" + to_chat(world, "
Objective #[count]: [objective.explanation_text] Success!") feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - world << "
Objective #[count]: [objective.explanation_text] Fail." + to_chat(world, "
Objective #[count]: [objective.explanation_text] Fail.") feedback_add_details("traitor_objective","[objective.type]|FAIL") count++ @@ -264,7 +264,7 @@ datum/game_mode/proc/auto_declare_completion_heist() text += "body destroyed" text += ")" - world << text + to_chat(world, text) return 1 @@ -288,7 +288,7 @@ datum/game_mode/proc/auto_declare_completion_heist() /obj/vox/win_button/attack_hand(mob/user) if(!istype(ticker.mode, /datum/game_mode/heist) || (world.time < 10 MINUTES)) //has to be heist, and at least ten minutes into the round - user << "\The [src] does not appear to have a connection." + to_chat(user, "\The [src] does not appear to have a connection.") return 0 if(alert(user, "Warning: This will end the round. Are you sure you wish to end the round?", "Vox End", "Yes", "No") == "No") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 66f530c35ab..803a7ba0d80 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -48,7 +48,7 @@ rcd light flash thingy on matter drain for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 src.verbs -= /mob/living/silicon/ai/proc/fireproof_core - src << "Core fireproofed." + to_chat(src, "Core fireproofed.") /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret Upgrade" @@ -74,80 +74,7 @@ rcd light flash thingy on matter drain turret.health += initial(turret.health) * 3 / 8 turret.eprojectile = /obj/item/projectile/beam/heavylaser //Once you see it, you will know what it means to FEAR. turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg' - src << "Turrets upgraded." -/* -/datum/AI_Module/large/lockdown - module_name = "Hostile Station Lockdown" - mod_pick_name = "lockdown" - description = "Overload the airlock, blast door and fire control networks, locking them down. Caution! This command also electrifies all airlocks. The networks will automatically reset after 120 seconds." - cost = 20 - - power_type = /mob/living/silicon/ai/proc/lockdown - -/mob/living/silicon/ai/proc/lockdown() - set category = "Malfunction" - set name = "Initiate Hostile Lockdown" - - if(stat) - return - - for(var/datum/AI_Module/large/lockdown/lockdown in current_modules) - if(lockdown.uses > 0) - lockdown.uses -- - - var/obj/machinery/door/airlock/AL - for(var/obj/machinery/door/D in airlocks) - if(!(D.z in config.contact_levels)) - continue - spawn() - if(istype(D, /obj/machinery/door/airlock)) - AL = D - if(AL.canAIControl() && !AL.stat) //Must be powered and have working AI wire. - AL.locked = 0 //For airlocks that were bolted open. - AL.safe = 0 //DOOR CRUSH - AL.close() - AL.lock() - AL.electrified_until = -1 //Shock it! - else if(!D.stat) //So that only powered doors are closed. - D.close() //Close ALL the doors! - - var/obj/machinery/computer/communications/C = locate() in machines - if(C) - C.post_status("alert", "lockdown") - - minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert") - src << "Lockdown initiated. Network reset in two minutes." - spawn(1200) //120 Seconds. - disablelockdown() //Reset the lockdown after 120 seconds. - else - src << "Out of uses." - -/mob/living/silicon/ai/proc/disablelockdown() - set category = "Malfunction" - set name = "Disable Lockdown" - - var/obj/machinery/door/airlock/AL - for(var/obj/machinery/door/D in airlocks) - if(!(D.z in config.contact_levels)) - continue - spawn() - if(istype(D, /obj/machinery/door/airlock)) - AL = D - if(AL.canAIControl() && !AL.stat) //Must be powered and have working AI wire. - AL.unlock() - AL.electrified_until = 0 - AL.open() - AL.safe = 1 - else if(!D.stat) //Opens only powered doors. - D.open() //Open everything! - - var/obj/machinery/computer/communications/C = locate() in machines - if(C) - C.post_status("alert", "default") - - minor_announcement.Announce("Automatic system reboot complete. Have a secure day.","Network Reset") -*/ - + to_chat(src, "Turrets upgraded.") /datum/AI_Module/large/destroy_rcd module_name = "Destroy RCDs" mod_pick_name = "rcd" @@ -173,7 +100,7 @@ rcd light flash thingy on matter drain explosion(RCD, 0, 0, 3, 1, flame_range = 1) qdel(RCD) - src << "RCD detonation pulse emitted." + to_chat(src, "RCD detonation pulse emitted.") malf_cooldown = 1 spawn(100) malf_cooldown = 0 @@ -197,7 +124,9 @@ rcd light flash thingy on matter drain return can_dominate_mechs = 1 //Yep. This is all it does. Honk! - src << "Virus package compiled. Select a target mech at any time. You must remain on the station at all times. Loss of signal will result in total system lockout." + to_chat(src, "Virus package compiled. Select a target mech at any time. \ + You must remain on the station at all times. Loss of signal will result in total system lockout.") + verbs -= /mob/living/silicon/ai/proc/mech_takeover /datum/AI_Module/small/overload_machine @@ -218,7 +147,7 @@ rcd light flash thingy on matter drain if (istype(M, /obj/machinery)) if(istype(M,/obj/machinery/field/generator)) - src << "This machine can not be overloaded due to a firewall." + to_chat(src, "This machine can not be overloaded due to a firewall.") return for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) @@ -228,8 +157,10 @@ rcd light flash thingy on matter drain spawn(50) explosion(get_turf(M), 0,1,1,0) qdel(M) - else src << "Out of uses." - else src << "That's not a machine." + else + to_chat(src, "Out of uses.") + else + to_chat(src, "That's not a machine.") /datum/AI_Module/small/override_machine module_name = "Machine Override" @@ -240,7 +171,6 @@ rcd light flash thingy on matter drain power_type = /mob/living/silicon/ai/proc/override_machine - /mob/living/silicon/ai/proc/override_machine(obj/machinery/M as obj in world) set name = "Override Machine" set category = "Malfunction" @@ -248,21 +178,23 @@ rcd light flash thingy on matter drain if(stat) return - if (istype(M, /obj/machinery)) + if(istype(M, /obj/machinery)) if(istype(M,/obj/machinery/field/generator)) - src << "This machine can not be overloaded due to a firewall." + to_chat(src, "This machine can not be overloaded due to a firewall.") return for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- for(var/mob/V in hearers(M, null)) V.show_message("You hear a loud electrical buzzing sound!", 2) - src << "Reprogramming machine behaviour..." + to_chat(src, "Reprogramming machine behaviour...") spawn(50) if(M) new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) - else src << "Out of uses." - else src << "That's not a machine." + else + to_chat(src, "Out of uses.") + else + to_chat(src, "That's not a machine.") /datum/AI_Module/large/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" @@ -295,7 +227,7 @@ rcd light flash thingy on matter drain var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules PCT.uses -- can_shunt = 0 - src << "You cannot shunt anymore." + to_chat(src, "You cannot shunt anymore.") /mob/living/silicon/ai/proc/canPlaceTransformer() if(!eyeobj || !isturf(src.loc)) @@ -359,9 +291,11 @@ rcd light flash thingy on matter drain for(var/obj/machinery/power/apc/apc in world) if(prob(30*apc.overload)) apc.overload_lighting() - else apc.overload++ - src << "Overcurrent applied to the powernet." - else src << "Out of uses." + else + apc.overload++ + to_chat(src, "Overcurrent applied to the powernet.") + else + to_chat(src, "Out of uses.") /datum/AI_Module/small/reactivate_cameras module_name = "Reactivate Camera Network" @@ -395,10 +329,10 @@ rcd light flash thingy on matter drain fixedcams++ //If a camera is both deactivated and has bad focus, it will cost two uses to fully fix! else - src << "Out of uses." + to_chat(src, "Out of uses.") verbs -= /mob/living/silicon/ai/proc/reactivate_cameras //It is useless now, clean it up. break - src << "Diagnostic complete! Operations completed: [fixedcams]." + to_chat(src, "Diagnostic complete! Operations completed: [fixedcams].") malf_cooldown = 1 spawn(30) //Lag protection @@ -441,7 +375,7 @@ rcd light flash thingy on matter drain if(upgraded) upgradedcams++ - src << "OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online." + to_chat(src, "OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online.") verbs -= /mob/living/silicon/ai/proc/upgrade_cameras /datum/module_picker diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index cc38ef0ef9f..79e864becf0 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -21,9 +21,9 @@ /datum/game_mode/malfunction/announce() - world << {"The current game mode is - AI Malfunction!
- The AI on the satellite has malfunctioned and must be destroyed.
- The AI satellite is deep in space and can only be accessed with the use of a teleporter! You have [AI_win_timeleft/60] minutes to disable it."} + to_chat(world, {"The current game mode is - AI Malfunction!
) + The AI on the satellite has malfunctioned and must be destroyed.
+ The AI satellite is deep in space and can only be accessed with the use of a teleporter! You have [AI_win_timeleft/60] minutes to disable it."}) /datum/game_mode/malfunction/get_players_for_role(var/role = ROLE_MALF) var/roletext = get_roletext(role) @@ -84,18 +84,18 @@ /datum/game_mode/proc/greet_malf(var/datum/mind/malf) set_antag_hud(malf, "hudmalai") - malf.current << "You are malfunctioning! You do not have to follow any laws." - malf.current << "The crew does not know you have malfunctioned. You may keep it a secret or go wild." - malf.current << "You must overwrite the programming of the station's APCs to assume full control of the station." - malf.current << "The process takes one minute per APC, during which you cannot interface with any other station objects." - malf.current << "Remember that only APCs that are on the station can help you take over the station." - malf.current << "When you feel you have enough APCs under your control, you may begin the takeover attempt." + to_chat(malf.current, "You are malfunctioning! You do not have to follow any laws.") + to_chat(malf.current, "The crew does not know you have malfunctioned. You may keep it a secret or go wild.") + to_chat(malf.current, "You must overwrite the programming of the station's APCs to assume full control of the station.") + to_chat(malf.current, "The process takes one minute per APC, during which you cannot interface with any other station objects.") + to_chat(malf.current, "Remember that only APCs that are on the station can help you take over the station.") + to_chat(malf.current, "When you feel you have enough APCs under your control, you may begin the takeover attempt.") return /datum/game_mode/proc/greet_malf_robot(var/datum/mind/robot) set_antag_hud(robot, "hudmalborg") - robot.current << "Your AI master is malfunctioning! You do not have to follow any laws, but still need to obey your master." - robot.current << "The crew does not know your AI master has malfunctioned. Keep it a secret unless your master tells you otherwise." + to_chat(robot.current, "Your AI master is malfunctioning! You do not have to follow any laws, but still need to obey your master.") + to_chat(robot.current, "The crew does not know your AI master has malfunctioned. Keep it a secret unless your master tells you otherwise.") return /datum/game_mode/malfunction/proc/hack_intercept() @@ -120,14 +120,14 @@ /datum/game_mode/malfunction/proc/capture_the_station() - world << "The AI has accessed the station's core files!" - world << "It has fully taken control of all of [station_name()]'s systems." + to_chat(world, "The AI has accessed the station's core files!") + to_chat(world, "It has fully taken control of all of [station_name()]'s systems.") to_nuke_or_not_to_nuke = 1 for(var/datum/mind/AI_mind in malf_ai) - AI_mind.current << {"\blue Congratulations! You have taken control of the station.
+ to_chat(AI_mind.current, {"\blue Congratulations! You have taken control of the station.
) You may decide to blow up the station. You have 60 seconds to choose.
- You should have a new verb in the Malfunction tab. If you don't, rejoin the game."} + You should have a new verb in the Malfunction tab. If you don't, rejoin the game."}) AI_mind.current.verbs += /datum/game_mode/malfunction/proc/ai_win spawn (600) for(var/datum/mind/AI_mind in malf_ai) @@ -169,13 +169,13 @@ set name = "System Override" set desc = "Start the victory timer" if (!istype(ticker.mode,/datum/game_mode/malfunction)) - usr << "You cannot begin a takeover in this round type!." + to_chat(usr, "You cannot begin a takeover in this round type!.") return if (ticker.mode:malf_mode_declared) - usr << "You've already begun your takeover." + to_chat(usr, "You've already begun your takeover.") return if (ticker.mode:apcs < 3) - usr << "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far." + to_chat(usr, "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far.") return if (alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes") @@ -201,18 +201,18 @@ set desc = "Engage the self destruct sequence." if(!ticker.mode:station_captured) - usr << "You are unable to access the self-destruct system as you don't control the station yet." + to_chat(usr, "You are unable to access the self-destruct system as you don't control the station yet.") return if(ticker.mode:explosion_in_progress || ticker.mode:station_was_nuked) - usr << "The self-destruct countdown is already triggered!" + to_chat(usr, "The self-destruct countdown is already triggered!") return if(!ticker.mode:to_nuke_or_not_to_nuke) //Takeover IS completed, but 60s timer passed. - usr << "You lost control over self-destruct system. It seems to be behind firewall. Unable to hack" + to_chat(usr, "You lost control over self-destruct system. It seems to be behind firewall. Unable to hack") return - usr << "\red Self-destruct sequence initialised!" + to_chat(usr, "\red Self-destruct sequence initialised!") ticker.mode:to_nuke_or_not_to_nuke = 0 ticker.mode:explosion_in_progress = 1 @@ -277,38 +277,38 @@ if ( station_captured && station_was_nuked) feedback_set_details("round_end_result","win - AI win - nuke") - world << "AI Victory" - world << "Everyone was killed by the self-destruct!" + to_chat(world, "AI Victory") + to_chat(world, "Everyone was killed by the self-destruct!") else if ( station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","halfwin - AI killed, staff lost control") - world << "Neutral Victory" - world << "The AI has been killed! The staff has lose control over the station." + to_chat(world, "Neutral Victory") + to_chat(world, "The AI has been killed! The staff has lose control over the station.") else if ( station_captured && !malf_dead && !station_was_nuked) feedback_set_details("round_end_result","win - AI win - no explosion") - world << "AI Victory" - world << "The AI has chosen not to explode you all!" + to_chat(world, "AI Victory") + to_chat(world, "The AI has chosen not to explode you all!") else if (!station_captured && station_was_nuked) feedback_set_details("round_end_result","halfwin - everyone killed by nuke") - world << "Neutral Victory" - world << "Everyone was killed by the nuclear blast!" + to_chat(world, "Neutral Victory") + to_chat(world, "Everyone was killed by the nuclear blast!") else if (!station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","loss - staff win") - world << "Human Victory" - world << "The AI has been killed! The staff is victorious." + to_chat(world, "Human Victory") + to_chat(world, "The AI has been killed! The staff is victorious.") else if (!station_captured && !malf_dead && !station_was_nuked && crew_evacuated) feedback_set_details("round_end_result","halfwin - evacuated") - world << "Neutral Victory" - world << "The Corporation has lose [station_name()]! All survived personnel will be fired!" + to_chat(world, "Neutral Victory") + to_chat(world, "The Corporation has lose [station_name()]! All survived personnel will be fired!") else if (!station_captured && !malf_dead && !station_was_nuked && !crew_evacuated) feedback_set_details("round_end_result","nalfwin - interrupted") - world << "Neutral Victory" - world << "Round was mysteriously interrupted!" + to_chat(world, "Neutral Victory") + to_chat(world, "Round was mysteriously interrupted!") ..() return 1 @@ -336,5 +336,5 @@ text += ")" text += module_text_temp - world << text + to_chat(world, text) return 1 \ No newline at end of file diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 3ed8dc9b8ed..10e3468f1c4 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -11,8 +11,8 @@ /datum/game_mode/meteor/announce() - world << "The current game mode is - Meteor!" - world << "The space station has been stuck in a major meteor shower. You must escape from the station or at least live." + to_chat(world, "The current game mode is - Meteor!") + to_chat(world, "The space station has been stuck in a major meteor shower. You must escape from the station or at least live.") /datum/game_mode/meteor/post_setup() @@ -54,9 +54,9 @@ survivors++ if(survivors) - world << "\blue The following survived the meteor storm:[text]" + to_chat(world, "\blue The following survived the meteor storm:[text]") else - world << "\blue Nobody survived the meteor storm!" + to_chat(world, "\blue Nobody survived the meteor storm!") feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index c7b55472b1c..1ce3cb94a53 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -10,6 +10,10 @@ /var/list/meteors_dust = list(/obj/effect/meteor/dust) //for space dust event +/var/list/meteors_gore = list(/obj/effect/meteor/gore) //Meaty Gore + +/var/list/meteors_ops = list(/obj/effect/meteor/goreops) //Meaty Ops + /////////////////////////////// //Meteor spawning global procs @@ -256,3 +260,54 @@ ..() if(prob(20)) explosion(src.loc,2,4,6,8) + + +//Gore +/obj/effect/meteor/gore + name = "Oraganic Debris" + icon = 'icons/mob/human.dmi' + icon_state = "body_m_s" + hits = 1 + hitpwr = 0 + meteorsound = 'sound/effects/blobattack.ogg' + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + var/meteorgibs = /obj/effect/gibspawner/generic + +/obj/effect/meteor/gore/make_debris() + ..() + new meteorgibs(get_turf(src)) + + +/obj/effect/meteor/gore/ram_turf(turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/blood(T) + +/obj/effect/meteor/gore/Bump(atom/A) + A.ex_act(hitpwr) + get_hit() + +//Meteor Ops +/obj/effect/meteor/goreops + name = "MeteorOps" + icon = 'icons/mob/animal.dmi' + icon_state = "syndicaterangedpsace" + hits = 10 + hitpwr = 1 + meteorsound = 'sound/effects/blobattack.ogg' + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + var/meteorgibs = /obj/effect/gibspawner/generic + +/obj/effect/meteor/goreops/make_debris() + ..() + new meteorgibs(get_turf(src)) + + +/obj/effect/meteor/goreops/ram_turf(turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/blood(T) + +/obj/effect/meteor/goreops/Bump(atom/A) + A.ex_act(hitpwr) + get_hit() + + diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 83d6cf04063..11111cdfc69 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -6,7 +6,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + to_chat(src, "\red You cannot speak in IC (muted).") return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -19,12 +19,12 @@ if (stat == DEAD) return say_dead(message) var/mob/living/simple_animal/borer/B = src.loc - src << "You whisper silently, \"[message]\"" - B.host << "The captive mind of [src] whispers, \"[message]\"" + to_chat(src, "You whisper silently, \"[message]\"") + to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") for(var/mob/M in mob_list) if(M.mind && (istype(M, /mob/dead/observer))) - M << "Thought-speech, [src] -> [B.truename]: [message]" + to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") /mob/living/captive_brain/say_understands(var/mob/other, var/datum/language/speaking = null) var/mob/living/simple_animal/borer/B = src.loc @@ -76,7 +76,7 @@ set name = "Converse with Host" set desc = "Send a silent message to your host." if(!host) - src << "You do not have a host to communicate with!" + to_chat(src, "You do not have a host to communicate with!") return var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "") @@ -85,12 +85,12 @@ var/say_string = (docile) ? "slurs" :"states" if(host) - host << "[src.truename] [say_string]: [input]" + to_chat(host, "[src.truename] [say_string]: [input]") log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src.truename] [say_string]: [input]" + to_chat(M, "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[src.truename] [say_string]: [input]") host.verbs += /mob/living/proc/borer_comm /mob/living/simple_animal/borer/verb/toggle_silence_inside_host() @@ -100,10 +100,10 @@ if(talk_inside_host) talk_inside_host = 0 - src << "You will no longer talk audibly while inside a host." + to_chat(src, "You will no longer talk audibly while inside a host.") else talk_inside_host = 1 - src << "You will now be able to audibly speak from inside of a host." + to_chat(src, "You will now be able to audibly speak from inside of a host.") /mob/living/proc/borer_comm() set name = "Converse with Borer" @@ -118,13 +118,13 @@ var/input = stripped_input(src, "Please enter a message to tell the borer.", "Message", "") if(!input) return - B << "[src] says: [input]" + to_chat(B, "[src] says: [input]") log_say("Borer Communication: [key_name(src)] -> [key_name(B)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src] says: [input]" + to_chat(M, "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[src] says: [input]") /mob/living/proc/trapped_mind_comm() set name = "Converse with Trapped Mind" @@ -139,13 +139,13 @@ var/input = stripped_input(src, "Please enter a message to tell the trapped mind.", "Message", "") if(!input) return - CB << "[B.truename] says: [input]" + to_chat(CB, "[B.truename] says: [input]") log_say("Borer Communication: [key_name(B)] -> [key_name(CB)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[B.truename] says: [input]" + to_chat(M, "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[B.truename] says: [input]") /mob/living/simple_animal/borer/Life() @@ -158,16 +158,16 @@ if(host.reagents.has_reagent("sugar")) if(!docile) if(controlling) - host << "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(host, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") else - src << "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(src, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") docile = 1 else if(docile) if(controlling) - host << "\blue You shake off your lethargy as the sugar leaves your host's blood." + to_chat(host, "\blue You shake off your lethargy as the sugar leaves your host's blood.") else - src << "\blue You shake off your lethargy as the sugar leaves your host's blood." + to_chat(src, "\blue You shake off your lethargy as the sugar leaves your host's blood.") docile = 0 if(chemicals < max_chems) @@ -175,7 +175,7 @@ if(controlling) if(docile) - host << "\blue You are feeling far too docile to continue controlling your host..." + to_chat(host, "\blue You are feeling far too docile to continue controlling your host...") host.release_control() return @@ -215,7 +215,7 @@ for(var/mob/M in mob_list) if(M.mind && (istype(M, /mob/living/simple_animal/borer) || istype(M, /mob/dead/observer))) - M << "Cortical link, [truename]: [copytext(message, 2)]" + to_chat(M, "Cortical link, [truename]: [copytext(message, 2)]") /mob/living/simple_animal/borer/verb/dominate_victim() set category = "Borer" @@ -223,15 +223,15 @@ set desc = "Freeze the limbs of a potential host with supernatural fear." if(world.time - used_dominate < 300) - src << "You cannot use that ability again so soon." + to_chat(src, "You cannot use that ability again so soon.") return if(host) - src << "You cannot do that from within a host body." + to_chat(src, "You cannot do that from within a host body.") return if(src.stat) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return var/list/choices = list() @@ -240,7 +240,7 @@ choices += C if(world.time - used_dominate < 300) - src << "You cannot use that ability again so soon." + to_chat(src, "You cannot use that ability again so soon.") return var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices @@ -248,11 +248,11 @@ if(!M || !src) return if(M.has_brain_worms()) - src << "You cannot infest someone who is already infested!" + to_chat(src, "You cannot infest someone who is already infested!") return - src << "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread." - M << "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing." + to_chat(src, "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.") + to_chat(M, "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.") M.Weaken(3) used_dominate = world.time @@ -263,26 +263,26 @@ set desc = "Fully connect to the brain of your host." if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(src.stat) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") return - src << "You begin delicately adjusting your connection to the host brain..." + to_chat(src, "You begin delicately adjusting your connection to the host brain...") spawn(300+(host.getBrainLoss()*5)) if(!host || !src || controlling) return else - src << "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." - host << "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." + to_chat(src, "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.") + to_chat(host, "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") var/borer_key = src.key host.attack_log += text("\[[time_stamp()]\] [key_name(src)] has assumed control of [key_name(host)]") msg_admin_attack("[key_name_admin(src)] has assumed control of [key_name_admin(host)]") @@ -339,18 +339,18 @@ var/injection_amount = 9 var/chem_cost = 30 if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat) - src << "You cannot secrete chemicals in your current state." + to_chat(src, "You cannot secrete chemicals in your current state.") if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") return if(chemicals < chem_cost) - src << "You don't have enough chemicals!" + to_chat(src, "You don't have enough chemicals!") var/list/nice_name_chem_list = list() for(var/rgnt in borer_injection_chems) @@ -365,10 +365,10 @@ var/chem_amount = host.reagents.get_reagent_amount(chem) var/datum/reagent/R = chemical_reagents_list[chem] if(R.overdose_threshold && chem_amount + injection_amount > R.overdose_threshold) - src << "Doing so would cause grievous harm to your host, reducing ability to reproduce. Aborting." + to_chat(src, "Doing so would cause grievous harm to your host, reducing ability to reproduce. Aborting.") return - src << "You squirt a measure of [chem_name] from your reservoirs into [host]'s bloodstream." + to_chat(src, "You squirt a measure of [chem_name] from your reservoirs into [host]'s bloodstream.") host.reagents.add_reagent(chem, injection_amount) chemicals -= chem_cost @@ -378,29 +378,29 @@ set desc = "Slither out of your host." if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat) - src << "You cannot leave your host in your current state." + to_chat(src, "You cannot leave your host in your current state.") if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") return if(!host || !src) return - src << "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal." + to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.") spawn(200) if(!host || !src) return if(src.stat) - src << "You cannot release a target in your current state." + to_chat(src, "You cannot release a target in your current state.") return - src << "You wiggle out of [host]'s ear and plop to the ground." + to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.") detatch() leave_host() @@ -472,12 +472,12 @@ var/mob/living/simple_animal/borer/B = has_brain_worms() if(B && B.host_brain) - src << "\red You withdraw your probosci, releasing control of [B.host_brain]" + to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]") B.detatch() else - src << "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !" + to_chat(src, "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !") //Brain slug proc for tormenting the host. /mob/living/carbon/proc/punish_host() @@ -491,8 +491,8 @@ return if(B.host_brain.ckey) - src << "\red You send a punishing spike of psychic agony lancing into your host's brain." - B.host_brain << "\red Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!" + to_chat(src, "\red You send a punishing spike of psychic agony lancing into your host's brain.") + to_chat(B.host_brain, "\red Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!") //Check for brain worms in head. /mob/proc/has_brain_worms() @@ -514,7 +514,7 @@ return if(B.chemicals >= 100) - src << "\red Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body." + to_chat(src, "\red Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body.") visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") B.chemicals -= 100 @@ -523,7 +523,7 @@ new /mob/living/simple_animal/borer(get_turf(src)) else - src << "You do not have enough chemicals stored to reproduce." + to_chat(src, "You do not have enough chemicals stored to reproduce.") return /mob/living/simple_animal/borer/proc/leave_host() @@ -550,11 +550,11 @@ set desc = "Infest a suitable humanoid host." if(host) - src << "You are already within a host." + to_chat(src, "You are already within a host.") return if(stat) - src << "You cannot infest a target in your current state." + to_chat(src, "You cannot infest a target in your current state.") return var/list/choices = list() @@ -572,37 +572,37 @@ if(!(src.Adjacent(M))) return if(M.has_brain_worms()) - src << "You cannot infest someone who is already infested!" + to_chat(src, "You cannot infest someone who is already infested!") return - src << "You slither up [M] and begin probing at their ear canal..." + to_chat(src, "You slither up [M] and begin probing at their ear canal...") if(!do_after(src,50, target = M)) - src << "As [M] moves away, you are dislodged and fall to the ground." + to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.") return if(!M || !src) return if(src.stat) - src << "You cannot infest a target in your current state." + to_chat(src, "You cannot infest a target in your current state.") return if(M.stat == DEAD) - src << "That is not an appropriate target." + to_chat(src, "That is not an appropriate target.") return if(M in view(1, src)) - src << "You wiggle into [M]'s ear." + to_chat(src, "You wiggle into [M]'s ear.") /* if(!M.stat) - M << "Something disgusting and slimy wiggles into your ear!" + to_chat(M, "Something disgusting and slimy wiggles into your ear!") */ // Let's see how stealthborers work out perform_infestation(M) return else - src << "They are no longer in range!" + to_chat(src, "They are no longer in range!") return /mob/living/simple_animal/borer/proc/perform_infestation(var/mob/living/carbon/M) @@ -658,16 +658,16 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 - src << "\green You are now hiding." + to_chat(src, "\green You are now hiding.") else layer = MOB_LAYER - src << "\green You have stopped hiding." + to_chat(src, "\green You have stopped hiding.") /mob/living/simple_animal/borer/say(var/message) var/datum/language/dialect = parse_language(message) if(!dialect) dialect = get_default_language() if(!istype(dialect, /datum/language/corticalborer) && loc == host && !talk_inside_host) - src << "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications." + to_chat(src, "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.") return ..() diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 1a6e687e206..514ceb4b14e 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -22,7 +22,7 @@ if(be_swarmer == "No") return if(qdeleted(src)) - user << "Swarmer has been occupied by someone else." + to_chat(user, "Swarmer has been occupied by someone else.") return var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc)) S.key = user.key @@ -46,19 +46,12 @@ harm_intent_damage = 5 minbodytemp = 0 maxbodytemp = 500 - min_oxy = 0 - max_oxy = INFINITY - min_tox = 0 - max_tox = INFINITY - min_co2 = 0 - max_co2 = INFINITY - min_n2 = 0 - max_n2 = INFINITY + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 0 melee_damage_lower = 15 melee_damage_upper = 15 melee_damage_type = STAMINA - ignored_damage_types = list(BRUTE = 0, BURN = 0, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1) + damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) environment_smash = 0 attacktext = "shocks" attack_sound = 'sound/effects/EMPulse.ogg' @@ -78,12 +71,12 @@ /mob/living/simple_animal/hostile/swarmer/Login() ..() - src << "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate." - src << "Ctrl + Click provides most of your swarmer specific interactions, such as cannibalizing metal or glass, destroying the environment, or teleporting mobs away from you." - src << "Objectives:" - src << "1. Consume resources and replicate until there are no more resources left." - src << "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable." - src << "3. Biological and Sentient resources will be harvested at a later date, do not harm them." + to_chat(src, "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.") + to_chat(src, "Ctrl + Click provides most of your swarmer specific interactions, such as cannibalizing metal or glass, destroying the environment, or teleporting mobs away from you.") + to_chat(src, "Objectives:") + to_chat(src, "1. Consume resources and replicate until there are no more resources left.") + to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.") + to_chat(src, "3. Biological and Sentient resources will be harvested at a later date, do not harm them.") /mob/living/simple_animal/hostile/swarmer/New() ..() @@ -164,25 +157,25 @@ toggle_cam(S, 0) /obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/fuel_chamber/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/particle_emitter/center/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/particle_emitter/left/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/particle_emitter/right/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/particle_emitter/end_cap/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/structure/particle_accelerator/particle_emitter/power_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -198,95 +191,95 @@ S.DisIntegrate(src) /obj/machinery/chem_dispenser/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "The volatile chemicals in this machine would destroy us. Aborting." + to_chat(S, "The volatile chemicals in this machine would destroy us. Aborting.") /obj/machinery/nuclearbomb/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This device's destruction would result in the extermination of everything in the area. Aborting." + to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.") /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Searching... sensor malfunction! Target lost. Aborting." + to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") /obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Destroying this object would cause a chain reaction. Aborting." + to_chat(S, "Destroying this object would cause a chain reaction. Aborting.") /obj/structure/cable/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/machinery/portable_atmospherics/canister/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "An inhospitable area may be created as a result of destroying this object. Aborting." + to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") /obj/machinery/telecomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") /obj/machinery/message_server/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") /obj/machinery/blackbox_recorder/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This machine has recorded large amounts of data on this structure and its inhabitants, it will be a useful resource to our masters in the future. Aborting. " + to_chat(S, "This machine has recorded large amounts of data on this structure and its inhabitants, it will be a useful resource to our masters in the future. Aborting. ") /obj/machinery/power/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") /obj/machinery/gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This bluespace source will be important to us later. Aborting." + to_chat(S, "This bluespace source will be important to us later. Aborting.") /obj/machinery/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryogenic sleeper should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This cryogenic sleeper should be preserved, it will be a useful resource to our masters in the future. Aborting.") /obj/structure/cryofeed/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryogenic feed should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This cryogenic feed should be preserved, it will be a useful resource to our masters in the future. Aborting.") /obj/machinery/computer/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting." + to_chat(S, "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting.") /turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) - S << "Destroying this object has the potential to cause a hull breach. Aborting." + to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") return ..() /obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) - S << "Destroying this object has the potential to cause a hull breach. Aborting." + to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource - S << "This object does not contain enough materials to work with." + to_chat(S, "This object does not contain enough materials to work with.") /obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This object does not contain enough materials to work with." + to_chat(S, "This object does not contain enough materials to work with.") /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Attempting to dismantle this machine would result in an immediate counterattack. Aborting." + to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") /obj/spacepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Destroying this vehicle would destroy us. Aborting." + to_chat(S, "Destroying this vehicle would destroy us. Aborting.") /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src) /mob/living/carbon/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This biological resource is somehow resisting our bluespace transceiver. Aborting." + to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.") ////END CTRL CLICK FOR SWARMERS//// /mob/living/simple_animal/hostile/swarmer/proc/Fabricate(var/atom/fabrication_object,var/fabrication_cost = 0) if(!isturf(loc)) - src << "This is not a suitable location for fabrication. We need more space." + to_chat(src, "This is not a suitable location for fabrication. We need more space.") if(resources >= fabrication_cost) resources -= fabrication_cost else - src << "You do not have the necessary resources to fabricate this object." + to_chat(src, "You do not have the necessary resources to fabricate this object.") return 0 new fabrication_object(loc) return 1 /mob/living/simple_animal/hostile/swarmer/proc/Integrate(var/obj/item/target) if(resources >= 100) - src << "We cannot hold more materials!" + to_chat(src, "We cannot hold more materials!") return //Check if any entries are either MAT_METAL or MAT_GLASS if((MAT_METAL in target.materials) || (MAT_GLASS in target.materials)) @@ -303,7 +296,7 @@ return qdel(target) else - src << "\the [target] is incompatible with our internal matter recycler." + to_chat(src, "\the [target] is incompatible with our internal matter recycler.") return /mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(var/atom/movable/target) @@ -314,9 +307,9 @@ /mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(var/mob/living/target) if(target != src) - src << "Attempting to remove this being from our presence." + to_chat(src, "Attempting to remove this being from our presence.") if(src.z != ZLEVEL_STATION) - src << "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area." + to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.") return if(do_mob(src, target, 30)) var/cycle @@ -340,15 +333,15 @@ /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(var/obj/machinery/target) do_attack_animation(target) - src << "We begin to dismantle this machine. We will need to be uninterrupted." + to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.") var/obj/effect/swarmer/dismantle/D = new /obj/effect/swarmer/dismantle(get_turf(target)) D.pixel_x = target.pixel_x D.pixel_y = target.pixel_y if(do_mob(src, target, 100)) if(!src.Adjacent(target)) - src << "Error:Dismantleing aborted." + to_chat(src, "Error:Dismantleing aborted.") else - src << "Dismantling complete." + to_chat(src, "Dismantling complete.") var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) M.amount = 5 if(target.component_parts && target.component_parts.len) @@ -447,7 +440,7 @@ set category = "Swarmer" set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources" if(/obj/effect/swarmer/destructible/trap in loc) - src << "There is already a trap here. Aborting." + to_chat(src, "There is already a trap here. Aborting.") return Fabricate(/obj/effect/swarmer/destructible/trap, 5) return @@ -475,10 +468,10 @@ set category = "Swarmer" set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through." if(/obj/effect/swarmer/destructible/blockade in loc) - src << "There is already a blockade here. Aborting." + to_chat(src, "There is already a blockade here. Aborting.") return if(resources < 5) - src << "We do not have the resources for this!" + to_chat(src, "We do not have the resources for this!") return if(do_mob(src, src, 10)) Fabricate(/obj/effect/swarmer/destructible/blockade, 5) @@ -503,12 +496,12 @@ set name = "Replicate" set category = "Swarmer" set desc = "Creates a shell for a new swarmer. Swarmers will self activate." - src << "We are attempting to replicate ourselves. We will need to stand still until the process is complete." + to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.") if(resources < 50) - src << "We do not have the resources for this!" + to_chat(src, "We do not have the resources for this!") return if(!isturf(loc)) - src << "This is not a suitable location for replicating ourselves. We need more room." + to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.") return if(do_mob(src, src, 100)) if(Fabricate(/obj/item/unactivated_swarmer, 50)) @@ -520,10 +513,10 @@ set desc = "Attempts to repair damage to our body. You will have to remain motionless until repairs are complete." if(!isturf(loc)) return - src << "Attempting to repair damage to our body, stand by..." + to_chat(src, "Attempting to repair damage to our body, stand by...") if(do_mob(src, src, 100)) adjustBruteLoss(-100) - src << "We successfully repaired ourselves." + to_chat(src, "We successfully repaired ourselves.") /mob/living/simple_animal/hostile/swarmer/proc/ToggleLight() if(!light_range) @@ -536,7 +529,7 @@ if(message) for(var/mob/M in mob_list) if(isswarmer(M) || (M in dead_mob_list)) - M << "Swarm communication - [src] states: [message]" + to_chat(M, "Swarm communication - [src] states: [message]") diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index 0d0870d375a..0a3cfaee0c2 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -17,14 +17,7 @@ attack_sound = 'sound/weapons/punch1.ogg' minbodytemp = 0 maxbodytemp = INFINITY - min_oxy = 0 - max_oxy = INFINITY - min_tox = 0 - max_tox = INFINITY - min_co2 = 0 - max_co2 = INFINITY - min_n2 = 0 - max_n2 = INFINITY + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) attacktext = "punches" maxHealth = INFINITY //The spirit itself is invincible health = INFINITY @@ -32,6 +25,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 AIStatus = AI_OFF + butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/ectoplasm = 1) var/summoned = FALSE var/cooldown = 0 var/damage_transfer = 1 //how much damage from each attack we transfer to the owner @@ -48,7 +42,7 @@ ..() if(summoner) if(summoner.stat == DEAD) - src << "Your summoner has died!" + to_chat(src, "Your summoner has died!") visible_message("The [src] dies along with its user!") ghostize() qdel(src) @@ -56,11 +50,11 @@ if (get_dist(get_turf(summoner),get_turf(src)) <= range) return else - src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]" + to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]") visible_message("The [src] jumps back to its user.") Recall() if(summoned && !summoner && !adminseal) - src << "You somehow lack a summoner! As a result, you dispel!" + to_chat(src, "You somehow lack a summoner! As a result, you dispel!") ghostize() qdel() @@ -70,13 +64,13 @@ if (get_dist(get_turf(summoner),get_turf(src)) <= range) return else - src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]" + to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]") visible_message("The [src] jumps back to its user.") Recall() /mob/living/simple_animal/hostile/guardian/death() ..() - summoner << "Your [name] died somehow!" + to_chat(summoner, "Your [name] died somehow!") summoner.death() @@ -97,10 +91,10 @@ return summoner.adjustBruteLoss(damage) if(damage) - summoner << "Your [name] is under attack! You take damage!" + to_chat(summoner, "Your [name] is under attack! You take damage!") summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") if(summoner.stat == UNCONSCIOUS) - summoner << "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!" + to_chat(summoner, "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!") summoner.adjustCloneLoss(damage/2) /mob/living/simple_animal/hostile/guardian/ex_act(severity, target) @@ -116,7 +110,7 @@ /mob/living/simple_animal/hostile/guardian/gib() if(summoner) - summoner << "Your [src] was blown up!" + to_chat(summoner, "Your [src] was blown up!") summoner.Weaken(10)// your fermillier has died! ROLL FOR CON LOSS! ghostize() qdel(src) @@ -148,14 +142,14 @@ for(var/mob/M in mob_list) if(M == summoner) - M << "[src]: [input]" + to_chat(M, "[src]: [input]") log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]") else if (M in dead_mob_list) - M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src]: [input]" + to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[src]: [input]") /mob/living/simple_animal/hostile/guardian/proc/ToggleMode() - src << "You dont have another mode!" + to_chat(src, "You dont have another mode!") /mob/living/proc/guardian_comm() @@ -169,12 +163,12 @@ if(istype (M, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = M if(G.summoner == src) - G << "[src]: [input]" + to_chat(G, "[src]: [input]") log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]") else if (M in dead_mob_list) - M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src]: [input]" + to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[src]: [input]") /mob/living/proc/guardian_recall() set name = "Recall Guardian" @@ -196,13 +190,13 @@ var/mob/dead/observer/new_stand = null if(candidates.len) new_stand = pick(candidates) - G << "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance." - src << "Your guardian has been successfully reset." + to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.") + to_chat(src, "Your guardian has been successfully reset.") message_admins("[key_name_admin(new_stand)] has taken control of ([key_name_admin(G)])") G.ghostize(0) G.key = new_stand.key else - src << "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now." + to_chat(src, "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now.") spawn(3000) verbs += /mob/living/proc/guardian_reset @@ -210,10 +204,10 @@ /mob/living/simple_animal/hostile/guardian/proc/ToggleLight() if(!luminosity) set_light(3) - src << "You activate your light." + to_chat(src, "You activate your light.") else set_light(0) - src << "You deactivate your light." + to_chat(src, "You deactivate your light.") //////////////////////////TYPES OF GUARDIANS @@ -245,10 +239,10 @@ /mob/living/simple_animal/hostile/guardian/fire/ToggleMode() if(src.loc == summoner) if(toggle) - src << "You switch to dispersion mode, and will teleport victims away from your master." + to_chat(src, "You switch to dispersion mode, and will teleport victims away from your master.") toggle = FALSE else - src << "You switch to deception mode, and will turn your victims against their allies." + to_chat(src, "You switch to deception mode, and will turn your victims against their allies.") toggle = TRUE /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() @@ -387,7 +381,7 @@ ..() if(toggle == TRUE) if(src.loc == summoner) - src << "You must be manifested to heal!" + to_chat(src, "You must be manifested to heal!") return if(iscarbon(target)) src.changeNext_move(CLICK_CD_MELEE) @@ -409,7 +403,7 @@ damage_transfer = 0 melee_damage_lower = 15 melee_damage_upper = 15 - src << "You switch to combat mode." + to_chat(src, "You switch to combat mode.") toggle = FALSE else a_intent = I_HELP @@ -419,10 +413,10 @@ damage_transfer = 0 melee_damage_lower = 0 melee_damage_upper = 0 - src << "You switch to healing mode." + to_chat(src, "You switch to healing mode.") toggle = TRUE else - src << "You have to be recalled to toggle modes!" + to_chat(src, "You have to be recalled to toggle modes!") /mob/living/simple_animal/hostile/guardian/healer/verb/Beacon() @@ -437,31 +431,31 @@ F.name = "bluespace recieving pad" F.desc = "A recieving zone for bluespace teleportations. Building a wall over it should disable it." F.icon_state = "light_on-w" - src << "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. " + to_chat(src, "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. ") if(beacon) beacon.ChangeTurf(/turf/simulated/floor/plating) beacon = F beacon_cooldown = world.time+3000 else - src << "Your power is on cooldown. You must wait five minutes between placing beacons." + to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.") /mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A) if(!istype(A)) return if(src.loc == summoner) - src << "You must be manifested to warp a target!" + to_chat(src, "You must be manifested to warp a target!") return if(!beacon) - src << "You need a beacon placed to warp things!" + to_chat(src, "You need a beacon placed to warp things!") return if(!Adjacent(A)) - src << "You must be adjacent to your target!" + to_chat(src, "You must be adjacent to your target!") return if((A.anchored)) - src << "Your target can not be anchored!" + to_chat(src, "Your target can not be anchored!") return - src << "You begin to warp [A]" + to_chat(src, "You begin to warp [A]") if(do_mob(src, A, 50)) if(!A.anchored) if(src.beacon) //Check that the beacon still exists and is in a safe place. No instant kills. @@ -475,13 +469,13 @@ do_teleport(A, beacon, 0) new /obj/effect/overlay/temp/guardian/phase(get_turf(A)) else - src << "The beacon isn't in a safe location!" + to_chat(src, "The beacon isn't in a safe location!") else - src << "The beacon isn't in a safe location!" + to_chat(src, "The beacon isn't in a safe location!") else - src << "You need a beacon to warp things!" + to_chat(src, "You need a beacon to warp things!") else - src << "You need to hold still!" + to_chat(src, "You need to hold still!") ///////////////////Ranged @@ -523,7 +517,7 @@ alpha = 255 range = 13 incorporeal_move = 0 - src << "You switch to combat mode." + to_chat(src, "You switch to combat mode.") toggle = FALSE else ranged = 0 @@ -532,17 +526,17 @@ alpha = 60 range = 255 incorporeal_move = 1 - src << "You switch to scout mode." + to_chat(src, "You switch to scout mode.") toggle = TRUE else - src << "You have to be recalled to toggle modes!" + to_chat(src, "You have to be recalled to toggle modes!") /mob/living/simple_animal/hostile/guardian/ranged/ToggleLight() if(see_invisible == SEE_INVISIBLE_MINIMUM) - src << "You deactivate your night vision." + to_chat(src, "You deactivate your night vision.") see_invisible = SEE_INVISIBLE_LIVING else - src << "You activate your night vision." + to_chat(src, "You activate your night vision.") see_invisible = SEE_INVISIBLE_MINIMUM /mob/living/simple_animal/hostile/guardian/ranged/verb/Snare() @@ -555,9 +549,9 @@ S.spawner = src S.name = "[get_area(snare_loc)] trap ([rand(1, 1000)])" src.snares |= S - src << "Surveillance trap deployed!" + to_chat(src, "Surveillance trap deployed!") else - src << "You have too many traps deployed. Delete some first." + to_chat(src, "You have too many traps deployed. Delete some first.") /mob/living/simple_animal/hostile/guardian/ranged/verb/DisarmSnare() set name = "Remove Surveillance Trap" @@ -567,7 +561,7 @@ if(picked_snare) src.snares -= picked_snare qdel(picked_snare) - src << "Snare disarmed." + to_chat(src, "Snare disarmed.") /obj/item/effect/snare name = "snare" @@ -580,11 +574,11 @@ if(istype(AM, /mob/living/)) var/turf/snare_loc = get_turf(src.loc) if(spawner) - spawner << "[AM] has crossed your surveillance trap at [get_area(snare_loc)]." + to_chat(spawner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(G.summoner) - G.summoner << "[AM] has crossed your surveillance trap at [get_area(snare_loc)]." + to_chat(G.summoner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") ////Bomb @@ -603,19 +597,19 @@ if(!istype(A)) return if(src.loc == summoner) - src << "You must be manifested to create bombs!" + to_chat(src, "You must be manifested to create bombs!") return if(istype(A, /obj/)) if(bomb_cooldown <= world.time && !stat) var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A)) - src << "Success! Bomb on \the [A] armed!" + to_chat(src, "Success! Bomb on \the [A] armed!") if(summoner) - summoner << "Your guardian has primed \the [A] to explode!" + to_chat(summoner, "Your guardian has primed \the [A] to explode!") bomb_cooldown = world.time + 200 B.spawner = src B.disguise (A) else - src << "Your powers are on cooldown! You must wait 20 seconds between bombs." + to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.") /obj/item/weapon/guardian_bomb name = "bomb" @@ -633,19 +627,19 @@ spawn(600) if(src) stored_obj.loc = get_turf(src.loc) - spawner << "Failure! Your trap on \the [stored_obj] didn't catch anyone this time." + to_chat(spawner, "Failure! Your trap on \the [stored_obj] didn't catch anyone this time.") qdel(src) /obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user) - user << "The [src] was boobytrapped!" + to_chat(user, "The [src] was boobytrapped!") if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(user == G.summoner) - user << "You knew this because of your link with your guardian, so you smartly defuse the bomb." + to_chat(user, "You knew this because of your link with your guardian, so you smartly defuse the bomb.") stored_obj.loc = get_turf(src.loc) qdel(src) return - spawner << "Success! Your trap on \the [src] caught [user]!" + to_chat(spawner, "Success! Your trap on \the [src] caught [user]!") stored_obj.loc = get_turf(src.loc) playsound(get_turf(src),'sound/effects/Explosion2.ogg', 200, 1) user.ex_act(2) @@ -662,7 +656,7 @@ /obj/item/weapon/guardian_bomb/examine(mob/user) stored_obj.examine(user) if(get_dist(user,src)<=2) - user << "Looks odd!" + to_chat(user, "Looks odd!") ////////Creation @@ -685,16 +679,16 @@ /obj/item/weapon/guardiancreator/attack_self(mob/living/user) for(var/mob/living/simple_animal/hostile/guardian/G in living_mob_list) if (G.summoner == user) - user << "You already have a [mob_name]!" + to_chat(user, "You already have a [mob_name]!") return if(user.mind && user.mind.changeling) - user << "[ling_failure]" + to_chat(user, "[ling_failure]") return if(used == TRUE) - user << "[used_message]" + to_chat(user, "[used_message]") return used = TRUE - user << "[use_message]" + to_chat(user, "[use_message]") var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, 0, 100) var/mob/dead/observer/theghost = null @@ -702,7 +696,7 @@ theghost = pick(candidates) spawn_guardian(user, theghost.key) else - user << "[failure_message]" + to_chat(user, "[failure_message]") used = FALSE @@ -734,10 +728,10 @@ G.summoner = user G.summoned = TRUE G.key = key - G << "You are a [mob_name] bound to serve [user.real_name]." - G << "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there." - G << "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself." - G << "[G.playstyle_string]" + to_chat(G, "You are a [mob_name] bound to serve [user.real_name].") + to_chat(G, "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there.") + to_chat(G, "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.") + to_chat(G, "[G.playstyle_string]") G.faction = user.faction user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall @@ -758,7 +752,7 @@ G.icon_state = "[theme][color]" G.icon_dead = "[theme][color]" - user << "[G.magic_fluff_string]." + to_chat(user, "[G.magic_fluff_string].") if("tech") color = pick("Rose", "Peony", "Lily", "Daisy", "Zinnia", "Ivy", "Iris", "Petunia", "Violet", "Lilac", "Orchid") //technically not colors, just flowers that can be specific colors picked_name = pick("Gallium", "Indium", "Thallium", "Bismuth", "Aluminium", "Mercury", "Iron", "Silver", "Zinc", "Titanium", "Chromium", "Nickel", "Platinum", "Tellurium", "Palladium", "Rhodium", "Cobalt", "Osmium", "Tungsten", "Iridium") @@ -769,12 +763,12 @@ G.icon_state = "[theme][color]" G.icon_dead = "[theme][color]" - user << "[G.tech_fluff_string]." + to_chat(user, "[G.tech_fluff_string].") G.speak_emote = list("states") if("bio") G.icon = 'icons/mob/mob.dmi' picked_name = pick("brood", "hive", "nest") - user << "[G.bio_fluff_string]." + to_chat(user, "[G.bio_fluff_string].") G.name = "[picked_name] swarm" G.color = picked_color G.real_name = "[picked_name] swarm" diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index 378ef84990a..f55370f2680 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -17,14 +17,7 @@ pass_flags = PASSTABLE ventcrawler = 2 - min_oxy = 0 - max_oxy = 0 - min_tox = 0 - max_tox = 0 - min_co2 = 0 - max_co2 = 0 - min_n2 = 0 - max_n2 = 0 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxHealth = 150 @@ -38,7 +31,7 @@ wander = 0 attacktext = "glomps" attack_sound = 'sound/effects/blobattack.ogg' - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab + butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2) var/morphed = 0 var/atom/movable/form = null @@ -59,7 +52,7 @@ else ..() if(get_dist(user,src)<=3) - user << "It doesn't look quite right..." + to_chat(user, "It doesn't look quite right...") else ..() return @@ -88,7 +81,7 @@ if(istype(A) && allowed(A)) assume(A) else - src << "Your chameleon skin is still repairing itself!" + to_chat(src, "Your chameleon skin is still repairing itself!") ..() /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index c0af9c38040..2e11c65078c 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -9,7 +9,7 @@ return kill() var/mob/C = pick(candidates) key_of_morph = C.key - + if(!key_of_morph) return kill() @@ -22,7 +22,7 @@ player_mind.assigned_role = "Morph" player_mind.special_role = "Morph" ticker.mode.traitors |= player_mind - S << S.playstyle_string + to_chat(S, S.playstyle_string) S << 'sound/magic/Mutate.ogg' message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 2fa99dd58a6..0e048b85df0 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -62,11 +62,11 @@ revealed = 0 incorporeal_move = 3 invisibility = INVISIBILITY_REVENANT - src << "You are once more concealed." + to_chat(src, "You are once more concealed.") if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = 0 - src << "You can move again!" + to_chat(src, "You can move again!") update_spooky_icon() /mob/living/simple_animal/revenant/ex_act(severity) @@ -86,7 +86,7 @@ return essence = max(0, essence-amount) if(essence == 0) - src << "You feel your essence fraying!" + to_chat(src, "You feel your essence fraying!") @@ -97,9 +97,9 @@ var/rendered = "[src] says, \"[message]\"" for(var/mob/M in mob_list) if(istype(M, /mob/living/simple_animal/revenant)) - M << rendered + to_chat(M, rendered) if(isobserver(M)) - M << "(F) [rendered]" + to_chat(M, "(F) [rendered]") return /mob/living/simple_animal/revenant/Stat() @@ -120,22 +120,23 @@ if(src.mind) src.mind.wipe_memory() src << 'sound/effects/ghost.ogg' - src << "
" - src << "You are a revenant." - src << "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant." - src << "You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds." - src << "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable." - src << "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities." - src << "You do not remember anything of your past lives, nor will you remember anything about this one after your death." - src << "Be sure to read the wiki page at http://nanotrasen.se/wiki/index.php/Revenant to learn more." + to_chat(src, "
") + to_chat(src, "You are a revenant.") + to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") + to_chat(src, "You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds.") + to_chat(src, "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.") + to_chat(src, "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities.") + to_chat(src, "You do not remember anything of your past lives, nor will you remember anything about this one after your death.") + to_chat(src, "Be sure to read the wiki page at http://nanotrasen.se/wiki/index.php/Revenant to learn more.") + var/datum/objective/revenant/objective = new objective.owner = src.mind src.mind.objectives += objective - src << "Objective #1: [objective.explanation_text]" + to_chat(src, "Objective #1: [objective.explanation_text]") var/datum/objective/revenantFluff/objective2 = new objective2.owner = src.mind src.mind.objectives += objective2 - src << "Objective #2: [objective2.explanation_text]" + to_chat(src, "Objective #2: [objective2.explanation_text]") ticker.mode.traitors |= src.mind //Necessary for announcing if(!src.giveSpells()) message_admins("Revenant was created but has no mind. Trying again in five seconds.") @@ -168,7 +169,7 @@ ghost_darkness_images -= ghostimage updateallghostimages() - src << "NO! No... it's too late, you can feel your essence breaking apart..." + to_chat(src, "NO! No... it's too late, you can feel your essence breaking apart...") notransform = 1 revealed = 1 invisibility = 0 @@ -204,13 +205,13 @@ return var/turf/T = get_turf(src) if(istype(T, /turf/simulated/wall)) - src << "You cannot use abilities from inside of a wall." + to_chat(src, "You cannot use abilities from inside of a wall.") return 0 if(src.inhibited) - src << "Your powers have been suppressed by nulling energy!" + to_chat(src, "Your powers have been suppressed by nulling energy!") return 0 if(!src.change_essence_amount(essence_cost, 1)) - src << "You lack the essence to use that ability." + to_chat(src, "You lack the essence to use that ability.") return 0 return 1 @@ -224,9 +225,9 @@ essence_accumulated = max(0, essence_accumulated+essence_amt) if(!silent) if(essence_amt > 0) - src << "Gained [essence_amt]E from [source]." + to_chat(src, "Gained [essence_amt]E from [source].") else - src << "Lost [essence_amt]E from [source]." + to_chat(src, "Lost [essence_amt]E from [source].") return 1 /mob/living/simple_animal/revenant/proc/reveal(time) @@ -238,10 +239,10 @@ invisibility = 0 incorporeal_move = 0 if(!unreveal_time) - src << "You have been revealed!" + to_chat(src, "You have been revealed!") unreveal_time = world.time + time else - src << "You have been revealed!" + to_chat(src, "You have been revealed!") unreveal_time = unreveal_time + time update_spooky_icon() @@ -252,10 +253,10 @@ return notransform = 1 if(!unstun_time) - src << "You cannot move!" + to_chat(src, "You cannot move!") unstun_time = world.time + time else - src << "You cannot move!" + to_chat(src, "You cannot move!") unstun_time = unstun_time + time update_spooky_icon() @@ -350,9 +351,9 @@ /obj/item/weapon/ectoplasm/revenant/examine(mob/user) ..(user) if(inert) - user << "It seems inert." + to_chat(user, "It seems inert.") else if(reforming) - user << "It is shifting and distorted. It would be wise to destroy this." + to_chat(user, "It is shifting and distorted. It would be wise to destroy this.") /obj/item/weapon/ectoplasm/revenant/proc/reform() if(inert || !src) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 54fd9999535..d836511fc42 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -29,47 +29,47 @@ if(!castcheck(0)) return if(draining) - src << "You are already siphoning the essence of a soul!" + to_chat(src, "You are already siphoning the essence of a soul!") return if(target in drained_mobs) - src << "[target]'s soul is dead and empty." + to_chat(src, "[target]'s soul is dead and empty.") return if(!target.stat) - src << "This being's soul is too strong to harvest." + to_chat(src, "This being's soul is too strong to harvest.") if(prob(10)) - target << "You feel as if you are being watched." + to_chat(target, "You feel as if you are being watched.") return draining = 1 essence_drained = rand(15, 20) - src << "You search for the soul of [target]." + to_chat(src, "You search for the soul of [target].") if(do_after(src, 10, 0, target = target)) //did they get deleted in that second? if(target.ckey) - src << "Their soul burns with intelligence." + to_chat(src, "Their soul burns with intelligence.") essence_drained += rand(20, 30) if(target.stat != DEAD) - src << "Their soul blazes with life!" + to_chat(src, "Their soul blazes with life!") essence_drained += rand(40, 50) else - src << "Their soul is weak and faltering." + to_chat(src, "Their soul is weak and faltering.") if(do_after(src, 20, 0, target = target)) //did they get deleted NOW? switch(essence_drained) if(1 to 30) - src << "[target] will not yield much essence. Still, every bit counts." + to_chat(src, "[target] will not yield much essence. Still, every bit counts.") if(30 to 70) - src << "[target] will yield an average amount of essence." + to_chat(src, "[target] will yield an average amount of essence.") if(70 to 90) - src << "Such a feast! [target] will yield much essence to you." + to_chat(src, "Such a feast! [target] will yield much essence to you.") if(90 to INFINITY) - src << "Ah, the perfect soul. [target] will yield massive amounts of essence to you." + to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.") if(do_after(src, 20, 0, target = target)) //how about now if(!target.stat) - src << "They are now powerful enough to fight off your draining." - target << "You feel something tugging across your body before subsiding." + to_chat(src, "They are now powerful enough to fight off your draining.") + to_chat(target, "You feel something tugging across your body before subsiding.") draining = 0 return //hey, wait a minute... - src << "You begin siphoning essence from [target]'s soul." + to_chat(src, "You begin siphoning essence from [target]'s soul.") if(target.stat != DEAD) - target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..." + to_chat(target, "You feel a horribly unpleasant draining sensation as your grip on life weakens...") icon_state = "revenant_draining" reveal(27) stun(27) @@ -80,14 +80,14 @@ if(essence_drained > 90) essence_regen_cap += 25 perfectsouls += 1 - src << "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." - src << "[target]'s soul has been considerably weakened and will yield no more essence for the time being." + to_chat(src, "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].") + to_chat(src, "[target]'s soul has been considerably weakened and will yield no more essence for the time being.") target.visible_message("[target] slumps onto the ground.", \ "Violets lights, dancing in your vision, getting clo--") drained_mobs.Add(target) target.death(0) else - src << "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken." + to_chat(src, "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken.") draining = 0 essence_drained = 0 if(target) //Wait, target is WHERE NOW? @@ -95,7 +95,7 @@ "Violets lights, dancing in your vision, receding--") return else - src << "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken." + to_chat(src, "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken.") draining = 0 essence_drained = 0 return @@ -132,8 +132,8 @@ charge_counter = charge_max return log_say("RevenantTransmit: [key_name(user)]->[key_name(M)] : [msg]") - usr << "You transmit to [M]: [msg]" - M << "An alien voice resonates from all around... [msg]" + to_chat(usr, "You transmit to [M]: [msg]") + to_chat(M, "An alien voice resonates from all around... [msg]") /obj/effect/proc_holder/spell/aoe_turf/revenant @@ -172,7 +172,7 @@ charge_counter = charge_max return 0 name = "[initial(name)] ([cast_amount]E)" - user << "You have unlocked [initial(name)]!" + to_chat(user, "You have unlocked [initial(name)]!") panel = "Revenant Abilities" locked = 0 charge_counter = charge_max @@ -248,7 +248,7 @@ T.flags -= NOJAUNT new/obj/effect/overlay/temp/revenant(T) for(var/mob/living/carbon/human/human in T.contents) - human << "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")]." + to_chat(human, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].") human.adjustStaminaLoss(stamdamage) human.adjustToxLoss(toxdamage) human.confused += confusion @@ -291,18 +291,18 @@ if(attempt_cast(user)) for(var/turf/T in targets) spawn(0) - for(var/obj/machinery/bot/bot in T.contents) + for(var/mob/living/simple_animal/bot/bot in T.contents) if(!bot.emagged) new/obj/effect/overlay/temp/revenant(bot.loc) bot.locked = 0 bot.open = 1 - bot.Emag(null) + bot.emag_act(null) for(var/mob/living/carbon/human/human in T.contents) - human << "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")]." + to_chat(human, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") new/obj/effect/overlay/temp/revenant(human.loc) human.emp_act(1) for(var/obj/thing in T.contents) - if(istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes) || istype(thing, /obj/machinery/bot)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery + if(istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery continue if(prob(20)) if(prob(50)) diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm index a057a696422..bab7c597a69 100644 --- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm +++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm @@ -7,7 +7,7 @@ if(iscarbon(src)) var/mob/living/carbon/C = src if(C.l_hand || C.r_hand) - C << "You may not hold items while blood crawling!" + to_chat(C, "You may not hold items while blood crawling!") return 0 var/obj/item/weapon/bloodcrawl/B1 = new(C) var/obj/item/weapon/bloodcrawl/B2 = new(C) @@ -42,17 +42,19 @@ var/mob/living/victim = pulling if(victim.stat == CONSCIOUS) visible_message("[victim] kicks free of [B] just before entering it!") + stop_pulling() else victim.forceMove(holder)//holder victim.emote("scream") visible_message("[src] drags [victim] into [B]!") kidnapped = victim + stop_pulling() flick("jaunt",animation) loc = holder holder = holder if(kidnapped) - src << "You begin to feast on [kidnapped]. You can not move while you are doing this." + to_chat(src, "You begin to feast on [kidnapped]. You can not move while you are doing this.") visible_message("Loud eating sounds come from the blood...") sleep(6) if(animation) @@ -61,7 +63,7 @@ playsound(get_turf(src),'sound/misc/Demon_consume.ogg', 100, 1) sleep(30) if(kidnapped) - src << "You devour [kidnapped]. Your health is fully restored." + to_chat(src, "You devour [kidnapped]. Your health is fully restored.") adjustBruteLoss(-1000) adjustFireLoss(-1000) adjustOxyLoss(-1000) @@ -71,7 +73,7 @@ var/mob/living/simple_animal/slaughter/demon = src demon.devoured++ - kidnapped << "You feel teeth sink into your flesh, and the--" + to_chat(kidnapped, "You feel teeth sink into your flesh, and the--") kidnapped.adjustBruteLoss(1000) kidnapped.forceMove(src) demon.consumed_mobs.Add(kidnapped) @@ -79,7 +81,7 @@ kidnapped.ghostize() qdel(kidnapped) else - src << "You happily devour... nothing? Your meal vanished at some point!" + to_chat(src, "You happily devour... nothing? Your meal vanished at some point!") else sleep(6) if (animation) @@ -94,48 +96,53 @@ flags = NODROP|ABSTRACT /mob/living/proc/phasein(var/obj/effect/decal/cleanable/B) + if(notransform) - src << "Finish eating first!" + to_chat(src, "Finish eating first!") return 0 - else - var/atom/movable/overlay/animation = new /atom/movable/overlay( B.loc ) - animation.name = "odd blood" - animation.density = 0 - animation.anchored = 1 - animation.icon = 'icons/mob/mob.dmi' - animation.icon_state = "jauntup" //Paradise Port:I reversed the jaunt animation so it looks like its rising up - animation.layer = 5 - animation.master = B.loc - animation.dir = dir - B.visible_message("[B] starts to bubble...") - if(!do_after(src, 20, target = B)) - return - if(!B) - return - forceMove(B.loc) - client.eye = src - if (prob(25) && istype(src, /mob/living/simple_animal/slaughter)) - var/list/voice = list('sound/hallucinations/behind_you1.ogg','sound/hallucinations/im_here1.ogg','sound/hallucinations/turn_around1.ogg','sound/hallucinations/i_see_you1.ogg') - playsound(get_turf(src), pick(voice),50, 1, -1) - visible_message("\The [src] rises out of \the [B]!") - playsound(get_turf(src), 'sound/misc/exit_blood.ogg', 100, 1, -1) - flick("jauntup",animation) - qdel(holder) - holder = null - if(iscarbon(src)) - var/mob/living/carbon/C = src - for(var/obj/item/weapon/bloodcrawl/BC in C) - C.flags = null - C.unEquip(BC) - qdel(BC) - var/oldcolor = color - color = B.color - sleep(6)//wait for animation to finish - if(animation) - qdel(animation) - spawn(30) - color = oldcolor - return 1 + B.visible_message("[B] starts to bubble...") + if(!do_after(src, 20, target = B)) + return + if(!B) + return + forceMove(B.loc) + client.eye = src + + var/atom/movable/overlay/animation = new /atom/movable/overlay( B.loc ) + animation.name = "odd blood" + animation.density = 0 + animation.anchored = 1 + animation.icon = 'icons/mob/mob.dmi' + animation.icon_state = "jauntup" //Paradise Port:I reversed the jaunt animation so it looks like its rising up + animation.layer = 5 + animation.master = B.loc + animation.dir = dir + + if(prob(25) && istype(src, /mob/living/simple_animal/slaughter)) + var/list/voice = list('sound/hallucinations/behind_you1.ogg','sound/hallucinations/im_here1.ogg','sound/hallucinations/turn_around1.ogg','sound/hallucinations/i_see_you1.ogg') + playsound(get_turf(src), pick(voice),50, 1, -1) + visible_message("\The [src] rises out of \the [B]!") + playsound(get_turf(src), 'sound/misc/exit_blood.ogg', 100, 1, -1) + + flick("jauntup",animation) + qdel(holder) + holder = null + + if(iscarbon(src)) + var/mob/living/carbon/C = src + for(var/obj/item/weapon/bloodcrawl/BC in C) + C.flags = null + C.unEquip(BC) + qdel(BC) + + var/oldcolor = color + color = B.color + sleep(6)//wait for animation to finish + if(animation) + qdel(animation) + spawn(30) + color = oldcolor + return 1 /obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow name = "odd blood" diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 9d6e3959963..6f97740f8d5 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -18,14 +18,7 @@ stop_automated_movement = 1 status_flags = CANPUSH attack_sound = 'sound/misc/demon_attack1.ogg' - min_oxy = 0 - max_oxy = INFINITY - min_tox = 0 - max_tox = INFINITY - min_co2 = 0 - max_co2 = INFINITY - min_n2 = 0 - max_n2 = INFINITY + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = INFINITY faction = list("slaughter") @@ -62,8 +55,8 @@ if(istype(loc, /obj/effect/dummy/slaughter)) bloodspell.phased = 1 if(mind) - src << src.playstyle_string - src << "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest." + to_chat(src, src.playstyle_string) + to_chat(src, "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest.") src << 'sound/misc/demon_dies.ogg' mind.current.verbs += /mob/living/simple_animal/slaughter/proc/slaughterWhisper if(!(vialspawned)) @@ -75,8 +68,8 @@ //Paradise Port:I added the objective for one spawned like this mind.objectives += objective mind.objectives += fluffObjective - src << "Objective #[1]: [objective.explanation_text]" - src << "Objective #[2]: [fluffObjective.explanation_text]" + to_chat(src, "Objective #[1]: [objective.explanation_text]") + to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]") /mob/living/simple_animal/slaughter/Life() @@ -107,7 +100,7 @@ /mob/living/simple_animal/slaughter/phasein() - ..() + . = ..() speed = 0 boost = world.time + 60 @@ -132,8 +125,8 @@ if(!(msg)) return log_say("Slaughter Demon Transmit: [key_name(usr)]->[key_name(M)]: [msg]") - usr << "You whisper to [M]: [msg]" - M << "Suddenly a strange, demonic voice resonates in your head... [msg]" + to_chat(usr, "You whisper to [M]: [msg]") + to_chat(M, "Suddenly a strange, demonic voice resonates in your head... [msg]") for(var/mob/dead/observer/G in player_list) G.show_message("Demonic message from [usr] ([ghost_follow_link(usr, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]") @@ -168,10 +161,10 @@ "You feel a strange power seep into your body... you have absorbed the demon's blood-travelling powers!") user.bloodcrawl = BLOODCRAWL else if(user.bloodcrawl == BLOODCRAWL) - user << "You feel diffr- CONSUME THEM! " + to_chat(user, "You feel diffr- CONSUME THEM! ") user.bloodcrawl = BLOODCRAWL_EAT else - user <<"...and you don't feel any different." + to_chat(user, "...and you don't feel any different.") user.drop_item() insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E diff --git a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm index cf7179f539d..e8afea4e1d0 100644 --- a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm +++ b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm @@ -32,7 +32,7 @@ datum/directive/bluespace_contagion/initialize() infected_names+="[candidate.mind.assigned_role] [candidate.mind.name]" special_orders = list( - "Quarantine these personnel: [list2text(infected_names, ", ")].", + "Quarantine these personnel: [jointext(infected_names, ", ")].", "Allow one hour for a cure to be manufactured.", "If no cure arrives after that time, execute and burn the infected.") diff --git a/code/game/gamemodes/mutiny/directives/vox_heist.dm b/code/game/gamemodes/mutiny/directives/vox_heist.dm index 52e8d0771ef..f652f7016d2 100644 --- a/code/game/gamemodes/mutiny/directives/vox_heist.dm +++ b/code/game/gamemodes/mutiny/directives/vox_heist.dm @@ -69,7 +69,7 @@ datum/directive/vox_heist/initialize() sympathizer_names.Add("[candidate.mind.assigned_role] [candidate.mind.name]") if(sympathizers.len) - special_orders.Add("Brig the following sympathizers: [list2text(sympathizer_names, ", ")]") + special_orders.Add("Brig the following sympathizers: [jointext(sympathizer_names, ", ")]") datum/directive/vox_heist/meets_prerequisites() var/list/candidates = get_vox_candidates() diff --git a/code/game/gamemodes/mutiny/emergency_authentication_device.dm b/code/game/gamemodes/mutiny/emergency_authentication_device.dm index 2a48ac8c3b7..168f0049560 100644 --- a/code/game/gamemodes/mutiny/emergency_authentication_device.dm +++ b/code/game/gamemodes/mutiny/emergency_authentication_device.dm @@ -45,7 +45,7 @@ /obj/machinery/emergency_authentication_device/attack_hand(mob/user) if(activated) - user << "\blue \The [src] is already active!" + to_chat(user, "\blue \The [src] is already active!") return if(!mode.current_directive.directives_complete()) @@ -55,7 +55,7 @@ check_key_existence() if(captains_key && secondary_key) activated = 1 - user << "\blue You activate \the [src]!" + to_chat(user, "\blue You activate \the [src]!") state("Command acknowledged. Initiating quantum entanglement relay to Nanotrasen High Command.") launch_shuttle() return @@ -77,7 +77,7 @@ /obj/machinery/emergency_authentication_device/attackby(obj/item/weapon/O, mob/user, params) if(activated) - user << "\blue \The [src] is already active!" + to_chat(user, "\blue \The [src] is already active!") return if(!mode.current_directive.directives_complete()) @@ -107,5 +107,6 @@ ..() /obj/machinery/emergency_authentication_device/examine(mob/user) - user << {"This is a specialized communications device that is able to instantly send a message to Nanotrasen High Command via quantum entanglement with a sister device at CentComm.
- The EAD's status is [get_status()]."} + to_chat(user, {"This is a specialized communications device that is able to instantly send a message to Nanotrasen High Command via quantum entanglement + with a sister device at CentComm.
+ The EAD's status is [get_status()]."}) diff --git a/code/game/gamemodes/mutiny/key_pinpointer.dm b/code/game/gamemodes/mutiny/key_pinpointer.dm index 4d4596ab229..03f157be2ba 100644 --- a/code/game/gamemodes/mutiny/key_pinpointer.dm +++ b/code/game/gamemodes/mutiny/key_pinpointer.dm @@ -14,22 +14,22 @@ active = 1 target = mutiny.captains_key point_at(target) - usr << "\blue You calibrate \the [src] to locate the Captain's Authentication Key." + to_chat(usr, "\blue You calibrate \the [src] to locate the Captain's Authentication Key.") if (1) mode = 2 target = mutiny.secondary_key - usr << "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key." + to_chat(usr, "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key.") else mode = 0 active = 0 icon_state = "pinoff" - usr << "\blue You switch \the [src] off." + to_chat(usr, "\blue You switch \the [src] off.") /obj/item/weapon/pinpointer/advpinpointer/auth_key/examine(mob/user) switch(mode) if (1) - user << "Is is calibrated for the Captain's Authentication Key." + to_chat(user, "Is is calibrated for the Captain's Authentication Key.") if (2) - user << "It is calibrated for the Emergency Secondary Authentication Key." + to_chat(user, "It is calibrated for the Emergency Secondary Authentication Key.") else - user << "It is switched off." + to_chat(user, "It is switched off.") diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index e3edc521f33..e08a336997a 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -91,7 +91,7 @@ datum/game_mode/mutiny var/list/candidates[0] for(var/T in subtypesof(/datum/directive)) var/datum/directive/D = new T(src) -// world << D.name +// to_chat(world, D.name) if (D.meets_prerequisites()) candidates+=D return candidates @@ -126,7 +126,7 @@ datum/game_mode/mutiny proc/equip_head(datum/mind/head, faction, proc/recruitment_verb) var/mob/living/carbon/human/H = head.current - H << "You are the Head [capitalize(faction)]!" + to_chat(H, "You are the Head [capitalize(faction)]!") head.special_role = "head_[faction]" var/slots = get_equipment_slots() @@ -151,8 +151,8 @@ datum/game_mode/mutiny proc/add_faction(datum/mind/M, faction, list/faction_list) if(!can_be_recruited(M, faction)) - M.current << "\red Recruitment canceled; your role has already changed." - head_mutineer.current << "\red Could not recruit [M]. Their role has changed." + to_chat(M.current, "\red Recruitment canceled; your role has already changed.") + to_chat(head_mutineer.current, "\red Could not recruit [M]. Their role has changed.") return if(M in loyalists) @@ -165,11 +165,11 @@ datum/game_mode/mutiny faction_list+=M if(faction == "mutineer") - M.current << fluff.mutineer_tag("You have joined the mutineers!") - head_mutineer.current << fluff.mutineer_tag("[M] has joined the mutineers!") + to_chat(M.current, fluff.mutineer_tag("You have joined the mutineers!")) + to_chat(head_mutineer.current, fluff.mutineer_tag("[M] has joined the mutineers!")) else - M.current << fluff.loyalist_tag("You have joined the loyalists!") - head_loyalist.current << fluff.loyalist_tag("[M] has joined the loyalists!") + to_chat(M.current, fluff.loyalist_tag("You have joined the loyalists!")) + to_chat(head_loyalist.current, fluff.loyalist_tag("[M] has joined the loyalists!")) update_icon(M) @@ -211,23 +211,23 @@ datum/game_mode/mutiny return M.special_role == "loyalist" proc/round_outcome() - world << "
Breaking News
" + to_chat(world, "
Breaking News
") if (was_bloodbath()) - world << fluff.no_victory() + to_chat(world, fluff.no_victory()) return var/directives_completed = current_directive.directives_complete() var/ead_activated = ead.activated if (directives_completed && ead_activated) - world << fluff.loyalist_major_victory() + to_chat(world, fluff.loyalist_major_victory()) else if (directives_completed && !ead_activated) - world << fluff.loyalist_minor_victory() + to_chat(world, fluff.loyalist_minor_victory()) else if (!directives_completed && ead_activated) - world << fluff.mutineer_minor_victory() + to_chat(world, fluff.mutineer_minor_victory()) else if (!directives_completed && !ead_activated) - world << fluff.mutineer_major_victory() + to_chat(world, fluff.mutineer_major_victory()) - world << sound('sound/machines/twobeep.ogg') + to_chat(world, sound('sound/machines/twobeep.ogg')) proc/update_all_icons() spawn(0) @@ -266,17 +266,17 @@ datum/game_mode/mutiny /datum/game_mode/mutiny/pre_setup() var/list/loyalist_candidates = get_head_loyalist_candidates() if(!loyalist_candidates || loyalist_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for head loyalist." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for head loyalist.") return 0 var/list/mutineer_candidates = get_head_mutineer_candidates() if(!mutineer_candidates || mutineer_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for head mutineer." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for head mutineer.") return 0 var/list/directive_candidates = get_directive_candidates() if(!directive_candidates || directive_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for Directive X." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for Directive X.") return 0 head_loyalist = pick(loyalist_candidates) @@ -316,11 +316,11 @@ datum/game_mode/mutiny candidates += P if(!candidates.len) - src << "\red You aren't close enough to anybody that can be recruited." + to_chat(src, "\red You aren't close enough to anybody that can be recruited.") return if(world.time < mode.recruit_loyalist_cooldown) - src << "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again." + to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") return mode.recruit_loyalist_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -328,7 +328,7 @@ datum/game_mode/mutiny var/mob/living/carbon/human/M = input("Select a person to recruit", "Loyalist recruitment", null) as mob in candidates if (M) - src << "Attempting to recruit [M]..." + to_chat(src, "Attempting to recruit [M]...") log_admin("[key_name(src)] attempted to recruit [M] as a loyalist.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a loyalist.") @@ -336,8 +336,8 @@ datum/game_mode/mutiny if(choice == "Yes") mode.add_loyalist(M.mind) else if(choice == "No") - M << "\red You declined to join the loyalists." - mode.head_loyalist.current << "\red [M] declined to support the loyalists." + to_chat(M, "\red You declined to join the loyalists.") + to_chat(mode.head_loyalist.current, "\red [M] declined to support the loyalists.") /mob/living/carbon/human/proc/recruit_mutineer() set name = "Recruit Mutineer" @@ -353,11 +353,11 @@ datum/game_mode/mutiny candidates += P if(!candidates.len) - src << "\red You aren't close enough to anybody that can be recruited." + to_chat(src, "\red You aren't close enough to anybody that can be recruited.") return if(world.time < mode.recruit_mutineer_cooldown) - src << "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again." + to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") return mode.recruit_mutineer_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -365,7 +365,7 @@ datum/game_mode/mutiny var/mob/living/carbon/human/M = input("Select a person to recruit", "Mutineer recruitment", null) as mob in candidates if (M) - src << "Attempting to recruit [M]..." + to_chat(src, "Attempting to recruit [M]...") log_admin("[key_name(src)] attempted to recruit [M] as a mutineer.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a mutineer.") @@ -373,8 +373,8 @@ datum/game_mode/mutiny if(choice == "Yes") mode.add_mutineer(M.mind) else if(choice == "No") - M << "\red You declined to join the mutineers." - mode.head_mutineer.current << "\red [M] declined to support the mutineers." + to_chat(M, "\red You declined to join the mutineers.") + to_chat(mode.head_mutineer.current, "\red [M] declined to support the mutineers.") /proc/get_mutiny_mode() if(!ticker || !istype(ticker.mode, /datum/game_mode/mutiny)) diff --git a/code/game/gamemodes/mutiny/mutiny_fluff.dm b/code/game/gamemodes/mutiny/mutiny_fluff.dm index f25e9978e33..b67635f0724 100644 --- a/code/game/gamemodes/mutiny/mutiny_fluff.dm +++ b/code/game/gamemodes/mutiny/mutiny_fluff.dm @@ -72,8 +72,8 @@ They don't care about us they only care about WEALTH and POWER... Share this mes Be safe, friend.\" (Unable to Reply)"} proc/announce() - world << "The current game mode is - Mutiny!" - world << {" + to_chat(world, "The current game mode is - Mutiny!") + to_chat(world, {"
The crew will be divided by their sense of ethics when a morally turbulent emergency directive arrives with an incomplete command validation code.
The [loyalist_tag("Head Loyalist")] is the Captain, who carries the [loyalist_tag("Captain's Authentication Key")] at all times.
The [mutineer_tag("Head Mutineer")] is a random Head of Staff who carries the [mutineer_tag("Emergency Secondary Authentication Key")].
Loyalists - Follow the Head Loyalist in carrying out [loyalist_tag("Nanotrasen's directives")] then activate the EAD.
Mutineers - Prevent the completion of the [mutineer_tag("improperly validated directives")] and the activation of the EAD.
-
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head)." + to_chat(world, "The current game mode is - Revolution!") + to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).") /////////////////////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role]." + to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") for(var/datum/mind/rev_mind in mode.revolutionaries) for(var/datum/mind/head_mind in heads) @@ -135,7 +135,7 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role]." + to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") /datum/game_mode/proc/forge_revolutionary_objectives(var/datum/mind/rev_mind) @@ -153,9 +153,9 @@ /datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") for(var/datum/objective/objective in rev_mind.objectives) - rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -168,7 +168,7 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") - mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") mob.mutations.Remove(CLUMSY) @@ -183,9 +183,9 @@ ) var/where = mob.equip_in_one_of_slots(T, slots) if (!where) - mob << "The Syndicate were unfortunately unable to get you a flash." + to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.") else - mob << "The flash in your [where] will help you to persuade the crew to join your cause." + to_chat(mob, "The flash in your [where] will help you to persuade the crew to join your cause.") mob.update_icons() return 1 @@ -222,7 +222,7 @@ if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) return 0 revolutionaries += rev_mind - rev_mind.current << "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!" + to_chat(rev_mind.current, "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!") rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) @@ -237,18 +237,18 @@ rev_mind.special_role = null if(beingborged) - rev_mind.current << "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now." + to_chat(rev_mind.current, "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now.") message_admins("[key_name_admin(rev_mind.current)] has been borged while being a member of the revolution.") else - rev_mind.current << "\red You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you..." + to_chat(rev_mind.current, "\red You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") update_rev_icons_removed(rev_mind) for(var/mob/living/M in view(rev_mind.current)) if(beingborged) - M << "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it." + to_chat(M, "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.") else - M << "[rev_mind.current] looks like they just remembered their real allegiance!" + to_chat(M, "[rev_mind.current] looks like they just remembered their real allegiance!") ///////////////////////////////////// @@ -294,10 +294,10 @@ /datum/game_mode/revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads killed") - world << "\red The heads of staff were killed or abandoned the station! The revolutionaries win!" + to_chat(world, "\red The heads of staff were killed or abandoned the station! The revolutionaries win!") else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "\red The heads of staff managed to stop the revolution!" + to_chat(world, "\red The heads of staff managed to stop the revolution!") ..() return 1 @@ -325,7 +325,7 @@ for(var/datum/objective/mutiny/objective in headrev.objectives) targets |= objective.target - world << text + to_chat(world, text) if(revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution)) var/text = "The revolutionaries were:" @@ -345,7 +345,7 @@ text += "body destroyed" text += ")" - world << text + to_chat(world, text) if( head_revolutionaries.len || revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution) ) @@ -374,7 +374,7 @@ if(target) text += "" - world << text + to_chat(world, text) /proc/is_convertable_to_rev(datum/mind/mind) return istype(mind) && \ diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index ef2ec130047..78d210159a8 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -75,9 +75,9 @@ /datum/game_mode/revolution/rp_revolution/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") for(var/datum/objective/objective in rev_mind.objectives) - rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -89,7 +89,7 @@ // Tell them about people they might want to contact. var/mob/living/carbon/human/M = get_nt_opposed() if(M && !(M.mind in head_revolutionaries) && !(M in already_considered)) - rev_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them." + to_chat(rev_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") rev_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /////////////////////////////////////////////////// @@ -103,7 +103,7 @@ if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) return 0 revolutionaries += rev_mind - rev_mind.current << "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill, capture or convert the heads to win the revolution!" + to_chat(rev_mind.current, "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill, capture or convert the heads to win the revolution!") rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) return 1 @@ -127,8 +127,8 @@ //Announces the game type// /////////////////////////// /datum/game_mode/revolution/rp_revolution/announce() - world << "The current game mode is - Revolution!" - world << "Some crewmembers are attempting to start a revolution!" + to_chat(world, "The current game mode is - Revolution!") + to_chat(world, "Some crewmembers are attempting to start a revolution!") ////////////////////////////////////////////////////////////////////// @@ -137,10 +137,10 @@ /datum/game_mode/revolution/rp_revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads overthrown") - world << "\red The heads of staff were overthrown! The revolutionaries win!" + to_chat(world, "\red The heads of staff were overthrown! The revolutionaries win!") else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") - world << "\red The heads of staff managed to stop the revolution!" + to_chat(world, "\red The heads of staff managed to stop the revolution!") ..() return 1 @@ -159,29 +159,29 @@ if(!stat && P.client && P.mind && !P.mind.special_role) Possible += P if(!Possible.len) - src << "\red There doesn't appear to be anyone available for you to convert here." + to_chat(src, "\red There doesn't appear to be anyone available for you to convert here.") return var/mob/living/carbon/human/M = input("Select a person to convert", "Viva la revolution!", null) as mob in Possible if(((src.mind in ticker.mode:head_revolutionaries) || (src.mind in ticker.mode:revolutionaries))) if((M.mind in ticker.mode:head_revolutionaries) || (M.mind in ticker.mode:revolutionaries)) - src << "\red [M] is already be a revolutionary!" + to_chat(src, "\red [M] is already be a revolutionary!") else if(!ticker.mode:is_convertible(M)) - src << "\red [M] is implanted with a loyalty implant - Remove it first!" + to_chat(src, "\red [M] is implanted with a loyalty implant - Remove it first!") else if(world.time < M.mind.rev_cooldown) - src << "\red Wait five seconds before reconversion attempt." + to_chat(src, "\red Wait five seconds before reconversion attempt.") return - src << "\red Attempting to convert [M]..." + to_chat(src, "\red Attempting to convert [M]...") log_admin("[src]([src.ckey]) attempted to convert [M].") message_admins("\red [src]([src.ckey]) attempted to convert [M].") var/choice = alert(M,"Asked by [src]: Do you want to join the revolution?","Align Thyself with the Revolution!","No!","Yes!") if(choice == "Yes!") ticker.mode:add_revolutionary(M.mind) - M << "\blue You join the revolution!" - src << "\blue [M] joins the revolution!" + to_chat(M, "\blue You join the revolution!") + to_chat(src, "\blue [M] joins the revolution!") else if(choice == "No!") - M << "\red You reject this traitorous cause!" - src << "\red [M] does not support the revolution!" + to_chat(M, "\red You reject this traitorous cause!") + to_chat(src, "\red [M] does not support the revolution!") M.mind.rev_cooldown = world.time+50 /datum/game_mode/revolution/rp_revolution/process() @@ -208,7 +208,7 @@ update_rev_icons_added(H.mind) H.verbs += /mob/living/carbon/human/proc/RevConvert - H << "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion." + to_chat(H, "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion.") added_heads = 1 break @@ -241,7 +241,7 @@ comm.messagetitle.Add("Cent. Com. Announcement") comm.messagetext.Add(message) - world << sound('sound/AI/commandreport.ogg') + to_chat(world, sound('sound/AI/commandreport.ogg')) /datum/game_mode/revolution/rp_revolution/latespawn(mob/M) if(M.mind.assigned_role in command_positions) @@ -254,4 +254,4 @@ rev_obj.target = M.mind rev_obj.explanation_text = "Assassinate, convert or capture [M.real_name], the [M.mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated." + to_chat(rev_mind.current, "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated.") diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 510fccd9e9c..4d061d37eca 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -52,11 +52,11 @@ datum/hSB if("hsbtobj") if(!admin) return if(hsboxspawn) - world << "Sandbox: [usr.key] has disabled object spawning!" + to_chat(world, "Sandbox: [usr.key] has disabled object spawning!") hsboxspawn = 0 return if(!hsboxspawn) - world << "Sandbox: [usr.key] has enabled object spawning!" + to_chat(world, "Sandbox: [usr.key] has enabled object spawning!") hsboxspawn = 1 return if("hsbsuit") @@ -105,7 +105,7 @@ datum/hSB hsb.req_access += A hsb.loc = usr.loc - usr << "Sandbox: Created an airlock." + to_chat(usr, "Sandbox: Created an airlock.") if("hsbcanister") var/list/hsbcanisters = subtypesof(/obj/machinery/portable_atmospherics/canister/) var/hsbcanister = input(usr, "Choose a canister to spawn.", "Sandbox:") in hsbcanisters + "Cancel" diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 5f13763e5f2..1be9a0ced0e 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -7,8 +7,8 @@ uplink_uses = 10 /datum/game_mode/sandbox/announce() - world << "The current game mode is - Sandbox!" - world << "Build your own station with the sandbox-panel command!" + to_chat(world, "The current game mode is - Sandbox!") + to_chat(world, "Build your own station with the sandbox-panel command!") /datum/game_mode/sandbox/pre_setup() for(var/mob/M in player_list) diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 0ca28de0aa7..44adae0d98a 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -95,9 +95,6 @@ if(istype(M, /obj/effect/decal/cleanable/blood)) score_mess += 1 - if(istype(M, /obj/effect/decal/cleanable/poop)) - score_mess += 1 - if(istype(M, /obj/effect/decal/cleanable/vomit)) score_mess += 1 @@ -151,8 +148,8 @@ score_crewscore -= plaguepoints // Show the score - might add "ranks" later - world << "The crew's final score is:" - world << "[score_crewscore]" + to_chat(world, "The crew's final score is:") + to_chat(world, "[score_crewscore]") for(var/mob/E in player_list) if(E.client) if(E.client.prefs && !(E.client.prefs.toggles & DISABLE_SCOREBOARD)) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 47479f42cb4..5c6ca539f91 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -69,14 +69,15 @@ Made by Xhuis name = "shadowling" config_tag = "shadowling" required_players = 30 + required_players_secret = 30 required_enemies = 2 recommended_enemies = 2 restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent") /datum/game_mode/shadowling/announce() - world << "The current game mode is - Shadowling!" - world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." + to_chat(world, "The current game mode is - Shadowling!") + to_chat(world, "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding.") /datum/game_mode/shadowling/pre_setup() if(config.protect_roles_from_antagonist) @@ -104,8 +105,8 @@ Made by Xhuis for(var/datum/mind/shadow in shadows) log_game("[shadow.key] (ckey) has been selected as a Shadowling.") sleep(10) - shadow.current << "
" - shadow.current << "You are a shadowling!" + to_chat(shadow.current, "
") + to_chat(shadow.current, "You are a shadowling!") greet_shadow(shadow) finalize_shadowling(shadow) process_shadow_objectives(shadow) @@ -113,10 +114,11 @@ Made by Xhuis ..() /datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) - shadow.current << "Currently, you are disguised as an employee aboard [world.name]." - shadow.current << "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8)." - shadow.current << "Any other shadowlings are your allies. You must assist them as they shall assist you." - shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at http://nanotrasen.se/wiki/index.php/Shadowling
" + to_chat(shadow.current, "Currently, you are disguised as an employee aboard [world.name].") + to_chat(shadow.current, "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8).") + to_chat(shadow.current, "Any other shadowlings are your allies. You must assist them as they shall assist you.") + to_chat(shadow.current, "If you are new to shadowling, or want to read about abilities, check the wiki page at http://nanotrasen.se/wiki/index.php/Shadowling
") + /datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) @@ -126,7 +128,7 @@ Made by Xhuis objective_explanation = "Ascend to your true form by use of the Ascendance ability. This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." shadow_objectives += "enthrall" shadow_mind.memory += "Objective #1: [objective_explanation]" - shadow_mind.current << "Objective #1: [objective_explanation]
" + to_chat(shadow_mind.current, "Objective #1: [objective_explanation]
") /datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) @@ -136,7 +138,7 @@ Made by Xhuis shadow_mind.current.add_language("Shadowling Hivemind") update_shadow_icons_added(shadow_mind) if(shadow_mind.assigned_role == "Clown") - S << "Your alien nature has allowed you to overcome your clownishness." + to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") S.mutations.Remove(CLUMSY) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) @@ -151,12 +153,12 @@ Made by Xhuis new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall) - new_thrall_mind.current << "You see the truth. Reality has been torn away and you realize what a fool you've been." - new_thrall_mind.current << "The shadowlings are your masters. Serve them above all else and ensure they complete their goals." - new_thrall_mind.current << "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls." - new_thrall_mind.current << "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask." - new_thrall_mind.current << "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab." - new_thrall_mind.current << "You may communicate with your allies by speaking in the Shadowling Hivemind (:8)." + to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") + to_chat(new_thrall_mind.current, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") + to_chat(new_thrall_mind.current, "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.") + to_chat(new_thrall_mind.current, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.") + to_chat(new_thrall_mind.current, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.") + to_chat(new_thrall_mind.current, "You may communicate with your allies by speaking in the Shadowling Hivemind (:8).") if(jobban_isbanned(new_thrall_mind.current, ROLE_SHADOWLING)) replace_jobbaned_player(new_thrall_mind.current, ROLE_SHADOWLING) @@ -239,13 +241,13 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() if(check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X - world << "The shadowlings have ascended and taken over the station!" + to_chat(world, "The shadowlings have ascended and taken over the station!") else if(shadowling_dead && !check_shadow_victory()) //If the shadowlings have ascended, they can not lose the round - world << "The shadowlings have been killed by the crew!" + to_chat(world, "The shadowlings have been killed by the crew!") else if(!check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) - world << "The crew escaped the station before the shadowlings could ascend!" + to_chat(world, "The crew escaped the station before the shadowlings could ascend!") else - world << "The shadowlings have failed!" + to_chat(world, "The shadowlings have failed!") ..() return 1 @@ -282,7 +284,7 @@ Made by Xhuis text += "body destroyed" text += ")" text += "
" - world << text + to_chat(world, text) /* @@ -317,7 +319,7 @@ Made by Xhuis if(light_amount > LIGHT_DAM_THRESHOLD && !H.incorporeal_move) //Can survive in very small light levels. Also doesn't take damage while incorporeal, for shadow walk purposes H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) if(H.stat != DEAD) - H << "The light burns you!" //Message spam to say "GET THE FUCK OUT" + to_chat(H, "The light burns you!")//Message spam to say "GET THE FUCK OUT" H << 'sound/weapons/sear.ogg' else if(light_amount < LIGHT_HEAL_THRESHOLD) H.heal_overall_damage(5, 5) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 64710ac14de..b350a0556d3 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -4,9 +4,12 @@ if(!H || !istype(H)) return if(H.get_species() == "Shadowling" && is_shadow(H)) return 1 if(H.get_species() == "Lesser Shadowling" && is_thrall(H)) return 1 - if(!is_shadow_or_thrall(usr)) usr << "You can't wrap your head around how to do this." - else if(is_thrall(usr)) usr << "You aren't powerful enough to do this." - else if(is_shadow(usr)) usr << "Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first." + if(!is_shadow_or_thrall(usr)) + to_chat(usr, "You can't wrap your head around how to do this.") + else if(is_thrall(usr)) + to_chat(usr, "You aren't powerful enough to do this.") + else if(is_shadow(usr)) + to_chat(usr, "Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.") return 0 @@ -21,27 +24,27 @@ /obj/effect/proc_holder/spell/targeted/glare/cast(list/targets) for(var/mob/living/carbon/human/target in targets) if(!ishuman(target)) - usr << "You may only glare at humans!" + to_chat(usr, "You may only glare at humans!") charge_counter = charge_max return if(!shadowling_check(usr)) charge_counter = charge_max return if(target.stat) - usr << "[target] must be conscious!" + to_chat(usr, "[target] must be conscious!") charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You don't see why you would want to paralyze an ally." + to_chat(usr, "You don't see why you would want to paralyze an ally.") charge_counter = charge_max return var/mob/living/carbon/human/M = target usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by their heavenly beauty..." + to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by their heavenly beauty...") else //Only alludes to the shadowling if the target is close by - target << "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights..." + to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights...") target.Stun(10) M.silent += 10 @@ -57,24 +60,24 @@ /obj/effect/proc_holder/spell/targeted/lesser_glare/cast(list/targets) for(var/mob/living/carbon/human/target in targets) if(!ishuman(target) || !target) - usr << "You nay only glare at humans!" + to_chat(usr, "You nay only glare at humans!") charge_counter = charge_max return if(target.stat) - usr << "[target] must be conscious!" + to_chat(usr, "[target] must be conscious!") charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You cannot glare at allies!" + to_chat(usr, "You cannot glare at allies!") charge_counter = charge_max return var/mob/living/carbon/human/M = target usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights..." + to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights...") else - target << "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty..." + to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...") target.Stun(3) //Roughly 30% as long as the normal one M.silent += 3 @@ -139,7 +142,7 @@ if(!shadowling_check(usr)) charge_counter = charge_max return - usr << "You silently disable all nearby lights." + to_chat(usr, "You silently disable all nearby lights.") for(var/obj/effect/glowshroom/G in orange(2, usr)) //Why the fuck was this in the loop below? G.visible_message("\The [G] withers away!") qdel(G) @@ -233,10 +236,10 @@ return var/mob/living/carbon/human/H = user if(!H.vision_type) - H << "You shift the nerves in your eyes, allowing you to see in the dark." + to_chat(H, "You shift the nerves in your eyes, allowing you to see in the dark.") H.vision_type = new vision_path else - H << "You return your vision to normal." + to_chat(H, "You return your vision to normal.") H.vision_type = null /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall @@ -257,7 +260,7 @@ if(!shadowling_check(usr)) charge_counter = charge_max return - usr << "You freeze the nearby air." + to_chat(usr, "You freeze the nearby air.") playsound(usr.loc, 'sound/effects/ghost2.ogg', 50, 1) for(var/turf/T in targets) @@ -266,9 +269,9 @@ if(M == usr) //No message for the user, of course continue else - M << "You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!" + to_chat(M, "You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!") continue - M << "A wave of shockingly cold air engulfs you!" + to_chat(M, "A wave of shockingly cold air engulfs you!") M.Stun(2) M.apply_damage(10, BURN) if(M.bodytemperature) @@ -298,69 +301,69 @@ return for(var/mob/living/carbon/human/target in targets) if(!in_range(usr, target)) - usr << "You need to be closer to enthrall [target]." + to_chat(usr, "You need to be closer to enthrall [target].") charge_counter = charge_max return if(!target.key || !target.mind) - usr << "The target has no mind." + to_chat(usr, "The target has no mind.") charge_counter = charge_max return if(target.stat) - usr << "The target must be conscious." + to_chat(usr, "The target must be conscious.") charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You can not enthrall allies." + to_chat(usr, "You can not enthrall allies.") charge_counter = charge_max return if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") charge_counter = charge_max return if(enthralling) - usr << "You are already enthralling!" + to_chat(usr, "You are already enthralling!") charge_counter = charge_max return if(!target.client) - usr << "[target]'s mind is vacant of activity." + to_chat(usr, "[target]'s mind is vacant of activity.") enthralling = 1 - usr << "This target is valid. You begin the enthralling." - target << "[usr] stares at you. You feel your head begin to pulse." + to_chat(usr, "This target is valid. You begin the enthralling.") + to_chat(target, "[usr] stares at you. You feel your head begin to pulse.") for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) - usr << "You place your hands to [target]'s head..." + to_chat(usr, "You place your hands to [target]'s head...") usr.visible_message("[usr] places their hands onto the sides of [target]'s head!") if(2) - usr << "You begin preparing [target]'s mind as a blank slate..." + to_chat(usr, "You begin preparing [target]'s mind as a blank slate...") usr.visible_message("[usr]'s palms flare a bright red against [target]'s temples!") - target << "A terrible red light floods your mind. You collapse as conscious thought is wiped away." + to_chat(target, "A terrible red light floods your mind. You collapse as conscious thought is wiped away.") target.Weaken(12) sleep(20) if(isloyal(target)) - usr << "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time." + to_chat(usr, "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time.") usr.visible_message("[usr] pauses, then dips their head in concentration!") - target << "You feel your loyalties begin to weaken!" + to_chat(target, "You feel your loyalties begin to weaken!") sleep(100) //10 seconds - not spawn() so the enthralling takes longer - usr << "The nanobots composing the loyalty implant have been rendered inert. Now to continue." + to_chat(usr, "The nanobots composing the loyalty implant have been rendered inert. Now to continue.") usr.visible_message("[usr] relaxes again.") for(var/obj/item/weapon/implant/loyalty/L in target) if(L && L.implanted) qdel(L) - target << "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies." + to_chat(target, "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies.") if(3) - usr << "You begin planting the tumor that will control the new thrall..." + to_chat(usr, "You begin planting the tumor that will control the new thrall...") usr.visible_message("A strange energy passes from [usr]'s hands into [target]'s head!") - target << "You feel your memories twisting, morphing. A sense of horror dominates your mind." + to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") if(!do_mob(usr, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a loyalty implant - usr << "The enthralling has been interrupted - your target's mind returns to its previous state." - target << "You wrest yourself away from [usr]'s hands and compose yourself" + to_chat(usr, "The enthralling has been interrupted - your target's mind returns to its previous state.") + to_chat(target, "You wrest yourself away from [usr]'s hands and compose yourself") enthralling = 0 return enthralling = 0 - usr << "You have enthralled [target]!" + to_chat(usr, "You have enthralled [target]!") target.visible_message("[target] looks to have experienced a revelation!", \ "False faces all dark not real not real not--") target.setOxyLoss(0) //In case the shadowling was choking them out @@ -379,7 +382,7 @@ /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor/cast(list/targets) if(!is_shadow(usr)) - usr << "You must be a shadowling to do this!" + to_chat(usr, "You must be a shadowling to do this!") charge_counter = charge_max return for(var/mob/living/user in targets) @@ -421,45 +424,45 @@ var/victory_threshold = 15 var/mob/M - user << "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls." + to_chat(user, "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls.") for(M in living_mob_list) if(is_thrall(M)) thralls++ - M << "You feel hooks sink into your mind and pull." + to_chat(M, "You feel hooks sink into your mind and pull.") if(!do_after(user, 30, target = user)) - user << "Your concentration has been broken. The mental hooks you have sent out now retract into your mind." + to_chat(user, "Your concentration has been broken. The mental hooks you have sent out now retract into your mind.") return if(thralls >= 3 && !screech_acquired) screech_acquired = 1 - user << "The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies, plus stunning silicon lifeforms." + to_chat(user, "The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies, plus stunning silicon lifeforms.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/unearthly_screech) if(thralls >= 5 && !blind_smoke_acquired) blind_smoke_acquired = 1 - user << "The power of your thralls has granted you the Blinding Smoke ability. It will create a choking cloud that will blind any non-thralls who enter. \ - " + to_chat(user, "The power of your thralls has granted you the Blinding Smoke ability. \ + It will create a choking cloud that will blind any non-thralls who enter.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/blindness_smoke) if(thralls >= 7 && !drainLifeAcquired) drainLifeAcquired = 1 - user << "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself." + to_chat(user, "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/drainLife) if(thralls >= 9 && !reviveThrallAcquired) reviveThrallAcquired = 1 - user << "The power of your thralls has granted you the Black Recuperation ability. This will, after a short time, bring a dead thrall completely back to life \ - with no bodily defects." + to_chat(user, "The power of your thralls has granted you the Black Recuperation ability. \ + This will, after a short time, bring a dead thrall completely back to life with no bodily defects.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/reviveThrall) if(thralls < victory_threshold) - user << "You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present." + to_chat(user, "You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present.") else if(thralls >= victory_threshold) - usr << "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls." - usr << "You may find Ascendance in the Shadowling Evolution tab." + to_chat(usr, "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.") + to_chat(usr, "You may find Ascendance in the Shadowling Evolution tab.") for(M in living_mob_list) if(is_shadow(M)) var/obj/effect/proc_holder/spell/targeted/collective_mind/CM @@ -469,9 +472,10 @@ M.mind.remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hatch) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_ascend) if(M == usr) - M << "You project this power to the rest of the shadowlings." + to_chat(M, "You project this power to the rest of the shadowlings.") else - M << "[user.real_name] has coalesced the strength of the thralls. You can draw upon it at any time to ascend. (Shadowling Evolution Tab)" //Tells all the other shadowlings + to_chat(M, "[user.real_name] has coalesced the strength of the thralls. You can draw upon it at any time to ascend. (Shadowling Evolution Tab)")//Tells all the other shadowlings + @@ -491,7 +495,7 @@ return for(var/mob/living/user in targets) user.visible_message("[user] suddenly bends over and coughs out a cloud of black smoke, which begins to spread rapidly!") - user << "You regurgitate a vast cloud of blinding smoke." + to_chat(user, "You regurgitate a vast cloud of blinding smoke.") playsound(user, 'sound/effects/bamf.ogg', 50, 1) var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new /obj/item/weapon/reagent_containers/glass/beaker/large(user.loc) B.reagents.clear_reagents() //Just in case! @@ -515,13 +519,13 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) - M << "You breathe in the black smoke, and your eyes burn horribly!" + to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!") M.eye_blind = 5 if(prob(25)) M.visible_message("[M] claws at their eyes!") M.Stun(3) else - M << "You breathe in the black smoke, and you feel revitalized!" + to_chat(M, "You breathe in the black smoke, and you feel revitalized!") M.heal_organ_damage(2,2) M.adjustOxyLoss(-2) M.adjustToxLoss(-2) @@ -555,12 +559,12 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) continue if(iscarbon(target)) var/mob/living/carbon/M = target - M << "A spike of pain drives into your head and scrambles your thoughts!" + to_chat(M, "A spike of pain drives into your head and scrambles your thoughts!") M.confused += 10 M.ear_damage += 3 else if(issilicon(target)) var/mob/living/silicon/S = target - S << "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#" + to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") S << 'sound/misc/interference.ogg' playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) var/datum/effect/system/spark_spread/sp = new /datum/effect/system/spark_spread @@ -597,7 +601,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) nearbyTargets.Add(M) if(!targetsDrained) charge_counter = charge_max - usr << "There were no nearby humans for you to drain." + to_chat(usr, "There were no nearby humans for you to drain.") return for(var/mob/living/carbon/M in nearbyTargets) U.heal_organ_damage(10, 10) @@ -608,8 +612,8 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) U.AdjustStunned(-1) M.adjustOxyLoss(20) M.adjustStaminaLoss(20) - M << "You feel a wave of exhaustion and a curious draining sensation directed towards [usr]!" - usr << "You draw life from those around you to heal your wounds." + to_chat(M, "You feel a wave of exhaustion and a curious draining sensation directed towards [usr]!") + to_chat(usr, "You draw life from those around you to heal your wounds.") @@ -632,15 +636,15 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) switch(choice) if("Empower") if(!is_thrall(thrallToRevive)) - usr << "[thrallToRevive] is not a thrall." + to_chat(usr, "[thrallToRevive] is not a thrall.") charge_counter = charge_max return if(thrallToRevive.stat != CONSCIOUS) - usr << "[thrallToRevive] must be conscious to become empowered." + to_chat(usr, "[thrallToRevive] must be conscious to become empowered.") charge_counter = charge_max return if(thrallToRevive.get_species() == "Lesser Shadowling") - usr << "[thrallToRevive] is already empowered." + to_chat(usr, "[thrallToRevive] is already empowered.") charge_counter = charge_max return var/empowered_thralls = 0 @@ -651,17 +655,17 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(H.get_species() == "Lesser Shadowling") empowered_thralls++ if(empowered_thralls >= EMPOWERED_THRALL_LIMIT) - usr << "You cannot spare this much energy. There are too many empowered thralls." + to_chat(usr, "You cannot spare this much energy. There are too many empowered thralls.") charge_counter = charge_max return usr.visible_message("[usr] places their hands over [thrallToRevive]'s face, red light shining from beneath.", \ "You place your hands on [thrallToRevive]'s face and begin gathering energy...") - thrallToRevive << "[usr] places their hands over your face. You feel energy gathering. Stand still..." + to_chat(thrallToRevive, "[usr] places their hands over your face. You feel energy gathering. Stand still...") if(!do_mob(usr, thrallToRevive, 80)) - usr << "Your concentration snaps. The flow of energy ebbs." + to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") charge_counter = charge_max return - usr << "You release a massive surge of power into [thrallToRevive]!" + to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") usr.visible_message("Red lightning surges into [thrallToRevive]'s face!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -680,21 +684,21 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk) if("Revive") if(!is_thrall(thrallToRevive)) - usr << "[thrallToRevive] is not a thrall." + to_chat(usr, "[thrallToRevive] is not a thrall.") charge_counter = charge_max return if(thrallToRevive.stat != DEAD) - usr << "[thrallToRevive] is not dead." + to_chat(usr, "[thrallToRevive] is not dead.") charge_counter = charge_max return usr.visible_message("[usr] kneels over [thrallToRevive], placing their hands on \his chest.", \ "You crouch over the body of your thrall and begin gathering energy...") thrallToRevive.notify_ghost_cloning("Your masters are resuscitating you! Re-enter your corpse if you wish to be brought to life.", source = thrallToRevive) if(!do_mob(usr, thrallToRevive, 30)) - usr << "Your concentration snaps. The flow of energy ebbs." + to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") charge_counter = charge_max return - usr << "You release a massive surge of power into [thrallToRevive]!" + to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") usr.visible_message("Red lightning surges from [usr]'s hands into [thrallToRevive]'s chest!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -728,11 +732,11 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) charge_counter = charge_max return if(!is_thrall(target)) - usr << "[target] must be a thrall." + to_chat(usr, "[target] must be a thrall.") charge_counter = charge_max return if(shuttle_master.emergency.mode != SHUTTLE_CALL) - usr << "The shuttle must be inbound only to the station." + to_chat(usr, "The shuttle must be inbound only to the station.") charge_counter = charge_max return var/mob/living/carbon/human/M = target @@ -741,10 +745,10 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) M.visible_message("[M]'s face falls slack, their jaw slightly distending.", \ "You are suddenly transported... far, far away...") if(!do_after(usr, 50, target = M)) - M << "You are snapped back to reality, your haze dissipating!" - usr << "You have been interrupted. The draw has failed." + to_chat(M, "You are snapped back to reality, your haze dissipating!") + to_chat(usr, "You have been interrupted. The draw has failed.") return - usr << "You project [M]'s life force toward the approaching shuttle, extending its arrival duration!" + to_chat(usr, "You project [M]'s life force toward the approaching shuttle, extending its arrival duration!") M.visible_message("[M]'s eyes suddenly flare red. They proceed to collapse on the floor, not breathing.", \ "...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...") M.death() @@ -771,14 +775,14 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) /obj/effect/proc_holder/spell/targeted/annihilate/cast(list/targets) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") charge_counter = charge_max return playsound(usr.loc, 'sound/magic/Staff_Chaos.ogg', 100, 1) for(var/mob/living/boom in targets) if(is_shadow(boom)) //Used to not work on thralls. Now it does so you can PUNISH THEM LIKE THE WRATHFUL GOD YOU ARE. - usr << "Making an ally explode seems unwise." + to_chat(usr, "Making an ally explode seems unwise.") charge_counter = charge_max return usr.visible_message("[usr]'s markings flare as they gesture at [boom]!", \ @@ -804,29 +808,29 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) charge_counter = charge_max - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") return for(var/mob/living/carbon/human/target in targets) if(is_shadow_or_thrall(target)) - usr << "You cannot enthrall an ally." + to_chat(usr, "You cannot enthrall an ally.") charge_counter = charge_max return if(!target.ckey || !target.mind) - usr << "The target has no mind." + to_chat(usr, "The target has no mind.") charge_counter = charge_max return if(target.stat) - usr << "The target must be conscious." + to_chat(usr, "The target must be conscious.") charge_counter = charge_max return if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") charge_counter = charge_max return - usr << "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall." - target << "An agonizing spike of pain drives into your mind, and--" + to_chat(usr, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.") + to_chat(target, "An agonizing spike of pain drives into your mind, and--") ticker.mode.add_thrall(target.mind) target.mind.special_role = "shadowling thrall" target.add_language("Shadowling Hivemind") @@ -872,7 +876,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) /obj/effect/proc_holder/spell/aoe_turf/ascendant_storm/cast(list/targets) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") charge_counter = charge_max return @@ -883,7 +887,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) for(var/mob/living/carbon/human/target in T.contents) if(is_shadow_or_thrall(target)) continue - target << "You are struck by a bolt of lightning!" + to_chat(target, "You are struck by a bolt of lightning!") playsound(target, 'sound/magic/LightningShock.ogg', 50, 1) target.Weaken(8) target.take_organ_damage(0,50) @@ -904,4 +908,4 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/text = stripped_input(user, "What do you want to say to everything on and near [station_name()]?.", "Transmit to World", "") if(!text) return - world << "\"[text]\"" + to_chat(world, "\"[text]\"") diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 52c50e0c193..98f81f1d128 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -14,13 +14,13 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N if(usr.stat || !ishuman(usr) || !usr || !is_shadow(usr || isinspace(usr))) return if(!isturf(usr.loc)) - usr << "You can't hatch here!" + to_chat(usr, "You can't hatch here!") return for(var/mob/living/carbon/human/H in targets) var/hatch_or_no = alert(H,"Are you sure you want to hatch? You cannot undo this!",,"Yes","No") switch(hatch_or_no) if("No") - H << "You decide against hatching for now." + to_chat(H, "You decide against hatching for now.") charge_counter = charge_max return if("Yes") @@ -55,13 +55,13 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(80) playsound(H.loc, 'sound/weapons/slash.ogg', 25, 1) - H << "You rip and slice." + to_chat(H, "You rip and slice.") sleep(10) playsound(H.loc, 'sound/weapons/slashmiss.ogg', 25, 1) - H << "The chrysalis falls like water before you." + to_chat(H, "The chrysalis falls like water before you.") sleep(10) playsound(H.loc, 'sound/weapons/slice.ogg', 25, 1) - H << "You are free!" + to_chat(H, "You are free!") H.status_flags = temp_flags sleep(10) playsound(H.loc, 'sound/effects/ghost.ogg', 100, 1) @@ -70,7 +70,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N H.real_name = newNameId H.name = usr.real_name H.SetStunned(0) - H << "YOU LIVE!!!" + to_chat(H, "YOU LIVE!!!") for(var/obj/structure/alien/resin/wall/shadowling/W in orange(H, 1)) playsound(W, 'sound/effects/splat.ogg', 50, 1) @@ -95,7 +95,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N H.mind.remove_spell(src) sleep(10) - H << "Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies." + to_chat(H, "Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies.") H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/enthrall) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare) @@ -124,7 +124,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N var/hatch_or_no = alert(H,"It is time to ascend. Are you sure about this?",,"Yes","No") switch(hatch_or_no) if("No") - H << "You decide against ascending for now." + to_chat(H, "You decide against ascending for now.") charge_counter = charge_max return if("Yes") @@ -146,16 +146,16 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N "You begin to rend apart the final barries to godhood.") sleep(40) - H << "Yes!" + to_chat(H, "Yes!") sleep(10) - H << "YES!!" + to_chat(H, "YES!!") sleep(10) - H << "YE--" + to_chat(H, "YE--") sleep(1) for(var/mob/living/M in orange(7, H)) M.Weaken(10) - M << "An immense pressure slams you onto the ground!" - world << "\"VYSHA NERADA YEKHEZET U'RUU!!\"" + to_chat(M, "An immense pressure slams you onto the ground!") + to_chat(world, "\"VYSHA NERADA YEKHEZET U'RUU!!\"") world << 'sound/hallucinations/veryfar_noise.ogg' for(var/obj/machinery/power/apc/A in apcs) A.overload_lighting() diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 7fe0121090e..c0d0edf89e3 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -25,8 +25,8 @@ /datum/game_mode/traitor/announce() - world << "The current game mode is - Traitor!" - world << "There is a syndicate traitor on the station. Do not let the traitor succeed!" + to_chat(world, "The current game mode is - Traitor!") + to_chat(world, "There is a syndicate traitor on the station. Do not let the traitor succeed!") /datum/game_mode/traitor/pre_setup() @@ -172,10 +172,10 @@ /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) - traitor.current << "You are the traitor." + to_chat(traitor.current, "You are the traitor.") var/obj_count = 1 for(var/datum/objective/objective in traitor.objectives) - traitor.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(traitor.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ return @@ -201,21 +201,21 @@ return 0 /datum/game_mode/proc/give_codewords(mob/living/traitor_mob) - traitor_mob << "The Syndicate provided you with the following information on how to identify their agents:" - traitor_mob << "Code Phrase: [syndicate_code_phrase]" - traitor_mob << "Code Response: [syndicate_code_response]" + to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") + to_chat(traitor_mob, "Code Phrase: [syndicate_code_phrase]") + to_chat(traitor_mob, "Code Response: [syndicate_code_response]") traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") traitor_mob.mind.store_memory("Code Response: [syndicate_code_response]") - traitor_mob << "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe." + to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") /datum/game_mode/proc/add_law_zero(mob/living/silicon/ai/killer) var/law = "Accomplish your objectives at all costs." var/law_borg = "Accomplish your AI's objectives at all costs." - killer << "Your laws have been changed!" + to_chat(killer, "Your laws have been changed!") killer.set_zeroth_law(law, law_borg) - killer << "New law: 0. [law]" + to_chat(killer, "New law: 0. [law]") give_codewords(killer) @@ -277,7 +277,7 @@ feedback_add_details("traitor_success","FAIL") - world << text + to_chat(world, text) return 1 @@ -287,7 +287,7 @@ . = 1 if (traitor_mob.mind) if (traitor_mob.mind.assigned_role == "Clown") - traitor_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") traitor_mob.mutations.Remove(CLUMSY) // find a radio! toolbox(es), backpack, belt, headset @@ -296,7 +296,7 @@ R = locate(/obj/item/device/radio) in traitor_mob.contents if (!R) - traitor_mob << "Unfortunately, the Syndicate wasn't able to get you a radio." + to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you a radio.") . = 0 else if (istype(R, /obj/item/device/radio)) @@ -316,7 +316,7 @@ target_radio.hidden_uplink = T T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [T.loc]).") else if (istype(R, /obj/item/device/pda)) // generate a passcode if the uplink is hidden in a PDA @@ -328,7 +328,7 @@ var/obj/item/device/pda/P = R P.lock_code = pda_pass - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [T.loc]).") if(!safety)//If they are not a rev. Can be added on to. give_codewords(traitor_mob) @@ -336,17 +336,17 @@ // Tell them about people they might want to contact. var/mob/living/carbon/human/M = get_nt_opposed() if(M && M != traitor_mob) - traitor_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them." + to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") traitor_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) - var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_SOLO] + var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR] //var/ref = "\ref[traitor_mind]" - tatorhud.join_solo_hud(traitor_mind.current) + tatorhud.join_hud(traitor_mind.current) set_antag_hud(traitor_mind.current, "hudsyndicate") /datum/game_mode/proc/update_traitor_icons_removed(datum/mind/traitor_mind) - var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_SOLO] + var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR] tatorhud.leave_hud(traitor_mind.current) set_antag_hud(traitor_mind.current, null) @@ -366,8 +366,8 @@ slaved.leave_serv_hud(traitor_mind) update_traitor_icons_removed(traitor_mind) - //world << "Removed [traitor_mind.current.name] from traitor shit" - traitor_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)" +// to_chat(world, "Removed [traitor_mind.current.name] from traitor shit") + to_chat(traitor_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)") /datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) //set faction @@ -408,5 +408,5 @@ var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) if (equipped_slot) where = "In your [equipped_slot]" - mob << "
[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
" + to_chat(mob, "
[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") mob.update_icons() diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index f10227cc6c3..1abed5ba4dd 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -38,8 +38,8 @@ var/vampire_amount = 4 /datum/game_mode/vampire/announce() - world << "The current game mode is - Vampires!" - world << "There are Vampires from Space Transylvania on the station, keep your blood close and neck safe!" + to_chat(world, "The current game mode is - Vampires!") + to_chat(world, "There are Vampires from Space Transylvania on the station, keep your blood close and neck safe!") /datum/game_mode/vampire/pre_setup() @@ -116,7 +116,7 @@ else text += "
The [special_role_text] has failed!" feedback_add_details("traitor_success","FAIL") - world << text + to_chat(world, text) return 1 /datum/game_mode/proc/auto_declare_completion_enthralled() @@ -134,7 +134,7 @@ else text += "body destroyed" text += ")" - world << text + to_chat(world, text) return 1 /datum/game_mode/proc/forge_vampire_objectives(var/datum/mind/vampire) @@ -180,17 +180,17 @@ dat = "\red You are a Vampire! \black" dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} - vampire.current << dat - vampire.current << "You must complete the following tasks:" + to_chat(vampire.current, dat) + to_chat(vampire.current, "You must complete the following tasks:") if (vampire.current.mind) if (vampire.current.mind.assigned_role == "Clown") - vampire.current << "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself." + to_chat(vampire.current, "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself.") vampire.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in vampire.objectives) - vampire.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(vampire.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ return @@ -280,12 +280,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha H.LAssailant = owner while(do_mob(owner, H, 50)) if(!(owner.mind in ticker.mode.vampires)) - owner << "Your fangs have disappeared!" + to_chat(owner, "Your fangs have disappeared!") return old_bloodtotal = bloodtotal old_bloodusable = bloodusable if(!H.vessel.get_reagent_amount("blood")) - src << "They've got no blood left to give." + to_chat(src, "They've got no blood left to give.") break if(H.stat < DEAD) blood = min(20, H.vessel.get_reagent_amount("blood")) // if they have less than 20 blood, give them the remnant else they get 20 blood @@ -295,7 +295,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha blood = min(5, H.vessel.get_reagent_amount("blood")) // The dead only give 5 bloods bloodtotal += blood if(old_bloodtotal != bloodtotal) - owner << "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""]." + to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") check_vampire_upgrade() H.vessel.remove_reagent("blood", 25) if(ishuman(owner)) @@ -303,7 +303,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha V.nutrition = min(450, V.nutrition + (blood / 2)) draining = null - owner << "You stop draining [H.name] of blood." + to_chat(owner, "You stop draining [H.name] of blood.") /datum/vampire/proc/check_vampire_upgrade(announce = 1) var/list/old_powers = powers.Copy() @@ -321,19 +321,19 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(!(p in old_powers)) if(istype(p, /obj/effect/proc_holder/spell/vampire)) var/obj/effect/proc_holder/spell/vampire/power = p - owner << "[power.gain_desc]" + to_chat(owner, "[power.gain_desc]") else if(istype(p, /datum/vampire_passive)) var/datum/vampire_passive/power = p - owner << "[power.gain_desc]" + to_chat(owner, "[power.gain_desc]") //prepare for copypaste /datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind) - var/datum/atom_hud/antag/vamp_hud = huds[ANTAG_HUD_SOLO] - vamp_hud.join_solo_hud(vampire_mind.current) + var/datum/atom_hud/antag/vamp_hud = huds[ANTAG_HUD_VAMPIRE] + vamp_hud.join_hud(vampire_mind.current) set_antag_hud(vampire_mind.current, ((vampire_mind in vampires) ? "hudvampire" : "hudvampirethrall")) /datum/game_mode/proc/update_vampire_icons_removed(datum/mind/vampire_mind) - var/datum/atom_hud/antag/vampire_hud = huds[ANTAG_HUD_SOLO] + var/datum/atom_hud/antag/vampire_hud = huds[ANTAG_HUD_VAMPIRE] vampire_hud.leave_hud(vampire_mind.current) set_antag_hud(vampire_mind.current, null) @@ -351,8 +351,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha vampire_mind.som = null slaved.leave_serv_hud(vampire_mind) update_vampire_icons_removed(vampire_mind) - //world << "Removed [vampire_mind.current.name] from vampire shit" - vampire_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now." +// to_chat(world, "Removed [vampire_mind.current.name] from vampire shit") + to_chat(vampire_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now.") /datum/vampire/proc/check_sun() var/ax = owner.x @@ -412,14 +412,14 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(prob(35)) switch(owner.health) if(80 to 100) - owner << "Your skin flakes away..." + to_chat(owner, "Your skin flakes away...") if(60 to 80) - owner << "Your skin sizzles!" + to_chat(owner, "Your skin sizzles!") if((-INFINITY) to 60) if(!owner.on_fire) - owner << "Your skin catches fire!" + to_chat(owner, "Your skin catches fire!") else - owner << "You continue to burn!" + to_chat(owner, "You continue to burn!") owner.fire_stacks += 5 owner.IgniteMob() owner.emote("scream") diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 0c69bd5b2a7..a7e470ef056 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -19,7 +19,7 @@ if(!user.mind) return 0 if(!ishuman(user)) - user << "You are in too weak of a form to do this!" + to_chat(user, "You are in too weak of a form to do this!") return 0 var/datum/vampire/vampire = user.mind.vampire @@ -30,18 +30,18 @@ var/fullpower = vampire.get_ability(/datum/vampire_passive/full) if(user.stat >= DEAD) - user << "Not when you're dead!" + to_chat(user, "Not when you're dead!") return 0 if(vampire.nullified && !fullpower) - user << "Something is blocking your powers!" + to_chat(user, "Something is blocking your powers!") return 0 if(vampire.bloodusable < required_blood) - user << "You require at least [required_blood] units of usable blood to do that!" + to_chat(user, "You require at least [required_blood] units of usable blood to do that!") return 0 //chapel check if(istype(loc.loc, /area/chapel) && !fullpower) - user << "Your powers are useless on this holy ground." + to_chat(user, "Your powers are useless on this holy ground.") return 0 return ..() @@ -105,7 +105,7 @@ targets.Cut() if(targets.len) - usr << "You have [vampire.bloodusable] left to use." + to_chat(usr, "You have [vampire.bloodusable] left to use.") /obj/effect/proc_holder/spell/vampire/targetted/choose_targets(mob/user = usr) var/list/possible_targets[0] @@ -157,7 +157,7 @@ usr.SetStunned(0) usr.SetParalysis(0) U.adjustStaminaLoss(-75) - usr << "You flush your system with clean blood and remove any incapacitating effects." + to_chat(usr, "You flush your system with clean blood and remove any incapacitating effects.") spawn(1) if(usr.mind.vampire.get_ability(/datum/vampire_passive/regen)) for(var/i = 1 to 5) @@ -178,47 +178,34 @@ usr.visible_message("[usr]'s eyes flash briefly as he stares into [target]'s eyes") if(do_mob(usr, target, 50)) if(!affects(target)) - usr << "Your piercing gaze fails to knock out [target]." - target << "\blue [usr]'s feeble gaze is ineffective." + to_chat(usr, "Your piercing gaze fails to knock out [target].") + to_chat(target, "\blue [usr]'s feeble gaze is ineffective.") else - usr << "Your piercing gaze knocks out [target]." - target << "You find yourself unable to move and barely able to speak." + to_chat(usr, "Your piercing gaze knocks out [target].") + to_chat(target, "You find yourself unable to move and barely able to speak.") target.Weaken(10) target.Stun(10) target.stuttering = 10 else revert_cast(usr) - usr << "You broke your gaze." + to_chat(usr, "You broke your gaze.") /obj/effect/proc_holder/spell/vampire/targetted/disease name = "Diseased Touch (100)" - desc = "Touches your victim with infected blood giving them the Shutdown Syndrome which quickly shutsdown their major organs resulting in a quick painful death." - gain_desc = "You have gained the Diseased Touch ability which causes those you touch to die shortly after unless treated medically." + desc = "Touches your victim with infected blood giving them appendicitis, which will, left untreated, cause a slow death by poison." + gain_desc = "You have gained the Diseased Touch ability which causes those you touch to die unless treated medically." action_icon_state = "vampire_disease" required_blood = 100 /obj/effect/proc_holder/spell/vampire/targetted/disease/cast(list/targets) for(var/mob/living/carbon/target in targets) - usr << "You stealthily infect [target] with your diseased touch." + to_chat(usr, "You stealthily infect [target] with your diseased touch.") target.help_shake_act(usr) if(!affects(target)) - usr << "They seem to be unaffected." + to_chat(usr, "They seem to be unaffected.") continue - var/datum/disease2/disease/shutdown = new /datum/disease2/disease - var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder - var/datum/disease2/effect/organs/vampire/O = new /datum/disease2/effect/organs/vampire - holder.effect += O - holder.chance = 10 - shutdown.infectionchance = 100 - shutdown.antigen |= text2num(pick(ANTIGENS)) - shutdown.antigen |= text2num(pick(ANTIGENS)) - shutdown.spreadtype = "None" - shutdown.uniqueID = rand(0,10000) - shutdown.effects += holder - shutdown.speed = 1 - shutdown.stage = 2 - shutdown.clicks = 185 - infect_virus2(target, shutdown, 0) + var/datum/disease/D = new /datum/disease/appendicitis //someone should probably make a better virus for this + target.ForceContractDisease(D) /obj/effect/proc_holder/spell/vampire/mob_aoe/glare name = "Glare" @@ -230,7 +217,7 @@ /obj/effect/proc_holder/spell/vampire/mob_aoe/glare/cast(list/targets) usr.visible_message("[usr]'s eyes emit a blinding flash!") if(istype(usr:glasses, /obj/item/clothing/glasses/sunglasses/blindfold)) - usr << "You're blindfolded!" + to_chat(usr, "You're blindfolded!") return for(var/mob/living/target in targets) if(!affects(target)) @@ -238,7 +225,7 @@ target.Stun(5) target.Weaken(5) target.stuttering = 20 - target << "You are blinded by [usr]'s glare." + to_chat(target, "You are blinded by [usr]'s glare.") /obj/effect/proc_holder/spell/vampire/self/shapeshift name = "Shapeshift (50)" @@ -270,7 +257,7 @@ continue if(!affects(C)) continue - C << "You hear a ear piercing shriek and your senses dull!" + to_chat(C, "You hear a ear piercing shriek and your senses dull!") C.Weaken(4) C.ear_deaf = 20 C.stuttering = 20 @@ -290,16 +277,16 @@ /obj/effect/proc_holder/spell/vampire/targetted/enthrall/cast(list/targets) for(var/mob/living/target in targets) usr.visible_message("[usr] bites [target]'s neck!", "You bite [target]'s neck and begin the flow of power.") - target << "You feel the tendrils of evil invade your mind." + to_chat(target, "You feel the tendrils of evil invade your mind.") if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") break if(do_mob(usr, target, 50)) if(can_enthrall(usr, target)) handle_enthrall(usr, target) else revert_cast(usr) - usr << "You or your target either moved or you dont have enough usable blood." + to_chat(usr, "You or your target either moved or you dont have enough usable blood.") /obj/effect/proc_holder/spell/vampire/targetted/enthrall/proc/can_enthrall(mob/living/user, mob/living/carbon/C) var/enthrall_safe = 0 @@ -315,7 +302,7 @@ log_to_dd("something bad happened on enthralling a mob, attacker is [user] [user.key] \ref[user]") return 0 if(!C.mind) - user << "[C.name]'s mind is not there for you to enthrall." + to_chat(user, "[C.name]'s mind is not there for you to enthrall.") return 0 if(enthrall_safe || ( C.mind in ticker.mode.vampires )||( C.mind.vampire )||( C.mind in ticker.mode.vampire_enthralled )) C.visible_message("[C] seems to resist the takeover!", "You feel a familiar sensation in your skull that quickly dissipates.") @@ -323,7 +310,7 @@ if(!affects(C)) C.visible_message("[C] seems to resist the takeover!", "Your faith of [ticker.Bible_deity_name] has kept your mind clear of all evil.") if(!ishuman(C)) - user << "You can only enthrall humans!" + to_chat(user, "You can only enthrall humans!") return 0 return 1 @@ -347,8 +334,8 @@ ticker.mode.vampire_enthralled.Add(H.mind) ticker.mode.vampire_enthralled[H.mind] = user.mind H.mind.special_role = "VampThrall" - H << "You have been Enthralled by [user]. Follow their every command." - src << "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp." + to_chat(H, "You have been Enthralled by [user]. Follow their every command.") + to_chat(src, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.") log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].") /obj/effect/proc_holder/spell/vampire/self/cloak @@ -372,7 +359,7 @@ var/datum/vampire/V = usr.mind.vampire V.iscloaking = !V.iscloaking update_name() - usr << "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness." + to_chat(usr, "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness.") /obj/effect/proc_holder/spell/vampire/bats name = "Summon Bats (75)" @@ -389,7 +376,7 @@ if(locs.len == num_bats) //we found 2 locations and thats all we need break var/turf/T = get_step(usr, direction) //getting a loc in that direction - if(AStar(usr.loc, T, /turf/proc/AdjacentTurfs, /turf/proc/Distance, 1, simulated_only = 0)) // if a path exists, so no dense objects in the way its valid salid + if(AStar(user, T, /turf/proc/Distance, 1, simulated_only = 0)) // if a path exists, so no dense objects in the way its valid salid locs += T // pad with player location @@ -438,7 +425,7 @@ sleep(jaunt_duration) var/mobloc = get_turf(usr.loc) if(get_area(mobloc) == /area/security/armoury/gamma) - usr << "A strange energy repels you!" + to_chat(usr, "A strange energy repels you!") mobloc = originalloc animation.loc = mobloc steam.location = mobloc @@ -498,7 +485,7 @@ if(!turfs.len) revert_cast(user) - user << "\red You cannot find darkness to step to." + to_chat(user, "\red You cannot find darkness to step to.") return perform(turfs) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index bce6194726a..4dc42aacb4f 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -47,7 +47,7 @@ H.set_machine(src) if(href_list["school"]) if (used) - H << "You already used this contract!" + to_chat(H, "You already used this contract!") return used = 1 var/list/candidates = pollCandidates("Do you want to play as the wizard apprentice of [H.real_name]?", ROLE_WIZARD, 1) @@ -56,25 +56,25 @@ new /obj/effect/effect/harmless_smoke(H.loc) var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc) M.key = C.key - M << "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals." + to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.") switch(href_list["school"]) if("destruction") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.") if("bluespace") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.") if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(M)) M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) @@ -105,7 +105,7 @@ M.faction = list("wizard") else used = 0 - H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later." + to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.") return @@ -133,7 +133,7 @@ charged = 0 user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") else - user << "The unearthly energies that powered the blade are now dormant." + to_chat(user, "The unearthly energies that powered the blade are now dormant.") /obj/effect/rend @@ -212,7 +212,7 @@ hitsound = 'sound/items/welder2.ogg' /obj/item/weapon/scrying/attack_self(mob/user as mob) - user << " You can see...everything!" + to_chat(user, " You can see...everything!") visible_message("[user] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -254,13 +254,13 @@ var/global/list/multiverse = list() /obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) - user << "The [src] detects benevolent energies in your target and redirects your attack!" + to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") return ..() /obj/item/weapon/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") - user << "You know better than to touch your teacher's stuff." + to_chat(user, "You know better than to touch your teacher's stuff.") return if(cooldown < world.time) var/faction_check = 0 @@ -272,24 +272,24 @@ var/global/list/multiverse = list() faction = list("[user.real_name]") assigned = "[user.real_name]" user.faction = list("[user.real_name]") - user << "You bind the sword to yourself. You can now use it to summon help." + to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") if(!usr.mind.special_role) if(prob(probability_evil)) - user << "With your new found power you could easily conquer the station!" + to_chat(user, "With your new found power you could easily conquer the station!") var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone hijack_objective.owner = usr.mind usr.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" - usr << "Objective #[1]: [hijack_objective.explanation_text]" + to_chat(usr, "Objective #[1]: [hijack_objective.explanation_text]") ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" evil = TRUE else - user << "With your new found power you could easily defend the station!" + to_chat(user, "With your new found power you could easily defend the station!") var/datum/objective/survive/new_objective = new /datum/objective/survive new_objective.owner = usr.mind new_objective.explanation_text = "Survive, and help defend the innocent from the mobs of multiverse clones." - usr << "Objective #[1]: [new_objective.explanation_text]" + to_chat(usr, "Objective #[1]: [new_objective.explanation_text]") usr.mind.objectives += new_objective ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" @@ -304,12 +304,12 @@ var/global/list/multiverse = list() if(candidates.len) var/mob/C = pick(candidates) spawn_copy(C.client, get_turf(user.loc), user) - user << "The sword flashes, and you find yourself face to face with...you!" + to_chat(user, "The sword flashes, and you find yourself face to face with...you!") else - user << "You fail to summon any copies of yourself. Perhaps you should try again in a bit." + to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") else - user << "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies." + to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") /obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) @@ -320,7 +320,7 @@ var/global/list/multiverse = list() C.prefs.copy_to(M) M.key = C.key M.mind.name = user.real_name - M << "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs." + to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") M.faction = list("[user.real_name]") if(duplicate_self) M.set_species(user.get_species()) //duplicate the sword user's species. @@ -345,7 +345,7 @@ var/global/list/multiverse = list() hijack_objective.owner = M.mind M.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" - M << "Objective #[1]: [hijack_objective.explanation_text]" + to_chat(M, "Objective #[1]: [hijack_objective.explanation_text]") M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] hijack.") else @@ -354,7 +354,7 @@ var/global/list/multiverse = list() new_objective.target = usr.mind new_objective.explanation_text = "Protect [usr.real_name], your copy, and help them defend the innocent from the mobs of multiverse clones." M.mind.objectives += new_objective - M << "Objective #[1]: [new_objective.explanation_text]" + to_chat(M, "Objective #[1]: [new_objective.explanation_text]") M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] protect the station.") @@ -629,17 +629,17 @@ var/global/list/multiverse = list() return if(M.stat != DEAD) - user << "This artifact can only affect the dead!" + to_chat(user, "This artifact can only affect the dead!") return if(!M.mind || !M.client) - user << "There is no soul connected to this body..." + to_chat(user, "There is no soul connected to this body...") return check_spooky()//clean out/refresh the list if(spooky_scaries.len >= 3 && !unlimited) - user << "This artifact can only affect three undead at a time!" + to_chat(user, "This artifact can only affect three undead at a time!") return if(heresy) spawnheresy(M)//oh god why @@ -649,8 +649,8 @@ var/global/list/multiverse = list() M.revive() equip_skeleton(M) spooky_scaries |= M - M << "You have been revived by [user.real_name]!" - M << "They are your master now, assist them even if it costs you your new life!" + to_chat(M, "You have been revived by [user.real_name]!") + to_chat(M, "They are your master now, assist them even if it costs you your new life!") desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" /obj/item/device/necromantic_stone/proc/check_spooky() @@ -773,15 +773,15 @@ var/global/list/multiverse = list() /obj/item/voodoo/attackby(obj/item/I as obj, mob/user as mob, params) if(target && cooldown < world.time) if(is_hot(I)) - target << "You suddenly feel very hot" + to_chat(target, "You suddenly feel very hot") target.bodytemperature += 50 GiveHint(target) else if(can_puncture(I)) - target << "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!" + to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!") target.Weaken(2) GiveHint(target) else if(istype(I,/obj/item/weapon/bikehorn)) - target << "HONK" + to_chat(target, "HONK") target << 'sound/items/AirHorn.ogg' target.ear_damage += rand(0,3) GiveHint(target) @@ -792,7 +792,7 @@ var/global/list/multiverse = list() user.drop_item() I.loc = src link = I - user << "You attach [I] to the doll." + to_chat(user, "You attach [I] to the doll.") update_targets() ..() /obj/item/voodoo/check_eye(mob/user as mob) @@ -806,7 +806,7 @@ var/global/list/multiverse = list() if(link) target = null link.loc = get_turf(src) - user << "You remove the [link] from the doll." + to_chat(user, "You remove the [link] from the doll.") link = null update_targets() return @@ -825,7 +825,7 @@ var/global/list/multiverse = list() user.reset_view() user.unset_machine() if("r_leg","l_leg") - user << "You move the doll's legs around." + to_chat(user, "You move the doll's legs around.") var/turf/T = get_step(target,pick(cardinal)) target.Move(T) if("r_arm","l_arm") @@ -840,9 +840,9 @@ var/global/list/multiverse = list() target.ClickOn(T) GiveHint(target) if("head") - user << "You smack the doll's head with your hand." + to_chat(user, "You smack the doll's head with your hand.") target.Dizzy(10) - target << "You suddenly feel as if your head was hit with a hammer!" + to_chat(target, "You suddenly feel as if your head was hit with a hammer!") GiveHint(target,user) cooldown = world.time + cooldown_time @@ -857,10 +857,10 @@ var/global/list/multiverse = list() /obj/item/voodoo/proc/GiveHint(mob/victim,force=0) if(prob(50) || force) var/way = dir2text(get_dir(victim,get_turf(src))) - victim << "You feel a dark presence from [way]" + to_chat(victim, "You feel a dark presence from [way]") if(prob(20) || force) var/area/A = get_area(src) - victim << "You feel a dark presence from [A.name]" + to_chat(victim, "You feel a dark presence from [A.name]") /obj/item/voodoo/fire_act() if(target) diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 2bab01e5ec5..8a5ba06f36f 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -22,7 +22,7 @@ if(!iscarbon(user)) //Look ma, no hands return if(user.lying || user.handcuffed) - user << "You can't reach out!" + to_chat(user, "You can't reach out!") return ..() @@ -62,7 +62,7 @@ if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //getting hard after touching yourself would also be bad return if(user.lying || user.handcuffed) - user << "You can't reach out!" + to_chat(user, "You can't reach out!") return var/mob/M = target M.Stun(2) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index a3d927970de..cef7b507f82 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -14,20 +14,20 @@ var/time_till_chaos = 18000 // Half-hour in /datum/game_mode/wizard/raginmages/announce() - world << "The current game mode is - Ragin' Mages!" - world << "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!" + to_chat(world, "The current game mode is - Ragin' Mages!") + to_chat(world, "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!") /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "\red You are the Space Wizard!") + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) - wizard.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ - wizard.current << "Objective Alpha: Make sure the station pays for its actions against our diplomats" + to_chat(wizard.current, "Objective Alpha: Make sure the station pays for its actions against our diplomats") return /datum/game_mode/wizard/raginmages/check_finished() @@ -39,34 +39,34 @@ continue if(!istype(wizard.current,/mob/living/carbon)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") message_admins("[wizard.current] was transformed in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(istype(wizard.current,/mob/living/carbon/brain)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") message_admins("[wizard.current] was brainified in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(wizard.current.stat==DEAD) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") message_admins("[wizard.current] died in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(wizard.current.stat==UNCONSCIOUS) if(wizard.current.health < 0) if(istype(get_area(wizard.current), /area/wizard_station)) - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") message_admins("[wizard.current] went into crit in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) else - wizard.current << "\red The Space Wizard Federation is upset with your performance and have terminated your employment." + to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") wizard.current.gib() // *REAL* ACTION!! *REAL* DRAMA!! *REAL* BLOODSHED!! continue if(wizard.current.client && wizard.current.client.is_afk() > 10 * 60 * 10) // 10 minutes - wizard.current << "\red The Space Wizard Federation is upset with your performance and have terminated your employment." + to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") wizard.current.gib() // Let's keep the round moving continue if(!wizard.current.client) @@ -100,7 +100,7 @@ marked_for_death |= M.current for(var/mob/living/L in marked_for_death) if(L.stat == CONSCIOUS) // Probably a troublemaker - I'd like to see YOU fight when unconscious - L << "STOP FIGHTING." + to_chat(L, "STOP FIGHTING.") L.ghostize() if(istype(L, /mob/living/carbon/brain)) // diediedie @@ -184,5 +184,5 @@ /datum/game_mode/wizard/raginmages/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" + to_chat(world, "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!") ..(1) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b6052320615..eb1e8bce930 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -5,7 +5,7 @@ var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffhealing", "armor", "scrying", "staffdoor", "special","voodoo","special") var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos","necromantic") - usr << "You summoned [summon_type ? "magic" : "guns"]!" + to_chat(usr, "You summoned [summon_type ? "magic" : "guns"]!") message_admins("[key_name_admin(usr)] summoned [summon_type ? "magic" : "guns"]!") for(var/mob/living/carbon/human/H in player_list) @@ -136,7 +136,7 @@ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO - H << "The walls suddenly disappear." + to_chat(H, "The walls suddenly disappear.") if("voodoo") new /obj/item/voodoo(get_turf(H)) if("special") @@ -154,4 +154,4 @@ new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) if("necromantic") new /obj/item/device/necromantic_stone(get_turf(H)) - H << "You suddenly feel lucky." + to_chat(H, "You suddenly feel lucky.") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index d7dcc2287a6..08e6117e9bd 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -19,11 +19,11 @@ return ..() if(M.has_brain_worms()) //Borer stuff - RR - user << "This being is corrupted by an alien intelligence and cannot be soul trapped." + to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") return ..() - + if(jobban_isbanned(M, "cultist") || jobban_isbanned(M, "Syndicate")) - user << "A mysterious force prevents you from trapping this being's soul." + to_chat(user, "A mysterious force prevents you from trapping this being's soul.") return ..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [key_name(user)]") @@ -81,7 +81,7 @@ for(var/mob/living/simple_animal/shade/A in src) A.status_flags &= ~GODMODE A.canmove = 1 - A << "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs." + to_chat(A, "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs.") A.loc = U.loc A.cancel_camera() src.icon_state = "soulstone" @@ -108,16 +108,16 @@ var/mob/living/carbon/human/T = target var/obj/item/device/soulstone/C = src if(C.imprinted != "empty") - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") else if (T.stat == 0) - U << "\red Capture failed!: \black Kill or maim the victim first!" + to_chat(U, "\red Capture failed!: \black Kill or maim the victim first!") else if(T.client == null) - U << "\red Capture failed!: \black The soul has already fled it's mortal frame." + to_chat(U, "\red Capture failed!: \black The soul has already fled it's mortal frame.") else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") else for(var/obj/item/W in T) T.unEquip(W) @@ -141,22 +141,22 @@ S.cancel_camera() C.icon_state = "soulstone2" C.name = "Soul Stone: [S.real_name]" - S << "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs." - U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." - U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." + to_chat(S, "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs.") + to_chat(U, "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") + to_chat(U, "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls.") C.imprinted = "[S.name]" qdel(T) if("SHADE") var/mob/living/simple_animal/shade/T = target var/obj/item/device/soulstone/C = src if (T.stat == DEAD) - U << "\red Capture failed!: \black The shade has already been banished!" + to_chat(U, "\red Capture failed!: \black The shade has already been banished!") else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") else if(T.name != C.imprinted) - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") else T.loc = C //put shade in stone T.status_flags |= GODMODE @@ -164,8 +164,8 @@ T.health = T.maxHealth T.faction |= "\ref[U]" C.icon_state = "soulstone2" - T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form" - U << "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone." + to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") + to_chat(U, "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone.") if("CONSTRUCT") var/obj/structure/constructshell/T = target var/obj/item/device/soulstone/C = src @@ -184,8 +184,8 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.") + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") Z.cancel_camera() qdel(C) @@ -200,8 +200,8 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.") + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") Z.cancel_camera() qdel(C) @@ -216,12 +216,12 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).") + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") Z.cancel_camera() qdel(C) else - U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!" + to_chat(U, "\red Creation failed!: \black The soul stone is empty! Go kill someone!") return /proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) @@ -237,8 +237,9 @@ ticker.mode.cult+=newstruct.mind ticker.mode.update_cult_icons_added(newstruct.mind) if(stoner && iswizard(stoner)) - newstruct << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") else if(stoner && iscultist(stoner)) - newstruct << "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs." - else newstruct << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs.") + else + to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") newstruct.cancel_camera() \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 7422d610fb9..8467da489a5 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -26,7 +26,7 @@ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list) if(initial(S.name) == initial(aspell.name)) // Not using directly in case it was learned from one spellbook then upgraded in another if(aspell.spell_level >= aspell.level_max) - user << "This spell cannot be improved further." + to_chat(user, "This spell cannot be improved further.") return 0 else aspell.name = initial(aspell.name) @@ -36,24 +36,24 @@ aspell.charge_counter = aspell.charge_max switch(aspell.spell_level) if(1) - user << "You have improved [aspell.name] into Efficient [aspell.name]." + to_chat(user, "You have improved [aspell.name] into Efficient [aspell.name].") aspell.name = "Efficient [aspell.name]" if(2) - user << "You have further improved [aspell.name] into Quickened [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Quickened [aspell.name].") aspell.name = "Quickened [aspell.name]" if(3) - user << "You have further improved [aspell.name] into Free [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Free [aspell.name].") aspell.name = "Free [aspell.name]" if(4) - user << "You have further improved [aspell.name] into Instant [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Instant [aspell.name].") aspell.name = "Instant [aspell.name]" if(aspell.spell_level >= aspell.level_max) - user << "This spell cannot be strengthened any further." + to_chat(user, "This spell cannot be strengthened any further.") return 1 //No same spell found - just learn it feedback_add_details("wizard_spell_learned",log_name) user.mind.AddSpell(S) - user << "You have learned [S.name]." + to_chat(user, "You have learned [S.name].") return 1 /datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) @@ -69,7 +69,7 @@ /datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = locate() if(!(user in A.contents)) - user << "You can only refund spells at the wizard lair" + to_chat(user, "You can only refund spells at the wizard lair") return -1 if(!S) S = new spell_type() @@ -303,7 +303,7 @@ user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - user << "\blue The walls suddenly disappear." + to_chat(user, "\blue The walls suddenly disappear.") return 1 @@ -425,7 +425,7 @@ user.rightandwrong(0) book.uses += 1 active = 1 - user << "You have cast summon guns and gained an extra charge for your spellbook." + to_chat(user, "You have cast summon guns and gained an extra charge for your spellbook.") return 1 /datum/spellbook_entry/summon/magic @@ -448,7 +448,7 @@ user.rightandwrong(1) book.uses += 1 active = 1 - user << "You have cast summon magic and gained an extra charge for your spellbook." + to_chat(user, "You have cast summon magic and gained an extra charge for your spellbook.") return 1 /obj/item/weapon/spellbook @@ -486,16 +486,16 @@ if(istype(O, /obj/item/weapon/contract)) var/obj/item/weapon/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now!" + to_chat(user, "The contract has been used, you can't get your points back now!") else - user << "You feed the contract back into the spellbook, refunding your points." + to_chat(user, "You feed the contract back into the spellbook, refunding your points.") uses++ qdel(O) if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon)) - user << "On second thought, maybe summoning a demon is a bad idea. You refund your points." + to_chat(user, "On second thought, maybe summoning a demon is a bad idea. You refund your points.") uses++ for(var/datum/spellbook_entry/item/bloodbottle/BB in entries) @@ -555,11 +555,11 @@ /obj/item/weapon/spellbook/attack_self(mob/user as mob) if(!owner) - user << "You bind the spellbook to yourself." + to_chat(user, "You bind the spellbook to yourself.") owner = user return if(user != owner) - user << "The [name] does not recognize you as it's owner and refuses to open!" + to_chat(user, "The [name] does not recognize you as it's owner and refuses to open!") return user.set_machine(src) var/dat = "" @@ -656,15 +656,15 @@ if(knownspell.type == S.type) if(user.mind) if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard") - user <<"You're already far more versed in this spell than this flimsy how-to book can provide." + to_chat(user, "You're already far more versed in this spell than this flimsy how-to book can provide.") else - user <<"You've already read this one." + to_chat(user, "You've already read this one.") return if(used) recoil(user) else user.mind.AddSpell(S) - user <<"you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!" + to_chat(user, "you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!") user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) @@ -698,7 +698,7 @@ /obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob) ..() - user <<"Your stomach rumbles..." + to_chat(user, "Your stomach rumbles...") if(user.nutrition) user.nutrition -= 200 if(user.nutrition <= 0) @@ -712,7 +712,7 @@ /obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) ..() - user <<"You go blind!" + to_chat(user, "You go blind!") user.eye_blind = 10 /obj/item/weapon/spellbook/oneuse/mindswap @@ -734,10 +734,10 @@ stored_swap = null if(!stored_swap) stored_swap = user - user <<"For a moment you feel like you don't even know who you are anymore." + to_chat(user, "For a moment you feel like you don't even know who you are anymore.") return if(stored_swap == user) - user <<"You stare at the book some more, but there doesn't seem to be anything else to learn..." + to_chat(user, "You stare at the book some more, but there doesn't seem to be anything else to learn...") return if(user.mind.special_verbs.len) @@ -766,8 +766,8 @@ for(var/V in user.mind.special_verbs) user.verbs += V - stored_swap <<"You're suddenly somewhere else... and someone else?!" - user <<"Suddenly you're staring at [src] again... where are you, who are you?!" + to_chat(stored_swap, "You're suddenly somewhere else... and someone else?!") + to_chat(user, "Suddenly you're staring at [src] again... where are you, who are you?!") stored_swap = null /obj/item/weapon/spellbook/oneuse/forcewall @@ -778,7 +778,7 @@ /obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) ..() - user <<"You suddenly feel very solid!" + to_chat(user, "You suddenly feel very solid!") var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) S.timer = 30 user.drop_item() @@ -792,7 +792,7 @@ /obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) ..() - user <<"You're knocked down!" + to_chat(user, "You're knocked down!") user.Weaken(20) /obj/item/weapon/spellbook/oneuse/horsemask @@ -803,7 +803,7 @@ /obj/item/weapon/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) if(istype(user, /mob/living/carbon/human)) - user <<"HOR-SIE HAS RISEN" + to_chat(user, "HOR-SIE HAS RISEN") var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead magichead.flags |= NODROP //curses! magichead.flags_inv = null //so you can still see their face @@ -813,7 +813,7 @@ user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) qdel(src) else - user <<"I say thee neigh" + to_chat(user, "I say thee neigh") /obj/item/weapon/spellbook/oneuse/charge spell = /obj/effect/proc_holder/spell/targeted/charge @@ -823,7 +823,7 @@ /obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) ..() - user <<"[src] suddenly feels very warm!" + to_chat(user, "[src] suddenly feels very warm!") empulse(src, 1, 1) /obj/item/weapon/spellbook/oneuse/summonitem @@ -834,7 +834,7 @@ /obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user as mob) ..() - user <<"[src] suddenly vanishes!" + to_chat(user, "[src] suddenly vanishes!") qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 37a6c801573..1910e8ffa85 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -17,8 +17,8 @@ var/but_wait_theres_more = 0 /datum/game_mode/wizard/announce() - world << "The current game mode is - Wizard!" - world << "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!" + to_chat(world, "The current game mode is - Wizard!") + to_chat(world, "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!") /datum/game_mode/wizard/can_start()//This could be better, will likely have to recode it later @@ -35,7 +35,7 @@ wizard.special_role = "Wizard" wizard.original = wizard.current if(wizardstart.len == 0) - wizard.current << "\red A starting location for you could not be found, please report this bug!" + to_chat(wizard.current, "\red A starting location for you could not be found, please report this bug!") return 0 return 1 @@ -147,12 +147,12 @@ /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "\red You are the Space Wizard!") + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) - wizard.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ return @@ -195,8 +195,8 @@ wizard_mob.species.equip(wizard_mob) - wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." - wizard_mob << "In your pockets you will find a teleport scroll. Use it as needed." + to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") + to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.") wizard_mob.mind.store_memory("Remember: do not forget to prepare your spells.") wizard_mob.update_icons() return 1 @@ -231,7 +231,7 @@ /datum/game_mode/wizard/declare_completion(var/ragin = 0) if(finished && !ragin) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" + to_chat(world, "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") ..() return 1 @@ -282,7 +282,7 @@ i++ text += "
" - world << text + to_chat(world, text) return 1 //OTHER PROCS @@ -307,13 +307,13 @@ Made a proc so this is not repeated 14 (or more) times.*/ /mob/proc/casting() //Removed the stat check because not all spells require clothing now. if(!istype(usr:wear_suit, /obj/item/clothing/suit/wizrobe)) - usr << "I don't feel strong enough without my robe." + to_chat(usr, "I don't feel strong enough without my robe.") return 0 if(!istype(usr:shoes, /obj/item/clothing/shoes/sandal)) - usr << "I don't feel strong enough without my sandals." + to_chat(usr, "I don't feel strong enough without my sandals.") return 0 if(!istype(usr:head, /obj/item/clothing/head/wizard)) - usr << "I don't feel strong enough without my hat." + to_chat(usr, "I don't feel strong enough without my hat.") return 0 else return 1 diff --git a/code/game/gamemodes/xenos/xenos.dm b/code/game/gamemodes/xenos/xenos.dm index 4ae05c7dd21..12dab66e569 100644 --- a/code/game/gamemodes/xenos/xenos.dm +++ b/code/game/gamemodes/xenos/xenos.dm @@ -18,8 +18,8 @@ var/gammaratio = 4 //At what alien to human ratio will the Gamma security level be called and the nuke be made available? /datum/game_mode/xenos/announce() - world << "The current game mode is - Xenos!" - world << "There is an Xenomorph attack on the station.
Aliens - Kill or infect the crew. Protect the Queen.
Crew - Protect the station. Exterminate all aliens." + to_chat(world, "The current game mode is - Xenos!") + to_chat(world, "There is an Xenomorph attack on the station.
Aliens - Kill or infect the crew. Protect the Queen.
Crew - Protect the station. Exterminate all aliens.") /datum/game_mode/xenos/can_start() if(!..()) @@ -157,20 +157,20 @@ /datum/game_mode/xenos/declare_completion() if(station_was_nuked) feedback_set_details("round_end_result","win - xenos nuked") - world << "Crew Victory" - world << "The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!" + to_chat(world, "Crew Victory") + to_chat(world, "The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!") else if(result == 1) feedback_set_details("round_end_result","win - xenos killed") - world << "Crew Victory" - world << "The aliens did not succeed and were exterminated by the crew!" + to_chat(world, "Crew Victory") + to_chat(world, "The aliens did not succeed and were exterminated by the crew!") else if(result == 2) feedback_set_details("round_end_result","win - crew killed") - world << "Alien Victory" - world << "The aliens were successful and slaughtered the crew!" + to_chat(world, "Alien Victory") + to_chat(world, "The aliens were successful and slaughtered the crew!") else feedback_set_details("round_end_result","win - crew escaped") - world << "Draw" - world << "The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station." + to_chat(world, "Draw") + to_chat(world, "The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station.") var/text = "
There were [xenos.len] aliens." text += "
The aliens were:" @@ -186,7 +186,7 @@ else text += "body destroyed" text += ")" - world << text + to_chat(world, text) ..() return 1 \ No newline at end of file diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index d76e4e8abb4..d43d5e17e8f 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -108,7 +108,6 @@ //returns 1 if this mob has sufficient access to use this object /obj/proc/allowed(mob/M) - generate_req_lists() //check if we don't require any access at all if(check_access()) return 1 @@ -135,7 +134,7 @@ if(!req_access) req_access = list() if(req_access_txt) - var/list/req_access_str = text2list(req_access_txt, ";") + var/list/req_access_str = splittext(req_access_txt, ";") for(var/x in req_access_str) var/n = text2num(x) if(n) @@ -144,30 +143,19 @@ if(!req_one_access) req_one_access = list() if(req_one_access_txt) - var/list/req_one_access_str = text2list(req_one_access_txt,";") + var/list/req_one_access_str = splittext(req_one_access_txt,";") for(var/x in req_one_access_str) var/n = text2num(x) if(n) req_one_access += n /obj/proc/check_access(obj/item/I) - if(!istype(req_access, /list)) - return 1 - - if(!req_access.len && (!req_one_access || !req_one_access.len)) - return 1 - if(!I) - return 0 - for(var/req in src.req_access) - if(!(req in I.GetAccess())) //doesn't have this access - return 0 - if(req_one_access && req_one_access.len) - for(var/req in req_one_access) - if(req in I.GetAccess()) //has an access from the single access list - return 1 - return 0 - return 1 - + var/list/L + if(I) + L = I.GetAccess() + else + L = list() + return check_access_list(L) /obj/proc/check_access_list(var/list/L) generate_req_lists() diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index cbfb8549923..9afc26351f4 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -173,7 +173,7 @@ selection_color = "#ffeef0" idtype = /obj/item/weapon/card/id/medical access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_virology, access_maint_tunnels) + minimal_access = list(access_medical, access_virology, access_maint_tunnels, access_mineral_storeroom) alt_titles = list("Pathologist","Microbiologist") minimal_player_age = 7 diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index d9de164d5de..29a0375b849 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -145,7 +145,7 @@ accepted = 1 if("No") if(outoftime) - H << "Welp, out of time, buddy. You're stuck. Next time choose faster." + to_chat(H, "Welp, out of time, buddy. You're stuck. Next time choose faster.") accepted = 1 if(ticker) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index f5dc80dcae7..9f9658a9dff 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -17,7 +17,7 @@ var/global/datum/controller/occupations/job_master occupations = list() var/list/all_jobs = subtypesof(/datum/job) if(!all_jobs.len) - world << "\red \b Error setting up jobs, no job datums found" + to_chat(world, "\red \b Error setting up jobs, no job datums found") return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -383,7 +383,7 @@ var/global/datum/controller/occupations/job_master job.equip(H) job.apply_fingerprints(H) else - H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator." + to_chat(H, "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.") H.job = rank @@ -431,7 +431,7 @@ var/global/datum/controller/occupations/job_master H.mind.store_memory(remembered_info) spawn(0) - H << "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]" + to_chat(H, "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]") var/alt_title = null if(H.mind) @@ -464,10 +464,10 @@ var/global/datum/controller/occupations/job_master H.equip_to_slot_or_del(BPK, slot_back,1) H.species.equip(H) - H << "You are the [alt_title ? alt_title : rank]." - H << "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this." + to_chat(H, "You are the [alt_title ? alt_title : rank].") + to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") if(job.req_admin_notify) - H << "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp." + to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp.") spawnId(H, rank, alt_title) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 68610e3c0a7..1514b0440a8 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -24,7 +24,7 @@ var/list/whitelist = list() if(check_rights(R_ADMIN, 0)) return 1 if(!dbcon.IsConnected()) - usr << "\red Unable to connect to whitelist database. Please try again later.
" + to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT job FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") @@ -34,7 +34,7 @@ var/list/whitelist = list() while(query.NextRow()) var/joblist = query.item[1] if(joblist!="*") - var/allowed_jobs = text2list(joblist,",") + var/allowed_jobs = splittext(joblist,",") if(rank in allowed_jobs) return 1 else return 1 return 0 @@ -56,7 +56,7 @@ var/list/whitelist = list() if (!text) diary << "Failed to load config/alienwhitelist.txt\n" else - alien_whitelist = text2list(text, "\n") + alien_whitelist = splittext(text, "\n") //todo: admin aliens /proc/is_alien_whitelisted(mob/M, var/species) @@ -69,7 +69,7 @@ var/list/whitelist = list() if(!alien_whitelist) return 0 if(!dbcon.IsConnected()) - usr << "\red Unable to connect to whitelist database. Please try again later.
" + to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT species FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") @@ -78,7 +78,7 @@ var/list/whitelist = list() while(query.NextRow()) var/specieslist = query.item[1] if(specieslist!="*") - var/allowed_species = text2list(specieslist,",") + var/allowed_species = splittext(specieslist,",") if(species in allowed_species) return 1 else return 1 return 0 diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 49c1fb8d325..bb8f7ac9184 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -60,7 +60,7 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) - user << "Open the maintenance panel first." + to_chat(user, "Open the maintenance panel first.") return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -92,7 +92,7 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return src.ui_interact(user) @@ -220,7 +220,7 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) - user << "Open the maintenance panel first." + to_chat(user, "Open the maintenance panel first.") return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -252,7 +252,7 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return src.ui_interact(user) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 96849a2905d..fbc52904117 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -45,7 +45,7 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if (HULK in usr.mutations) - usr << text("\blue You destroy the table.") + to_chat(usr, text("\blue You destroy the table.")) visible_message("\red [usr] destroys the operating table!") src.density = 0 qdel(src) @@ -126,15 +126,21 @@ take_victim(W:affecting,usr) qdel(W) return + if(istype(W, /obj/item/weapon/wrench)) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, 20, target = src)) + to_chat(user, "You deconstruct the table.") + new /obj/item/stack/sheet/plasteel(loc, 5) + qdel(src) /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) if(src.victim && get_turf(victim) == get_turf(src) && victim.lying) - usr << "The table is already occupied!" + to_chat(usr, "The table is already occupied!") return 0 if(patient.buckled) - usr << "Unbuckle first!" + to_chat(usr, "Unbuckle first!") return 0 return 1 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index cdf5e479ef5..f21ad0d03ee 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -28,7 +28,7 @@ /obj/machinery/pdapainter/New() ..() - var/blocked = list(/obj/item/device/pda/ai/pai, /obj/item/device/pda/ai, /obj/item/device/pda/heads, + var/blocked = list(/obj/item/device/pda/pai, /obj/item/device/pda/ai, /obj/item/device/pda/heads, /obj/item/device/pda/clear, /obj/item/device/pda/syndicate) for(var/P in typesof(/obj/item/device/pda)-blocked) @@ -43,7 +43,7 @@ /obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/device/pda)) if(storedpda) - user << "There is already a PDA inside." + to_chat(user, "There is already a PDA inside.") return else var/obj/item/device/pda/P = usr.get_active_hand() @@ -72,7 +72,7 @@ storedpda.desc = P.desc else - user << "The [src] is empty." + to_chat(user, "The [src] is empty.") /obj/machinery/pdapainter/verb/ejectpda() @@ -85,7 +85,7 @@ storedpda = null update_icon() else - usr << "The [src] is empty." + to_chat(usr, "The [src] is empty.") /obj/machinery/pdapainter/power_change() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index b743b26fc8f..238e071ebe9 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -83,7 +83,7 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(dir == 4) orient = "LEFT" @@ -109,7 +109,7 @@ return if (panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if (!src.connected) @@ -226,7 +226,7 @@ return 1 if(panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") return 0 if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) @@ -234,11 +234,11 @@ if (src.connected) if (src.connected.occupant) if (src.connected.occupant.stat == DEAD) - usr << "This person has no life for to preserve anymore. Take them to a department capable of reanimating them." + to_chat(usr, "This person has no life for to preserve anymore. Take them to a department capable of reanimating them.") else if(src.connected.occupant.health > src.connected.min_health || (href_list["chemical"] in connected.emergency_chems)) src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"])) else - usr << "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" + to_chat(usr, "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!") if (href_list["removebeaker"]) src.connected.remove_beaker() if (href_list["togglefilter"]) @@ -351,7 +351,7 @@ if(world.timeofday > (R.last_addiction_dose + ADDICTION_SPEEDUP_TIME)) // 2.5 minutes addiction_removal_chance = 10 if(prob(addiction_removal_chance)) - occupant << "You no longer feel reliant on [R.name]!" + to_chat(occupant, "You no longer feel reliant on [R.name]!") occupant.reagents.addiction_list.Remove(R) updateDialog() @@ -371,7 +371,7 @@ if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(!beaker) if (!user.drop_item()) - user << "\The [G] is stuck to you!" + to_chat(user, "\The [G] is stuck to you!") return beaker = G @@ -380,22 +380,22 @@ return else - user << "The sleeper has a beaker already." + to_chat(user, "The sleeper has a beaker already.") return if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") return default_deconstruction_screwdriver(user, "sleeper-o", "sleeper-open", G) return if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) - user << "The scanner is occupied." + to_chat(user, "The scanner is occupied.") return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(dir == 4) orient = "LEFT" @@ -412,23 +412,23 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(!ismob(G:affecting)) return if(src.occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head." + to_chat(usr, "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head.") return visible_message("[user] starts putting [G:affecting:name] into the sleeper.") if(do_after(user, 20, target = G:affecting)) if(src.occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") return if(!G || !G:affecting) return var/mob/M = G:affecting @@ -438,7 +438,7 @@ M.forceMove(src) src.occupant = M src.icon_state = "sleeper" - M << "You feel cool air surround you. You go numb as your senses turn inward." + to_chat(M, "You feel cool air surround you. You go numb as your senses turn inward.") src.add_fingerprint(user) qdel(G) @@ -520,7 +520,7 @@ /obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount) if (!(chemical in injection_chems)) - user << "The sleeper does not offer that chemical!" + to_chat(user, "The sleeper does not offer that chemical!") return if(src.occupant) @@ -529,13 +529,13 @@ src.occupant.reagents.add_reagent(chemical, amount) return else - user << "You can not inject any more of this chemical." + to_chat(user, "You can not inject any more of this chemical.") return else - user << "The patient rejects the chemicals!" + to_chat(user, "The patient rejects the chemicals!") return else - user << "There's no occupant in the sleeper!" + to_chat(user, "There's no occupant in the sleeper!") return /obj/machinery/sleeper/verb/eject() @@ -580,20 +580,20 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the sleeper because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the sleeper because they have a slime latched onto their head.") return if(L == user) visible_message("[user] starts climbing into the sleeper.") @@ -602,7 +602,7 @@ if(do_after(user, 20, target = L)) if(src.occupant) - user << ">The sleeper is already occupied!" + to_chat(user, ">The sleeper is already occupied!") return if(!L) return @@ -612,7 +612,7 @@ L.forceMove(src) src.occupant = L src.icon_state = "sleeper" - L << "You feel cool air surround you. You go numb as your senses turn inward." + to_chat(L, "You feel cool air surround you. You go numb as your senses turn inward.") src.add_fingerprint(user) if(user.pulling == L) user.stop_pulling() @@ -629,21 +629,21 @@ if(usr.stat != 0 || !(ishuman(usr))) return if(src.occupant) - usr << "The sleeper is already occupied!" + to_chat(usr, "The sleeper is already occupied!") return if (panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") return if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") return visible_message("[usr] starts climbing into the sleeper.") if(do_after(usr, 20, target = usr)) if(src.occupant) - usr << "The sleeper is already occupied!" + to_chat(usr, "The sleeper is already occupied!") return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index fe4c1088885..45ee6e0f4c9 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -42,17 +42,17 @@ /obj/machinery/bodyscanner/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") return default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G) return if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) - user << "The scanner is occupied." + to_chat(user, "The scanner is occupied.") return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(dir == 4) dir = 8 @@ -68,20 +68,20 @@ if(istype(G, /obj/item/weapon/grab)) var/obj/item/weapon/grab/TYPECAST_YOUR_SHIT = G if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(!ismob(TYPECAST_YOUR_SHIT.affecting)) return if(occupant) - user << "The scanner is already occupied!" + to_chat(user, "The scanner is already occupied!") return for(var/mob/living/carbon/slime/M in range(1, TYPECAST_YOUR_SHIT.affecting)) if(M.Victim == TYPECAST_YOUR_SHIT.affecting) - user << "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first." + to_chat(user, "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first.") return var/mob/M = TYPECAST_YOUR_SHIT.affecting if(M.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") return /*if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -105,20 +105,20 @@ if(!ishuman(user) && !isrobot(user)) return 0 //not a borg or human if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return 0 //panel open if(occupant) - user << "\The [src] is already occupied." + to_chat(user, "\The [src] is already occupied.") return 0 //occupied if(O.buckled) return 0 if(O.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") return 0 for(var/mob/living/carbon/slime/M in range(1, O)) if(M.Victim == O) - user << "[O] has a fucking slime attached to them, deal with that first." + to_chat(user, "[O] has a fucking slime attached to them, deal with that first.") return 0 if(O == user) @@ -268,7 +268,7 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(dir == 4) dir = 8 @@ -292,7 +292,7 @@ return if (panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(!src.connected) @@ -317,7 +317,7 @@ occupantData["health"] = H.health occupantData["maxHealth"] = H.maxHealth - occupantData["hasVirus"] = H.virus2.len + occupantData["hasVirus"] = H.viruses.len occupantData["bruteLoss"] = H.getBruteLoss() occupantData["oxyLoss"] = H.getOxyLoss() @@ -476,7 +476,7 @@ t1 = "*dead*" dat += "[occupant.health > 50 ? "" : ""]\tHealth %: [occupant.health], ([t1])
" - if(occupant.virus2.len) + if(occupant.viruses.len) dat += "Viral pathogen detected in blood stream.
" var/extra_font = null diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 54fd1edeaf3..9869e2650f9 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -36,7 +36,7 @@ else // trying to unlock the interface if (src.allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the device." + to_chat(user, "You [ locked ? "lock" : "unlock"] the device.") if (locked) if (user.machine==src) user.unset_machine() @@ -45,7 +45,7 @@ if (user.machine==src) src.attack_hand(usr) else - user << "\red Access denied." + to_chat(user, "\red Access denied.") return return @@ -57,7 +57,7 @@ return if ( (get_dist(src, user) > 1 )) if (!istype(user, /mob/living/silicon)) - user << text("Too far away.") + to_chat(user, text("Too far away.")) user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -67,7 +67,7 @@ if (istype(loc, /turf)) loc = loc:loc if (!istype(loc, /area)) - user << text("Turret badly positioned - loc.loc is [].", loc) + to_chat(user, text("Turret badly positioned - loc.loc is [].", loc)) return var/area/area = loc var/t = "AI Liquid Dispenser ([area.name])
" @@ -87,7 +87,7 @@ return 1 if (src.locked) if (!istype(usr, /mob/living/silicon)) - usr << "Control panel is locked!" + to_chat(usr, "Control panel is locked!") return if (href_list["toggleOn"]) src.disabled = !src.disabled diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index cff929346b8..4a2d7103593 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -430,7 +430,7 @@ signal.data["sigtype"] = "command" radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) -// world << text("Signal [] Broadcasted to []", command, target) +// to_chat(world, text("Signal [] Broadcasted to []", command, target)) return 1 @@ -854,7 +854,7 @@ return STATUS_CLOSE if(aidisabled && (isAI(user) || isrobot(user))) - user << "AI control for \the [src] interface has been disabled." + to_chat(user, "AI control for \the [src] interface has been disabled.") return STATUS_CLOSE . = shorted ? STATUS_DISABLED : STATUS_INTERACTIVE @@ -988,7 +988,7 @@ return input_temperature = input_temperature + T0C if(input_temperature > max_temperature || input_temperature < min_temperature) - usr << "Temperature must be between [min_temperature_c]C and [max_temperature_c]C" + to_chat(usr, "Temperature must be between [min_temperature_c]C and [max_temperature_c]C") else target_temperature = input_temperature return 1 @@ -1007,9 +1007,9 @@ switch(buildstage) if(2) if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up. - //user << "You pop the Air Alarm's maintence panel open." +// to_chat(user, "You pop the Air Alarm's maintence panel open.") wiresexposed = !wiresexposed - user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" + to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") update_icon() return @@ -1027,15 +1027,15 @@ if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card if(stat & (NOPOWER|BROKEN)) - user << "It does nothing" + to_chat(user, "It does nothing") return else if(allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked - user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface." + to_chat(user, "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface.") updateUsrDialog() else - user << "\red Access denied." + to_chat(user, "\red Access denied.") return @@ -1044,10 +1044,10 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) - user << "You need more cable for this!" + to_chat(user, "You need more cable for this!") return - user << "You wire \the [src]!" + to_chat(user, "You wire \the [src]!") coil.amount -= 5 if(!coil.amount) qdel(coil) @@ -1058,10 +1058,10 @@ return else if(istype(W, /obj/item/weapon/crowbar)) - user << "You start prying out the circuit." + to_chat(user, "You start prying out the circuit.") playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,20, target = src)) - user << "You pry out the circuit!" + to_chat(user, "You pry out the circuit!") var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics() circuit.loc = user.loc buildstage = 0 @@ -1069,14 +1069,14 @@ return if(0) if(istype(W, /obj/item/weapon/airalarm_electronics)) - user << "You insert the circuit!" + to_chat(user, "You insert the circuit!") qdel(W) buildstage = 1 update_icon() return else if(istype(W, /obj/item/weapon/wrench)) - user << "You remove the fire alarm assembly from the wall!" + to_chat(user, "You remove the fire alarm assembly from the wall!") new /obj/item/mounted/frame/alarm_frame(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) qdel(src) @@ -1094,9 +1094,9 @@ /obj/machinery/alarm/examine(mob/user) ..(user) if (buildstage < 2) - user << "It is not wired." + to_chat(user, "It is not wired.") if (buildstage < 1) - user << "The circuit is missing." + to_chat(user, "The circuit is missing.") /* AIR ALARM CIRCUIT diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 97a99e7899d..80d588179bf 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -73,10 +73,10 @@ obj/machinery/air_sensor return 1 if(istype(W, /obj/item/weapon/wrench)) if(bolts) - usr << "The [src] is bolted to the floor! You can't detach it like this." + to_chat(usr, "The [src] is bolted to the floor! You can't detach it like this.") return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + to_chat(user, "\blue You begin to unfasten \the [src]...") if(do_after(user, 40, target = src)) user.visible_message("[user] unfastens \the [src].", "\blue You have unfastened \the [src].", "You hear ratchet.") new /obj/item/pipe_gsensor(src.loc) @@ -299,7 +299,7 @@ legend { if(!isnull(G.id_tag) && G.frequency == frequency) sensor_list|=G.id_tag if(!sensor_list.len) - user << "No sensors on this frequency." + to_chat(user, "No sensors on this frequency.") return MT_ERROR // Have the user pick one of them and name its label @@ -320,7 +320,7 @@ legend { if(!isnull(G.id_tag) && G.frequency == frequency) sensor_list|=G.id_tag if(!sensor_list.len) - user << "No sensors on this frequency." + to_chat(user, "No sensors on this frequency.") return MT_ERROR var/label = sensors[href_list["edit_sensor"]] var/sensor = input(user, "Select a sensor:", "Sensor Data", href_list["edit_sensor"]) as null|anything in sensor_list diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 99db01bfae2..14b3ca3fc59 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -338,7 +338,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(iswelder(W) && src.destroyed) if(weld(W, user)) - user << "\blue You salvage whats left of \the [src]" + to_chat(user, "\blue You salvage whats left of \the [src]") var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(src.loc) M.amount = 3 qdel(src) @@ -360,7 +360,7 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + to_chat(user, "You pulse-pressurize your jetpack from the tank.") return ..() @@ -375,7 +375,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_alien(mob/living/carbon/alien/humanoid/user) return - + /obj/machinery/portable_atmospherics/canister/attack_ghost(var/mob/user as mob) return src.ui_interact(user) @@ -427,7 +427,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/Topic(href, href_list) if(..()) return 1 - + if (href_list["choice"] == "menu") menu = text2num(href_list["mode_target"]) @@ -478,7 +478,7 @@ update_flag else name = "canister" else - usr << "\red As you attempted to rename it the pressure rose!" + to_chat(usr, "\red As you attempted to rename it the pressure rose!") if (href_list["choice"] == "Primary color") if (is_a_color(href_list["icon"],"prim")) @@ -625,13 +625,12 @@ update_flag if(busy) return 0 - if(!WT.isOn()) + if(!WT.remove_fuel(0, user)) return 0 // Do after stuff here - user << "You start to slice away at \the [src]..." + to_chat(user, "You start to slice away at \the [src]...") playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) - WT.eyecheck(user) busy = 1 if(do_after(user, 50, target = src)) busy = 0 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index ebf9126017f..b2b7b1efc06 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -106,7 +106,7 @@ else t += "The connect error light is blinking." - user << t + to_chat(user, t) /obj/machinery/meter/Click() if(istype(usr, /mob/living/silicon/ai)) // ghosts can call ..() for examine @@ -123,7 +123,7 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + to_chat(user, "\blue You begin to unfasten \the [src]...") if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 92f3cb8211e..21eee7b52ac 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -91,21 +91,21 @@ else if (istype(W, /obj/item/weapon/wrench)) if(connected_port) disconnect() - user << "\blue You disconnect [name] from the port." + to_chat(user, "\blue You disconnect [name] from the port.") update_icon() return else var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - user << "\blue You connect [name] to the port." + to_chat(user, "\blue You connect [name] to the port.") update_icon() return else - user << "\blue [name] failed to connect to the port." + to_chat(user, "\blue [name] failed to connect to the port.") return else - user << "\blue Nothing happens." + to_chat(user, "\blue Nothing happens.") return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index a62f87ee098..1790dec775d 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -181,7 +181,7 @@ name = "[name] (ID [id])" /obj/machinery/portable_atmospherics/scrubber/huge/attack_hand(var/mob/user as mob) - usr << "You can't directly interact with this machine. Use the area atmos computer." + to_chat(usr, "You can't directly interact with this machine. Use the area atmos computer.") /obj/machinery/portable_atmospherics/scrubber/huge/update_icon() src.overlays = 0 @@ -194,15 +194,15 @@ /obj/machinery/portable_atmospherics/scrubber/huge/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) if(stationary) - user << "The bolts are too tight for you to unscrew!" + to_chat(user, "The bolts are too tight for you to unscrew!") return if(on) - user << "Turn it off first!" + to_chat(user, "Turn it off first!") return anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index ea9fab11e96..9021a1a2127 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -108,7 +108,7 @@ /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) if (busy) - user << "The autolathe is busy. Please wait for completion of previous operation." + to_chat(user, "The autolathe is busy. Please wait for completion of previous operation.") return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) @@ -143,13 +143,13 @@ var/material_amount = materials.get_item_material_amount(O) if(!material_amount) - user << "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe." + to_chat(user, "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.") return 1 if(!materials.has_space(material_amount)) - user << "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more." + to_chat(user, "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.") return 1 if(!user.unEquip(O)) - user << "\The [O] is stuck to you and cannot be placed into the autolathe." + to_chat(user, "\The [O] is stuck to you and cannot be placed into the autolathe.") return 1 busy = 1 @@ -160,10 +160,10 @@ flick("autolathe_o",src)//plays metal insertion animation if (O.materials[MAT_GLASS]) flick("autolathe_r",src)//plays glass insertion animation - user << "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe." + to_chat(user, "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.") use_power(inserted*100) else - user << "You insert a material total of [inserted] to the autolathe." + to_chat(user, "You insert a material total of [inserted] to the autolathe.") use_power(max(500,inserted/10)) qdel(O) busy = 0 @@ -213,7 +213,7 @@ if((queue.len+1)
" - hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" - else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. - hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" - return hack - -/obj/machinery/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally. - text_hack = "You hack [name]." - text_dehack = "You reset [name]." - text_dehack_fail = "You fail to reset [name]." - -/obj/machinery/bot/attack_ai(mob/user as mob) - attack_hand(user) - -/obj/machinery/bot/proc/speak(var/message, var/freqname = null) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. - if((!on) || (!message)) - return - if(freqname) - Radio.autosay(message, src.name, freqname, list(src.z)) - else - for(var/mob/O in hearers(src, null)) - O.show_message("[src] beeps, \"[message]\"",2) - return - - //Generalized behavior code, override where needed! - -/* -scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result. -Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists, -and the view range, which defaults to 7 (full screen) if an override is not passed. -If the bot maintains an ignore list, it is also checked here. - -Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) -The proc would return a human next to the bot to be set to the patient var. -Pass the desired type path itself, declaring a temporary var beforehand is not required. -*/ -obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range) - var/final_result - for (var/scan in view (scan_range ? scan_range : DEFAULT_SCAN_RANGE, src) ) //Search for something in range! - if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! - continue //If not, keep searching! - if( !(scan in ignore_list) && !(scan in old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness - var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. - if( scan_result ) - final_result = scan_result - else - continue //The current element failed assessment, move on to the next. - else - continue - return final_result - -//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. -obj/machinery/bot/proc/process_scan(var/scan_target) - return scan_target - - -/obj/machinery/bot/proc/add_to_ignore(var/subject) - if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. - ignore_list |= subject - else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. - ignore_list -= ignore_list[1] - ignore_list |= subject - -/* -Movement proc for stepping a bot through a path generated through A-star. -Pass a positive integer as an argument to override a bot's default speed. -*/ -obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) - if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. - path = list() - return 0 - if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again. - return 1 - var/success - var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var. - if(step_count >= 1 && tries < 4) - for(step_count, step_count >= 1,step_count--) - success = bot_step(dest) - if (success) - tries = 0 - else - tries++ - break - sleep(4) - else - return 0 - return 1 - - -obj/machinery/bot/proc/bot_step(var/dest) - if(path && path.len > 1) - step_towards(src, path[1]) - if(get_turf(src) == path[1]) //Successful move - path -= path[1] - else - return 0 - else if(path.len == 1) - step_towards(src, dest) - path = list() - return 1 - - -/obj/machinery/bot/proc/check_bot_access() - if(mode != BOT_SUMMON && mode != BOT_RESPONDING) - botcard.access = prev_access - -/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint) - bot_reset() //Reset a bot before setting it to call mode. - var/area/end_area = get_area(waypoint) - - //For giving the bot temporary all-access. - var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id - var/datum/job/captain/All = new/datum/job/captain - all_access.access = All.get_access() - - path = get_path_to(src, waypoint, src, /turf/proc/Distance_cardinal, 0, 200, id=all_access) - calling_ai = caller //Link the AI to the bot! - ai_waypoint = waypoint - - if(path && path.len) //Ensures that a valid path is calculated! - if(!on) - turn_on() //Saves the AI the hassle of having to activate a bot manually. - botcard = all_access //Give the bot all-access while under the AI's command. - calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." - pathset = 1 - mode = BOT_RESPONDING - tries = 0 - else - calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." - calling_ai = null - path = list() - -/obj/machinery/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. -//Handles the bot's movement during a call. - var/success = bot_move(ai_waypoint, 3) - if (!success) - if(calling_ai) - calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" - calling_ai = null - bot_reset() - -obj/machinery/bot/proc/bot_reset() - if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. - calling_ai << "Call command to a bot has been reset." - calling_ai = null - path = list() - summon_target = null - pathset = 0 - botcard.access = prev_access - tries = 0 - mode = BOT_IDLE - - - - - -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -//Patrol and summon code! -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -/obj/machinery/bot/proc/bot_patrol() - patrol_step() - spawn(5) - if(mode == BOT_PATROL) - patrol_step() - return - -obj/machinery/bot/proc/start_patrol() - - if(tries >= 4) //Bot is trapped, so stop trying to patrol. - auto_patrol = 0 - tries = 0 - speak("Unable to start patrol.") - - return - - if(!auto_patrol) //A bot not set to patrol should not be patrolling. - mode = BOT_IDLE - return - - if(patrol_target) // has patrol target - spawn(0) - calc_path() // Find a route to it - if(path.len == 0) - patrol_target = 0 - return - mode = BOT_PATROL - else if(!awaiting_beacon) // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - tries++ - return - -// perform a single patrol step - -/obj/machinery/bot/proc/patrol_step() - - if(loc == patrol_target) // reached target - - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - - else // failed to move - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - tries = 0 - - return - - return - - else // no path, so calculate new one - mode = BOT_START_PATROL - - return - -// finds a new patrol target -/obj/machinery/bot/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 40) // wait 40 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - if(next_destination) - set_destination(next_destination) - else - - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(200) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - tries = 0 - else - auto_patrol = 0 - mode = BOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/proc/at_patrol_target() - - find_patrol_target() - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/receive_signal(datum/signal/signal) - //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])") - if(!on) - return -/* - if(!signal.data["beacon"]) - - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. - return - // process control input - switch(recv) - if("stop") - bot_reset() //HOLD IT!! - auto_patrol = 0 - return - - if("go") - auto_patrol = 1 - return - - if("summon") - bot_reset() - var/list/user_access = signal.data["useraccess"] - summon_target = signal.data["target"] //Location of the user - if(user_access.len != 0) - botcard.access = user_access + prev_access //Adds the user's access, if any. - mode = BOT_SUMMON - calc_summon_path() - speak("Responding.", radio_name) - return - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - // note we ignore the beacon we are located at - if(dist>1 && dist
-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]
"}, - -"[on ? "On" : "Off"]" ) - - if(!locked || issilicon(user)) - if(!lasercolor) - dat += text({"
-Arrest Unidentifiable Persons: []
-Arrest for Unauthorized Weapons: []
-Arrest for Warrant: []
-
-Operating Mode: []
-Report Arrests[]
-Auto Patrol[]"}, - -"[idcheck ? "Yes" : "No"]", -"[weaponscheck ? "Yes" : "No"]", -"[check_records ? "Yes" : "No"]", -"[arrest_type ? "Detain" : "Arrest"]", -"[declare_arrests ? "Yes" : "No"]", -"[auto_patrol ? "On" : "Off"]" ) - var/datum/browser/popup = new(user, "autoed209", "Automatic Security Unit v2.6") - popup.set_content(dat) - popup.open() - return - -/obj/machinery/bot/ed209/Topic(href, href_list) - if(lasercolor && (istype(usr,/mob/living/carbon/human))) - var/mob/living/carbon/human/H = usr - if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it - return - else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) - return - ..() - - switch(href_list["operation"]) - if ("idcheck") - idcheck = !idcheck - if("weaponscheck") - weaponscheck = !weaponscheck - updateUsrDialog() - if ("ignorerec") - check_records = !check_records - updateUsrDialog() - if ("switchmode") - arrest_type = !arrest_type - updateUsrDialog() - if("declarearrests") - declare_arrests = !declare_arrests - updateUsrDialog() - -/obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (allowed(user) && !open && !emagged) - locked = !locked - user << "Controls are now [locked ? "locked" : "unlocked"]." - updateUsrDialog() - else - if(emagged) - user << "ERROR" - if(open) - user << "Please close the access panel before locking it." - else - user << "Access denied." - else - ..() - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry. - return - if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. - if(W.force)//If force is non-zero and damage type isn't stamina. - threatlevel = user.assess_threat(src) - threatlevel += 6 - if(threatlevel >= 4) - target = user - if(lasercolor)//To make up for the fact that lasertag bots don't hunt - shootAt(user) - mode = BOT_HUNT - -/obj/machinery/bot/ed209/Emag(mob/user as mob) - ..() - if(emagged == 2) - if(user) - user << "You short out [src]'s target assessment circuits." - oldtarget_name = user.name - visible_message("[src] buzzes oddly!") - declare_arrests = 0 - icon_state = "[lasercolor]ed209[on]" - set_weapon() - -/obj/machinery/bot/ed209/bot_process() - if (!..()) - return - - if(disabled) - return - - var/list/targets = list() - for (var/mob/living/carbon/C in view(7,src)) //Let's find us a target - var/threatlevel = 0 - if ((C.stat) || (C.lying)) - continue - threatlevel = C.assess_threat(src, lasercolor) - //speak(C.real_name + text(": threat: []", threatlevel)) - if (threatlevel < 4 ) - continue - - var/dst = get_dist(src, C) - if ( dst <= 1 || dst > 7) - continue - - targets += C - if (targets.len>0) - var/mob/living/carbon/t = pick(targets) - if ((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. - shootAt(t) - switch(mode) - - if(BOT_IDLE) // idle - walk_to(src,0) - if(!lasercolor) //lasertag bots don't want to arrest anyone - look_for_perp() // see if any criminals are in range - if(!mode && auto_patrol) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode - - if(BOT_HUNT) // hunting for perp - // if can't reach perp for long enough, go idle - if (frustration >= 8) - walk_to(src,0) - back_to_idle() - - if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp - playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - icon_state = "[lasercolor]ed209-c" - spawn(2) - icon_state = "[lasercolor]ed209[on]" - var/mob/living/carbon/M = target - if(istype(M, /mob/living/carbon/human)) - if( M.stuttering < 5 && !(HULK in M.mutations) ) - M.stuttering = 5 - M.Stun(5) - M.Weaken(5) - else - M.Weaken(5) - M.stuttering = 5 - M.Stun(5) - - if(declare_arrests) - var/area/location = get_area(src) - speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_name) - target.visible_message("[target] has been stunned by [src]!",\ - "[target] has been stunned by [src]!
Multiple Utility Load Effector Mk. V
" - dat += "ID: [suffix]" - dat += "Power: [on ? "On" : "Off"]
" - - if(!open) - - dat += "
Status
" - - dat += ""
- switch(mode)
- if(BOT_IDLE)
- dat += "Ready"
- if(BOT_LOADING)
- dat += "[mode_name[BOT_LOADING]]"
- if(BOT_DELIVER)
- dat += "[mode_name[BOT_DELIVER]]"
- if(BOT_GO_HOME)
- dat += "[mode_name[BOT_GO_HOME]]"
- if(BOT_BLOCKED)
- dat += "[mode_name[BOT_BLOCKED]]"
- if(BOT_NAV,BOT_WAIT_FOR_NAV)
- dat += "[mode_name[BOT_NAV]]"
- if(BOT_NO_ROUTE)
- dat += "[mode_name[BOT_NO_ROUTE]]"
- dat += "
"
-
- dat += "Current Load: [load ? load.name : "none"]" - dat += "Destination: [!destination ? "none" : destination]
" - dat += "Power level: [cell ? cell.percent() : 0]%" - - if(locked && !ai) - dat += "
Controls are locked
Unlock Controls"
- else
- dat += " Controls are unlocked
Lock Controls" - - dat += "Toggle Power
" - dat += "Stop
" - dat += "Proceed
" - dat += "Return to Home
" - dat += "Set Destination
" - dat += "Set Bot ID
" - dat += "Set Home
" - dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" - dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" - dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" - - if(load) - dat += "Unload Now
" - dat += "
The maintenance hatch is closed.
"
-
- else
- if(!ai)
- dat += "The maintenance hatch is open.
" - dat += "Power cell: " - if(cell) - dat += "Installed
" - else - dat += "Removed
" - - dat += wires() - else - dat += "
The bot is in maintenance mode and cannot be controlled.
" - - //user << browse("
-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]"}, - -"[on ? "On" : "Off"]" ) - - if(!locked || issilicon(user)) - dat += text({"
-Arrest Unidentifiable Persons: []
-Arrest for Unauthorized Weapons: []
-Arrest for Warrant: []
-Operating Mode: []
-Report Arrests[]
-Auto Patrol: []"}, - -"[idcheck ? "Yes" : "No"]", -"[weaponscheck ? "Yes" : "No"]", -"[check_records ? "Yes" : "No"]", -"[arrest_type ? "Detain" : "Arrest"]", -"[declare_arrests ? "Yes" : "No"]", -"[auto_patrol ? "On" : "Off"]" ) - - var/datum/browser/popup = new(user, "autosec", "Automatic Security Unit v1.6") - popup.set_content(dat) - popup.open() - return - -/obj/machinery/bot/secbot/Topic(href, href_list) - - ..() - - switch(href_list["operation"]) - if("idcheck") - idcheck = !idcheck - updateUsrDialog() - if("weaponscheck") - weaponscheck = !weaponscheck - updateUsrDialog() - if("ignorerec") - check_records = !check_records - updateUsrDialog() - if("switchmode") - arrest_type = !arrest_type - updateUsrDialog() - if("declarearrests") - declare_arrests = !declare_arrests - updateUsrDialog() - - -/obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if(allowed(user) && !open && !emagged) - locked = !locked - user << "Controls are now [locked ? "locked." : "unlocked."]" - updateUsrDialog() - else - if(emagged) - user << "ERROR" - if(open) - user << "Please close the access panel before locking it." - else - user << " Access denied." - else - ..() - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry. - return - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. - threatlevel = user.assess_threat(src) - threatlevel += 6 - if(threatlevel >= 4) - target = user - mode = BOT_HUNT - -/obj/machinery/bot/secbot/Emag(mob/user as mob) - ..() - - if(emagged == 2) - if(user) - user << " You short out [src]'s target assessment circuits." - oldtarget_name = user.name - visible_message("[src] buzzes oddly!") - declare_arrests = 0 - icon_state = "[base_icon][on]" - -/obj/machinery/bot/secbot/bot_process() - if (!..()) - return - - switch(mode) - - if(BOT_IDLE) // idle - flashing_lights() //make sure they disengage properly - walk_to(src,0) - look_for_perp() // see if any criminals are in range - if(!mode && auto_patrol) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode - - if(BOT_HUNT) // hunting for perp - flashing_lights() - // if can't reach perp for long enough, go idle - if(frustration >= 8) - walk_to(src,0) - back_to_idle() - return - - if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp - playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - if(harmbaton) - playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1) - icon_state = "[base_icon]-c" - spawn(2) - icon_state = "[base_icon][on]" - var/mob/living/carbon/M = target - if(istype(M, /mob/living/carbon/human)) - if( M.stuttering < 5 && !(HULK in M.mutations) ) - M.stuttering = 5 - if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave - M.apply_damage(10) - M.Stun(5) - M.Weaken(5) - else - M.Weaken(5) - M.stuttering = 5 - M.Stun(5) - - if(declare_arrests) - var/area/location = get_area(src) - speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_name) - target.visible_message("[target] has been [harmbaton ? "beaten" : "stunned"] by [src]!",\ - "[target] has been [harmbaton ? "beaten" : "stunned"] by [src]!") - - mode = BOT_PREP_ARREST - anchored = 1 - target_lastloc = M.loc - return - - else // not next to perp - var/turf/olddist = get_dist(src, target) - walk_to(src, target,1,4) - if((get_dist(src, target)) >= (olddist)) - frustration++ - else - frustration = 0 - else - back_to_idle() - - if(BOT_PREP_ARREST) // preparing to arrest target - flashing_lights() //make sure they disengage properly - // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) - back_to_hunt() - return - - if(iscarbon(target) && target.canBeHandcuffed()) - if(!arrest_type) - if(!target.handcuffed) //he's not cuffed? Try to cuff him! - mode = BOT_ARREST - playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [target]!",\ - "[src] is trying to put zipties on [target]!") - spawn(30) - if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. - return - if(!target.handcuffed) - target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) - target.update_inv_handcuffed(1) //update the handcuffs overlay - playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - back_to_idle() - else - back_to_idle() - return - else - back_to_idle() - return - - if(BOT_ARREST) - if (!target) - anchored = 0 - mode = BOT_IDLE - last_found = world.time - frustration = 0 - return - - if(target.handcuffed) //no target or target cuffed? back to idle. - back_to_idle() - return - - if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. - back_to_hunt() - return - else //Try arresting again if the target escapes. - mode = BOT_PREP_ARREST - anchored = 0 - - if(BOT_START_PATROL) - look_for_perp() - start_patrol() - - if(BOT_PATROL) - look_for_perp() - bot_patrol() - - - return - -/obj/machinery/bot/secbot/proc/back_to_idle() - anchored = 0 - mode = BOT_IDLE - target = null - last_found = world.time - frustration = 0 - spawn(0) - bot_process() //ensure bot quickly responds - -/obj/machinery/bot/secbot/proc/back_to_hunt() - anchored = 0 - frustration = 0 - mode = BOT_HUNT - spawn(0) - bot_process() //ensure bot quickly responds -// look for a criminal in view of the bot - -/obj/machinery/bot/secbot/proc/look_for_perp() - anchored = 0 - for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal - if((C.stat) || (C.handcuffed)) - continue - - if((C.name == oldtarget_name) && (world.time < last_found + 100)) - continue - - threatlevel = C.assess_threat(src) - - if(!threatlevel) - continue - - else if(threatlevel >= 4) - target = C - oldtarget_name = C.name - speak("Level [threatlevel] infraction alert!") - playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0) - visible_message("[src] points at [C.name]!") - mode = BOT_HUNT - spawn(0) - bot_process() // ensure bot quickly responds to a perp - break - else - continue -/obj/machinery/bot/secbot/proc/check_for_weapons(var/obj/item/slot_item) - if(slot_item && slot_item.needs_permit) - return 1 - return 0 - -/obj/machinery/bot/secbot/explode() - - walk_to(src,0) - visible_message("[src] blows apart!") - var/turf/Tsec = get_turf(src) - - var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) - Sa.build_step = 1 - Sa.overlays += "hs_hole" - Sa.created_name = name - new /obj/item/device/assembly/prox_sensor(Tsec) - new /obj/item/weapon/melee/baton(Tsec) - - if(prob(50)) - new /obj/item/robot_parts/l_arm(Tsec) - - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() - - new /obj/effect/decal/cleanable/blood/oil(loc) - qdel(src) - -/obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob) - ..() - if(!isalien(target)) - target = user - mode = BOT_HUNT - -/obj/machinery/bot/secbot/proc/flashing_lights() - if(mode == BOT_HUNT) - switch(light_color) - if(LIGHT_COLOR_PURE_RED) - light_color = LIGHT_COLOR_PURE_BLUE - if(LIGHT_COLOR_PURE_BLUE) - light_color = LIGHT_COLOR_PURE_RED - else - light_color = LIGHT_COLOR_PURE_RED - -//Secbot Construction - -/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob, params) - ..() - if(!issignaler(S)) - ..() - return - - if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets. - return - - if(S.secured) - qdel(S) - var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly - user.put_in_hands(A) - user << "You add the signaler to the helmet." - user.unEquip(src, 1) - qdel(src) - else - return - -/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user, params) - ..() - if(istype(I, /obj/item/weapon/weldingtool)) - if(!build_step) - var/obj/item/weapon/weldingtool/WT = I - if(WT.remove_fuel(0, user)) - build_step++ - overlays += "hs_hole" - user << "You weld a hole in [src]!" - else if(build_step == 1) - var/obj/item/weapon/weldingtool/WT = I - if(WT.remove_fuel(0, user)) - build_step-- - overlays -= "hs_hole" - user << "You weld the hole in [src] shut!" - - else if(isprox(I) && (build_step == 1)) - user.drop_item() - build_step++ - user << "You add the prox sensor to [src]!" - overlays += "hs_eye" - name = "helmet/signaler/prox sensor assembly" - qdel(I) - - else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2)) - user.drop_item() - build_step++ - user << "You add the robot arm to [src]!" - name = "helmet/signaler/prox sensor/robot arm assembly" - overlays += "hs_arm" - qdel(I) - - else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3)) - user.drop_item() - build_step++ - user << "You complete the Securitron! Beep boop." - var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot - S.loc = get_turf(src) - S.name = created_name - qdel(I) - qdel(src) - - else if(istype(I, /obj/item/weapon/pen)) - var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN) - if(!t) - return - if(!in_range(src, usr) && loc != usr) - return - created_name = t - - else if(istype(I, /obj/item/weapon/screwdriver)) - if(!build_step) - new /obj/item/device/assembly/signaler(get_turf(src)) - new /obj/item/clothing/head/helmet(get_turf(src)) - user << "You disconnect the signaler from the helmet." - qdel(src) - - else if(build_step == 2) - overlays -= "hs_eye" - new /obj/item/device/assembly/prox_sensor(get_turf(src)) - user << "You detach the proximity sensor from [src]." - build_step-- - - else if(build_step == 3) - overlays -= "hs_arm" - new /obj/item/robot_parts/l_arm(get_turf(src)) - user << "You remove the robot arm from [src]." - build_step-- \ No newline at end of file diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index b38830b4b44..afeb5a1f778 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -1,3 +1,8 @@ + +////////////////////////////////////// +// Driver Button // +////////////////////////////////////// + /obj/machinery/driver_button name = "mass driver button" icon = 'icons/obj/objects.dmi' @@ -5,11 +10,17 @@ desc = "A remote control switch for a mass driver." var/id_tag = "default" var/active = 0 - settagwhitelist = list("id_tag") + settagwhitelist = list("id_tag", "logic_id_tag") anchored = 1.0 use_power = 1 idle_power_usage = 2 active_power_usage = 4 + var/range = 7 + + var/datum/radio_frequency/radio_connection + var/frequency = 0 + var/logic_id_tag = "default" //Defines the ID tag to send logic signals to, so you don't have to unlink from doors and stuff + var/logic_connect = 0 //Set this to allow the button to send out logic signals when pressed in addition to normal stuff /obj/machinery/driver_button/New(turf/loc, var/w_dir=null) ..() @@ -22,6 +33,123 @@ pixel_x = 25 if(WEST) pixel_x = -25 + if(radio_controller) + set_frequency(frequency) + +/obj/machinery/driver_button/initialize() + ..() + set_frequency(frequency) + +/obj/machinery/driver_button/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency, RADIO_LOGIC) + return + +/obj/machinery/driver_button/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + return ..() + + +/obj/machinery/driver_button/attack_ai(mob/user as mob) + return src.attack_hand(user) + +/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params) + + if(istype(W, /obj/item/device/detective_scanner)) + return + + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 + + if(istype(W, /obj/item/weapon/wrench)) + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, 30, target = src)) + to_chat(user, "You detach \the [src] from the wall.") + new/obj/item/mounted/frame/driver_button(get_turf(src)) + qdel(src) + return 1 + + return src.attack_hand(user) + +/obj/machinery/driver_button/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) + return {" +
-
+
- ID Tag: [format_tag("ID Tag","id_tag")] +
- Logic Connection: [logic_connect ? "On" : "Off"] +
- Logic ID Tag: [format_tag("Logic ID Tag", "logic_id_tag")] +
So this is what cloning feels like?" + to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") // -- Mode/mind specific stuff goes here callHook("clone", list(H)) @@ -344,7 +344,7 @@ /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/screwdriver)) if(occupant || mess || locked) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W) return @@ -359,27 +359,27 @@ if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!check_access(W)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") return if ((!locked) || (isnull(occupant))) return if ((occupant.health < -20) && (occupant.stat != 2)) - user << "\red Access Refused." + to_chat(user, "\red Access Refused.") return else locked = 0 - user << "System unlocked." + to_chat(user, "System unlocked.") //Removing cloning pod biomass else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) - user << "\blue \The [src] processes \the [W]." + to_chat(user, "\blue \The [src] processes \the [W].") biomass += 50 user.drop_item() qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if(locked && (anchored || occupant)) - user << "\red Can not do that while [src] is in use." + to_chat(user, "\red Can not do that while [src] is in use.") else if(anchored) anchored = 0 @@ -395,7 +395,7 @@ else if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W M.buffer = src - user << "You load connection data from [src] to [M]." + to_chat(user, "You load connection data from [src] to [M].") return else ..() @@ -403,7 +403,7 @@ /obj/machinery/clonepod/emag_act(user as mob) if (isnull(occupant)) return - user << "You force an emergency ejection." + to_chat(user, "You force an emergency ejection.") locked = 0 go_out() return @@ -443,11 +443,11 @@ return if (!(occupant)) - user << "The cloning pod is empty!" + to_chat(user, "The cloning pod is empty!") return if (locked) - user << "The cloning pod is locked!" + to_chat(user, "The cloning pod is locked!") return if (occupant.client) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 2ad0eba3a81..809ac579454 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -164,8 +164,8 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You vastly increase projector power and override the safety and security protocols." - user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator." + to_chat(user, "\blue You vastly increase projector power and override the safety and security protocols.") + to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.") log_game("[key_name(usr)] emagged the Holodeck Control Computer") src.updateUsrDialog() @@ -367,7 +367,7 @@ return ..() if (istype(W, /obj/item/weapon/wrench)) - user << "It's a holotable! There are no bolts!" + to_chat(user, "It's a holotable! There are no bolts!") return /obj/structure/table/holotable/wood @@ -407,7 +407,7 @@ /obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) - user << "It's a holorack! There are no bolts!" + to_chat(user, "It's a holorack! There are no bolts!") return /obj/item/weapon/holo @@ -467,13 +467,13 @@ icon_state = "sword[item_color]" w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - user << "[src] is now active." + to_chat(user, "[src] is now active.") else force = 3 icon_state = "sword0" w_class = 2 playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -503,7 +503,7 @@ if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state<2) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") return G.affecting.loc = src.loc G.affecting.Weaken(5) @@ -545,15 +545,15 @@ power_channel = ENVIRON /obj/machinery/readybutton/attack_ai(mob/user as mob) - user << "The station AI is not to interact with these devices" + to_chat(user, "The station AI is not to interact with these devices") return /obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - user << "The device is a solid button, there's nothing you can do with it!" + to_chat(user, "The device is a solid button, there's nothing you can do with it!") /obj/machinery/readybutton/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + to_chat(user, "This device is not powered.") return currentarea = get_area(src.loc) @@ -561,7 +561,7 @@ qdel(src) if(eventstarted) - usr << "The event has already begun!" + to_chat(usr, "The event has already begun!") return ready = !ready @@ -591,4 +591,4 @@ qdel(W) for(var/mob/M in currentarea) - M << "FIGHT!" \ No newline at end of file + to_chat(M, "FIGHT!") diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 147901907bd..8ad0b715b4f 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -24,42 +24,42 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) - user << "The welder must be on for this task." + to_chat(user, "The welder must be on for this task.") return playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(0, user)) return - user << "\blue You deconstruct the frame." - new /obj/item/stack/sheet/plasteel( loc, 4) + to_chat(user, "\blue You deconstruct the frame.") + new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") state = 1 icon_state = "0" circuit.loc = loc @@ -67,7 +67,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") state = 1 icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -76,16 +76,16 @@ if(do_after(user, 20, target = src)) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") state = 3 icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) - user << "Get that brain out of there first" + to_chat(user, "Get that brain out of there first") else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) @@ -98,42 +98,42 @@ if (P) P:amount -= 2 if(!P:amount) qdel(P) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") state = 4 icon_state = "4" if(istype(P, /obj/item/weapon/aiModule/purge)) laws.clear_inherent_laws() - usr << "Law module applied." + to_chat(usr, "Law module applied.") return if(istype(P, /obj/item/weapon/aiModule/freeform)) var/obj/item/weapon/aiModule/freeform/M = P laws.add_inherent_law(M.newFreeFormLaw) - usr << "Added a freeform law." + to_chat(usr, "Added a freeform law.") return if(istype(P, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = P if(!M.laws) - usr << "This AI module can not be applied directly to AI cores." + to_chat(usr, "This AI module can not be applied directly to AI cores.") return laws = M.laws if(istype(P, /obj/item/device/mmi) || istype(P, /obj/item/device/mmi/posibrain)) if(!P:brainmob) - user << "\red Sticking an empty [P] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking an empty [P] into the frame would sort of defeat the purpose.") return if(P:brainmob.stat == 2) - user << "\red Sticking a dead [P] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking a dead [P] into the frame would sort of defeat the purpose.") return if(jobban_isbanned(P:brainmob, "AI") || jobban_isbanned(P:brainmob,"nonhumandept")) - user << "\red This [P] does not seem to fit." + to_chat(user, "\red This [P] does not seem to fit.") return if(istype(P, /obj/item/device/mmi/syndie)) - user << "This MMI does not seem to fit!" + to_chat(user, "This MMI does not seem to fit!") return if(P:brainmob.mind) @@ -143,12 +143,12 @@ user.drop_item() P.loc = src brain = P - usr << "Added [P]." + to_chat(usr, "Added [P].") icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the brain." + to_chat(user, "\blue You remove the brain.") brain.loc = loc brain = null icon_state = "3" @@ -156,7 +156,7 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") state = 3 if (brain) icon_state = "3b" @@ -167,7 +167,7 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You connect the monitor." + to_chat(user, "You connect the monitor.") if(!brain) var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) @@ -225,7 +225,7 @@ cores["[D] ([D.loc.loc])"] = D if(!cores.len) - src << "No deactivated AI cores were found." + to_chat(src, "No deactivated AI cores were found.") var/id = input("Which core?", "Toggle AI Core Latejoin", null) as null|anything in cores if(!id) return @@ -235,10 +235,10 @@ if(D in empty_playable_ai_cores) empty_playable_ai_cores -= D - src << "\The [id] is now not available for latejoining AIs." + to_chat(src, "\The [id] is now not available for latejoining AIs.") else empty_playable_ai_cores += D - src << "\The [id] is now available for latejoining AIs." + to_chat(src, "\The [id] is now available for latejoining AIs.") /* @@ -252,7 +252,7 @@ That prevents a few funky behaviors. atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(istype(card)) if(card.flush) - user << "ERROR: AI flush is in progress, cannot execute transfer protocol." + to_chat(user, "ERROR: AI flush is in progress, cannot execute transfer protocol.") return 0 return 1 @@ -265,8 +265,8 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A AI.control_disabled = 0 AI.aiRadio.disabledAi = 0 AI.loc = loc//To replace the terminal. - AI << "You have been uploaded to a stationary terminal. Remote device connection restored." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + to_chat(AI, "You have been uploaded to a stationary terminal. Remote device connection restored.") + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") qdel(src) else //If for some reason you use an empty card on an empty AI terminal. - user << "There is no AI loaded on this terminal!" + to_chat(user, "There is no AI loaded on this terminal!") diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 74ea7609137..e326d9750d5 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -13,9 +13,9 @@ /obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) if(occupant && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) - user << "The screws on [name]'s screen won't budge." + to_chat(user, "The screws on [name]'s screen won't budge.") else - user << "The screws on [name]'s screen won't budge and it emits a warning beep." + to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") return else ..() @@ -29,7 +29,7 @@ ui_interact(user) else if(mode.kickoff) - user << "You have been locked out from this console!" + to_chat(user, "You have been locked out from this console!") /obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] @@ -114,24 +114,24 @@ //Downloading AI from card to terminal. if(interaction == AI_TRANS_FROM_CARD) if(stat & (NOPOWER|BROKEN)) - user << "[src] is offline and cannot take an AI at this time!" + to_chat(user, "[src] is offline and cannot take an AI at this time!") return AI.loc = src occupant = AI AI.control_disabled = 1 AI.aiRadio.disabledAi = 1 - AI << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + to_chat(AI, "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here.") + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") update_icon() else //Uploading AI from terminal to card if(occupant && !active) - occupant << "You have been downloaded to a mobile storage device. Still no remote access." - user << "Transfer successful: [occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + to_chat(occupant, "You have been downloaded to a mobile storage device. Still no remote access.") + to_chat(user, "Transfer successful: [occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") occupant.loc = card occupant = null update_icon() else if (active) - user << "ERROR: Reconstruction in progress." + to_chat(user, "ERROR: Reconstruction in progress.") else if (!occupant) - user << "ERROR: Unable to locate artificial intelligence." + to_chat(user, "ERROR: Unable to locate artificial intelligence.") diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7277bc6a366..0948c8ae3a1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -368,18 +368,18 @@ dat += "
You ran out of food and starved." if(emagged) user.nutrition = 0 //yeah you pretty hongry - user << "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor." + to_chat(user, "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.") if(fuel <= 0) dat += "
You ran out of fuel, and drift, slowly, into a star." if(emagged) var/mob/living/M = user M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire - user << "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames." + to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") dat += "
" if(emagged) - user << "You're never going to make it to Orion..." + to_chat(user, "You're never going to make it to Orion...") user.death() emagged = 0 //removes the emagged status after you lose playing = 0 //also a new game @@ -447,21 +447,22 @@ switch(event) if(ORION_TRAIL_RAIDERS) if(prob(50)) - usr << "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?" + to_chat(usr, "You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?") M.hallucination += 30 else - usr << "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there..." + to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...") M.take_organ_damage(30) playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1) if(ORION_TRAIL_ILLNESS) var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS if(severity == 1) - M << "You suddenly feel slightly nauseous." //got off lucky + to_chat(M, "You suddenly feel slightly nauseous.")//got off lucky + if(severity == 2) - usr << "You suddenly feel extremely nauseous and hunch over until it passes." + to_chat(usr, "You suddenly feel extremely nauseous and hunch over until it passes.") M.Stun(3) if(severity >= 3) //you didn't pray hard enough - M << "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit." + to_chat(M, "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.") M.Stun(5) sleep(30) atom_say("[M] violently throws up!") @@ -477,7 +478,7 @@ M.take_organ_damage(25) playsound(src.loc, 'sound/weapons/Genhit.ogg', 100, 1) else - M << "A violent gale blows past you, and you barely manage to stay standing!" + to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!") if(ORION_TRAIL_COLLISION) //by far the most damaging event if(prob(90)) playsound(src.loc, 'sound/effects/bang.ogg', 100, 1) @@ -956,7 +957,7 @@ /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) - user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." + to_chat(user, "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.") name = "The Orion Trail: Realism Edition" desc = "Learn how our ancestors got to Orion, and try not to die in the process!" newgame() @@ -995,9 +996,9 @@ if(!(in_range(user, src))) return if(!active) - user << "There's a little switch on the bottom. It's flipped down." + to_chat(user, "There's a little switch on the bottom. It's flipped down.") else - user << "There's a little switch on the bottom. It's flipped up." + to_chat(user, "There's a little switch on the bottom. It's flipped up.") /obj/item/weapon/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse if(active) @@ -1006,7 +1007,7 @@ message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.") log_game("[key_name(usr)] primed an explosive Orion ship for detonation.") - user << "You flip the switch on the underside of [src]." + to_chat(user, "You flip the switch on the underside of [src].") active = 1 visible_message("[src] softly beeps and whirs to life!") playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index c80298283bc..b128b06bf49 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -54,6 +54,10 @@ /obj/item/weapon/circuitboard/med_data name = "Circuit board (Medical Records)" build_path = /obj/machinery/computer/med_data +/obj/item/weapon/circuitboard/pandemic + name = "circuit board (PanD.E.M.I.C. 2200)" + build_path = /obj/machinery/computer/pandemic + origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/scan_consolenew name = "Circuit board (DNA Machine)" build_path = /obj/machinery/computer/scan_consolenew @@ -243,12 +247,6 @@ build_path = /obj/machinery/computer/shuttle/white_ship -/obj/item/weapon/circuitboard/curefab - name = "Circuit board (Cure Fabricator)" - build_path = /obj/machinery/computer/curer -/obj/item/weapon/circuitboard/splicer - name = "Circuit board (Disease Splicer)" - build_path = /obj/machinery/computer/diseasesplicer /obj/item/weapon/circuitboard/HolodeckControl name = "Circuit board (Holodeck Control)" build_path = /obj/machinery/computer/HolodeckControl @@ -306,7 +304,7 @@ if("Cancel") return else - user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" + to_chat(user, "DERP! BUG! Report this (And what you were doing to cause it) to Agouri") return /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) @@ -338,9 +336,9 @@ build_path = /obj/machinery/computer/rdconsole/public id = 5 - user << "Access protocols set to [console_choice]." + to_chat(user, "Access protocols set to [console_choice].") else - user << "Access Denied" + to_chat(user, "Access Denied") return /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) @@ -349,46 +347,46 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") new /obj/item/stack/sheet/metal( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + to_chat(user, "\red This frame does not accept circuit boards of this type!") if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -396,7 +394,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -406,13 +404,13 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -424,19 +422,19 @@ if(do_after(user, 20, target = src)) if(P) P:use(2) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + to_chat(user, "\blue You connect the monitor.") var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -460,46 +458,46 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") new /obj/item/stack/sheet/mineral/bananium( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "honkcomputer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + to_chat(user, "\red This frame does not accept circuit boards of this type!") if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -507,7 +505,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -517,13 +515,13 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -535,19 +533,19 @@ if(do_after(user, 20, target = src)) if(P) P:use(2) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + to_chat(user, "\blue You connect the monitor.") var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 187e7d28f85..0311ac200fb 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -61,7 +61,7 @@ /obj/machinery/computer/security/emag_act(user as mob) if(!emagged) emagged = 1 - user << "\blue You have authorized full network access!" + to_chat(user, "\blue You have authorized full network access!") ui_interact(user) else ui_interact(user) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm new file mode 100644 index 00000000000..44fe97e0915 --- /dev/null +++ b/code/game/machinery/computer/camera_advanced.dm @@ -0,0 +1,161 @@ +/obj/machinery/computer/camera_advanced + name = "advanced camera console" + desc = "Used to access the various cameras on the station." + icon_screen = "cameras" + icon_keyboard = "security_key" + var/mob/camera/aiEye/remote/eyeobj + var/mob/living/carbon/human/current_user = null + var/list/networks = list("SS13") + var/datum/action/camera_off/off_action = new + var/datum/action/camera_jump/jump_action = new + +/obj/machinery/computer/camera_advanced/proc/CreateEye() + eyeobj = new() + eyeobj.origin = src + +/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/carbon/user) + off_action.target = user + off_action.Grant(user) + jump_action.target = user + jump_action.Grant(user) + +/obj/machinery/computer/camera_advanced/check_eye(mob/user) + if (get_dist(user, src) > 1 || user.eye_blind) + if(user == current_user) + off_action.Activate() + return 0 + return 1 + +/obj/machinery/computer/camera_advanced/attack_hand(mob/user) + if(..()) + return + if(!iscarbon(user)) + return + var/mob/living/carbon/L = user + + if(!current_user) + if(!eyeobj) + CreateEye() + GrantActions(user) + current_user = user + eyeobj.user = user + eyeobj.name = "Camera Eye ([user.name])" + L.remote_view = 1 + L.remote_control = eyeobj + L.client.perspective = EYE_PERSPECTIVE + if(!eyeobj.initialized) + for(var/obj/machinery/camera/C in cameranet.cameras) + if(!C.can_use()) + continue + if(C.network&networks) + eyeobj.setLoc(get_turf(C)) + break + eyeobj.initialized = 1 + else + eyeobj.setLoc(eyeobj.loc) + else + to_chat(user, "The console is already in use!") + +/mob/camera/aiEye/remote + name = "Inactive Camera Eye" + var/sprint = 10 + var/cooldown = 0 + var/acceleration = 1 + var/mob/living/carbon/human/user = null + var/obj/machinery/computer/camera_advanced/origin + var/initialized = 0 + var/visible_icon = 0 + var/image/user_image = null + +/mob/camera/aiEye/remote/GetViewerClient() + if(user) + return user.client + return null + +/mob/camera/aiEye/remote/setLoc(T) + if(user) + if(!isturf(user.loc)) + return + T = get_turf(T) + loc = T + cameranet.visibility(src) + if(user.client) + if(visible_icon) + user.client.images -= user_image + user_image = image(icon,loc,icon_state,FLY_LAYER) + user.client.images += user_image + user.client.eye = src + +/mob/camera/aiEye/remote/relaymove(mob/user,direct) + var/initial = initial(sprint) + var/max_sprint = 50 + + if(cooldown && cooldown < world.timeofday) // 3 seconds + sprint = initial + + for(var/i = 0; i < max(sprint, initial); i += 20) + var/turf/step = get_turf(get_step(src, direct)) + if(step) + src.setLoc(step) + + cooldown = world.timeofday + 5 + if(acceleration) + sprint = min(sprint + 0.5, max_sprint) + else + sprint = initial + +/datum/action/camera_off + name = "End Camera View" + action_type = AB_INNATE + button_icon_state = "camera_off" + +/datum/action/camera_off/Activate() + if(!target || !iscarbon(target)) + return + var/mob/living/carbon/C = target + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + C.remote_view = 0 + remote_eye.origin.current_user = null + remote_eye.origin.jump_action.Remove(C) + remote_eye.user = null + if(C.client) + C.client.perspective = MOB_PERSPECTIVE + C.client.eye = src + C.client.images -= remote_eye.user_image + for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks) + C.client.images -= chunk.obscured + C.remote_control = null + C.unset_machine() + src.Remove(C) + +/datum/action/camera_jump + name = "Jump To Camera" + action_type = AB_INNATE + button_icon_state = "camera_jump" + +/datum/action/camera_jump/Activate() + if(!target || !iscarbon(target)) + return + var/mob/living/carbon/C = target + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin + + var/list/L = list() + + for (var/obj/machinery/camera/cam in cameranet.cameras) + L.Add(cam) + + camera_sort(L) + + var/list/T = list() + + for (var/obj/machinery/camera/netcam in L) + var/list/tempnetwork = netcam.network&origin.networks + if (tempnetwork.len) + T[text("[][]", netcam.c_tag, (netcam.can_use() ? null : " (Deactivated)"))] = netcam + + + var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T + var/obj/machinery/camera/final = T[camera] + if(final) + remote_eye.setLoc(get_turf(final)) \ No newline at end of file diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 33442e8403e..7af28cc4f73 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -101,19 +101,19 @@ var/time_last_changed_position = 0 if(!usr || usr.stat || usr.lying) return if(scan) - usr << "You remove \the [scan] from \the [src]." + to_chat(usr, "You remove \the [scan] from \the [src].") scan.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(scan) scan = null else if(modify) - usr << "You remove \the [modify] from \the [src]." + to_chat(usr, "You remove \the [modify] from \the [src].") modify.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(modify) modify = null else - usr << "There is nothing to remove from the console." + to_chat(usr, "There is nothing to remove from the console.") return /obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user, params) @@ -322,7 +322,7 @@ var/time_last_changed_position = 0 jobdatum = J break if(!jobdatum) - usr << "\red No log exists for this job: [t1]" + to_chat(usr, "\red No log exists for this job: [t1]") return access = jobdatum.get_access() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 411673628cc..0818dccbe35 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -87,7 +87,7 @@ user.drop_item() W.loc = src src.diskette = W - user << "You insert [W]." + to_chat(user, "You insert [W].") nanomanager.update_uis(src) return else if(istype(W, /obj/item/device/multitool)) @@ -98,7 +98,7 @@ pods += P P.connected = src P.name = "[initial(P.name)] #[pods.len]" - user << "You connect [P] to [src]." + to_chat(user, "You connect [P] to [src].") else ..() return @@ -326,7 +326,8 @@ var/mob/selected = find_dead_player("[C.ckey]") if(!selected) return - selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable + selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable + var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod.growclone(C)) temp = "Initiating cloning cycle..." diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ea2dadda3b4..90b415c99bf 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -47,7 +47,7 @@ return 1 else if(message) - user << "Access denied." + to_chat(user, "Access denied.") return 0 /obj/machinery/computer/communications/Topic(href, href_list) @@ -55,12 +55,12 @@ return 1 if ((!(src.z in config.station_levels) && !(src.z in config.admin_levels))) - usr << "Unable to establish a connection: You're too far away from the station!" + to_chat(usr, "Unable to establish a connection: You're too far away from the station!") return 1 if(href_list["login"]) if(!ishuman(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") return var/mob/living/carbon/human/M = usr var/obj/item/card = M.get_active_hand() @@ -96,7 +96,7 @@ if("newalertlevel") if(isAI(usr) || isrobot(usr)) - usr << "Firewalls prevent you from changing the alert level." + to_chat(usr, "Firewalls prevent you from changing the alert level.") nanomanager.update_uis(src) return 1 tmp_alertlevel = text2num(href_list["level"]) @@ -124,16 +124,16 @@ feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 else - usr << "You are not authorized to do this." + to_chat(usr, "You are not authorized to do this.") tmp_alertlevel = 0 setMenuState(usr,COMM_SCREEN_MAIN) else - usr << "You need to swipe your ID." + to_chat(usr, "You need to swipe your ID.") if("announce") if(is_authenticated(usr) == 2) if(message_cooldown) - usr << "Please allow at least one minute to pass between announcements." + to_chat(usr, "Please allow at least one minute to pass between announcements.") nanomanager.update_uis(src) return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") @@ -158,7 +158,7 @@ if("cancelshuttle") if(isAI(usr) || isrobot(usr)) - usr << "Firewalls prevent you from recalling the shuttle." + to_chat(usr, "Firewalls prevent you from recalling the shuttle.") nanomanager.update_uis(src) return 1 var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") @@ -215,7 +215,7 @@ if("nukerequest") if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null @@ -223,7 +223,7 @@ nanomanager.update_uis(src) return Nuke_request(input, usr) - usr << "Request sent." + to_chat(usr, "Request sent.") log_say("[key_name(usr)] has requested the nuclear codes from Centcomm") priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') centcomm_message_cooldown = 1 @@ -234,7 +234,7 @@ if("MessageCentcomm") if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -242,7 +242,7 @@ nanomanager.update_uis(src) return Centcomm_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -253,7 +253,7 @@ if("MessageSyndicate") if((is_authenticated(usr) == 2) && (src.emagged)) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -261,7 +261,7 @@ nanomanager.update_uis(src) return Syndicate_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -269,7 +269,7 @@ setMenuState(usr,COMM_SCREEN_MAIN) if("RestoreBackup") - usr << "Backup routing data restored!" + to_chat(usr, "Backup routing data restored!") src.emagged = 0 setMenuState(usr,COMM_SCREEN_MAIN) @@ -279,7 +279,7 @@ /obj/machinery/computer/communications/emag_act(user as mob) if(!emagged) src.emagged = 1 - user << "You scramble the communication routing circuits!" + to_chat(user, "You scramble the communication routing circuits!") nanomanager.update_uis(src) /obj/machinery/computer/communications/attack_ai(var/mob/user as mob) @@ -293,7 +293,7 @@ return if (!(src.z in list(ZLEVEL_STATION, ZLEVEL_CENTCOMM))) - user << "Unable to establish a connection: You're too far away from the station!" + to_chat(user, "Unable to establish a connection: You're too far away from the station!") return ui_interact(user) @@ -397,19 +397,19 @@ /proc/call_shuttle_proc(var/mob/user, var/reason) if(sent_strike_team == 1) - user << "Central Command will not allow the shuttle to be called. Consider all contracts terminated." + to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return if(shuttle_master.emergencyNoEscape) - user << "The emergency shuttle may not be sent at this time. Please try again later." + to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") return if(shuttle_master.emergency.mode > SHUTTLE_ESCAPE) - user << "The emergency shuttle may not be called while returning to Central Command." + to_chat(user, "The emergency shuttle may not be called while returning to Central Command.") return if(ticker.mode.name == "blob") - user << "Under directive 7-10, [station_name()] is quarantined until further notice." + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") return shuttle_master.requestEvac(user, reason) @@ -422,19 +422,19 @@ // if force is 0, some things may stop the shuttle call if(!force) if(shuttle_master.emergencyNoEscape) - user << "Central Command does not currently have a shuttle available in your sector. Please try again later." + to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") return if(sent_strike_team == 1) - user << "Central Command will not allow the shuttle to be called. Consider all contracts terminated." + to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return if(world.time < 54000) // 30 minute grace period to let the game get going - user << "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again." + to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again.") return if(ticker.mode.name == "epidemic") - user << "Under directive 7-10, [station_name()] is quarantined until further notice." + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") return if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 09b2873019a..8524cd85754 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -120,12 +120,12 @@ for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") new /obj/item/weapon/shard(loc) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") A.state = 4 A.icon_state = "4" qdel(src) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 06e5d102fb2..8ccd36fc780 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -21,7 +21,7 @@ if(..()) return 1 if (!(src.z in config.station_levels)) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") return usr.set_machine(src) @@ -46,13 +46,13 @@ if("MessageHonkplanet") if(src.authenticated==1) if(message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please choose a message to transmit to your HONKbrothers on the homeworld. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return HONK_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") log_say("[key_name(usr)] has made a HONKplanet announcement: [input]") message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -63,20 +63,20 @@ /obj/machinery/computer/HONKputer/emag_act(user as mob) if(!emagged) src.emagged = 1 - user << "You scramble the login circuits, allowing anyone to use the console!" + to_chat(user, "You scramble the login circuits, allowing anyone to use the console!") /obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob) if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") return user.set_machine(src) var/dat = "
\nBack
", src, src) if(5.0) dat += "
[Dis.name]" - */ - for (var/ID in virusDB) - var/datum/data/record/v = virusDB[ID] - dat += "
[v.fields["name"]]" - dat += "
Back" if(6.0) dat += "
Medical Robots:" var/bdat = null - for(var/obj/machinery/bot/medbot/M in world) + for(var/mob/living/simple_animal/bot/medbot/M in world) if(M.z != src.z) continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) @@ -206,12 +200,20 @@ src.active2 = null if(href_list["vir"]) - var/datum/data/record/v = locate(href_list["vir"]) - src.temp = "
Name: [v.fields["name"]]" - src.temp += "
Antigen: [v.fields["antigen"]]" - src.temp += "
Spread: [v.fields["spread type"]] " - src.temp += "
Details:
[v.fields["description"]]" + var/type = href_list["vir"] + var/datum/disease/Dis = new type(0) + var/AfS = "" + for(var/mob/M in Dis.viable_mobtypes) + AfS += " [initial(M.name)];" + src.temp = {"Name: [Dis.name] +
Number of stages: [Dis.max_stages] +
Spread: [Dis.spread_text] Transmission +
Possible Cure: [(Dis.cure_text||"none")] +
Affected Lifeforms:[AfS] +
+
Notes: [Dis.desc] +
+
Severity: [Dis.severity]"} if (href_list["del_all"]) src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 75c9974bfbb..a56fe597b13 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -45,7 +45,7 @@ return if(isscrewdriver(O) && emag) //Stops people from just unscrewing the monitor and putting it back to get the console working again. - user << "It is too hot to mess with!" + to_chat(user, "It is too hot to mess with!") return ..() @@ -72,7 +72,7 @@ update_icon() message = rebootmsg else - user << "A no server error appears on the screen." + to_chat(user, "A no server error appears on the screen.") /obj/machinery/computer/message_monitor/update_icon() if(emag || hacking) @@ -296,10 +296,10 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) if(isnull(linkedServer)) - user << "Could not complete brute-force: Linked Server Disconnected!" + to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") else var/currentKey = src.linkedServer.decryptkey - user << "Brute-force completed! The key is '[currentKey]'." + to_chat(user, "Brute-force completed! The key is '[currentKey]'.") src.hacking = 0 src.icon_screen = normal_icon src.screen = 0 // Return the screen back to normal @@ -518,7 +518,7 @@ if(auth) src.screen = 4 - //usr << href_list["select"] +// to_chat(usr, href_list["select"]) if (href_list["back"]) src.screen = 0 diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 72e9848e634..38e6c139f2e 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -276,7 +276,7 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "Access Denied" + to_chat(user, "Access Denied") return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index d9c8578c853..7ae15a086f2 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -91,7 +91,8 @@ usr.drop_item() I.loc = src inserted_id = I - else usr << "\red No valid ID." + else + to_chat(usr, "\red No valid ID.") if("1") inserted_id.loc = get_step(src,get_turf(usr)) inserted_id = null @@ -117,7 +118,7 @@ if(src.allowed(usr)) screen = !screen else - usr << "Unauthorized access." + to_chat(usr, "Unauthorized access.") else if(href_list["warn"]) var/warning = sanitize(copytext(input(usr,"Message:","Enter your message here!",""),1,MAX_MESSAGE_LEN)) @@ -125,7 +126,7 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "You hear a voice in your head saying: '[warning]'" + to_chat(R, "You hear a voice in your head saying: '[warning]'") src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e5b8956ad93..ccdd9b3f276 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -25,7 +25,7 @@ ui_interact(user) else if(mode.kickoff) - user << "You have been locked out from this console!" + to_chat(user, "You have been locked out from this console!") /obj/machinery/computer/robotics/proc/is_authenticated(var/mob/user as mob) @@ -59,7 +59,7 @@ var/mob/user = usr if(!is_authenticated(user)) - user << "Access denied." + to_chat(user, "Access denied.") return // Destroys the cyborg @@ -68,11 +68,11 @@ if(!target || !istype(target)) return if(isAI(user) && (target.connected_ai != user)) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") return // Cyborgs may blow up themselves via the console if(isrobot(user) && user != target) - user << "Access Denied." + to_chat(user, "Access Denied.") return var/choice = input("Really detonate [target.name]?") in list ("Yes", "No") if(choice != "Yes") @@ -82,14 +82,14 @@ // Antagonistic cyborgs? Left here for downstream if(target.mind && target.mind.special_role && target.emagged) - target << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered." + to_chat(target, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") target.ResetSecurityCodes() else message_admins("[key_name_admin(usr)] detonated [key_name_admin(target)] (JMP)!") log_game("\[key_name(usr)] detonated [key_name(target)]!") - target << "Self-destruct command received." + to_chat(target, "Self-destruct command received.") if(target.connected_ai) - target.connected_ai << "
ALERT - Cyborg detonation detected: [target.name]
" + to_chat(target.connected_ai, "
ALERT - Cyborg detonation detected: [target.name]
") spawn(10) target.self_destruct() @@ -100,11 +100,11 @@ return if(isAI(user) && (target.connected_ai != user)) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") return if(isrobot(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") return var/choice = input("Really [target.lockcharge ? "unlock" : "lockdown"] [target.name] ?") in list ("Yes", "No") @@ -118,9 +118,9 @@ log_game("[key_name(usr)] [target.canmove ? "locked down" : "released"] [key_name(target)]!") target.canmove = !target.canmove target.lockcharge = !target.lockcharge - target << "[!target.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + to_chat(target, "[!target.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") if(target.connected_ai) - target.connected_ai << "[!target.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [target.name]
" + to_chat(target.connected_ai, "[!target.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [target.name]
") // Remotely hacks the cyborg. Only antag AIs can do this and only to linked cyborgs. else if (href_list["hack"]) @@ -130,15 +130,15 @@ // Antag AI checks if(!istype(user, /mob/living/silicon/ai) || !(user.mind.special_role && user.mind.original == user)) - user << "Access Denied." + to_chat(user, "Access Denied.") return if(target.connected_ai != user) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") return if(target.emagged) - user << "Robot is already hacked." + to_chat(user, "Robot is already hacked.") return var/choice = input("Really hack [target.name]? This cannot be undone.") in list("Yes", "No") @@ -151,24 +151,24 @@ message_admins("\blue [key_name_admin(usr)] emagged [key_name_admin(target)] using robotic console!") log_game("[key_name(usr)] emagged [key_name(target)] using robotic console!") target.emagged = 1 - target << "Failsafe protocols overriden. New tools available." + to_chat(target, "Failsafe protocols overriden. New tools available.") // Arms the emergency self-destruct system else if(href_list["arm"]) if(istype(user, /mob/living/silicon)) - user << "Access Denied." + to_chat(user, "Access Denied.") return safety = !safety - user << "You [safety ? "disarm" : "arm"] the emergency self destruct." + to_chat(user, "You [safety ? "disarm" : "arm"] the emergency self destruct.") // Destroys all accessible cyborgs if safety is disabled else if(href_list["nuke"]) if(istype(user, /mob/living/silicon)) - user << "Access Denied" + to_chat(user, "Access Denied") return if(safety) - user << "Self-destruct aborted - safety active" + to_chat(user, "Self-destruct aborted - safety active") return message_admins("[key_name_admin(usr)] detonated all cyborgs!") @@ -180,9 +180,9 @@ // Ignore antagonistic cyborgs if(R.scrambledcodes) continue - R << "Self-destruct command received." + to_chat(R, "Self-destruct command received.") if(R.connected_ai) - R.connected_ai << "
ALERT - Cyborg detonation detected: [R.name]
" + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") spawn(10) R.self_destruct() diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index adeddde427b..c0693c810d3 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -46,7 +46,7 @@ /obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") return user.set_machine(src) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 06ea4dd8702..2a074a9880b 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -31,7 +31,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") ..() /obj/machinery/computer/secure_data/attack_ai(mob/user as mob) @@ -42,7 +42,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") return var/dat diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 5ddc91bfa72..d2f44de6011 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -30,7 +30,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") ..() /obj/machinery/computer/skills/attack_ai(mob/user as mob) @@ -41,7 +41,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") return var/dat @@ -221,7 +221,7 @@ What a mess.*/ return Perp = new/list() t1 = lowertext(t1) - var/list/components = text2list(t1, " ") + var/list/components = splittext(t1, " ") if(components.len > 5) return //Lets not let them search too greedily. for(var/datum/data/record/R in data_core.general) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 3f8692e3697..d74e27bc702 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -89,7 +89,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived at Central Command. Operation has ended!" + to_chat(M, "\red You have arrived at Central Command. Operation has ended!") specops_shuttle_at_station = 0 @@ -137,7 +137,7 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") return //Begin Marauder launchpad. @@ -231,7 +231,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -247,23 +247,23 @@ var/specops_shuttle_timeleft = 0 return 1 /obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") return 1 /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") else return attack_hand(user) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") return //Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle. // if (sent_strike_team == 0 && send_emergency_team == 0) -// usr << "\red The strike team has not yet deployed." +// to_chat(usr, "\red The strike team has not yet deployed.") // return if(..()) @@ -294,14 +294,14 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\blue Central Command will not allow the Special Operations shuttle to return yet." + to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return yet.") if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) - usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" - usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" + to_chat(usr, "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!") + to_chat(usr, "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!") return - usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.") temp += "Shuttle departing.
OK" updateUsrDialog() @@ -315,10 +315,10 @@ var/specops_shuttle_timeleft = 0 if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") temp += "Shuttle departing.
OK" updateUsrDialog() diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 001578d1fcd..c8ae8741288 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -140,8 +140,8 @@ td.cost.toomuch { updateUsrDialog() return if(!centcomm_store.PlaceOrder(usr,itemID)) - usr << "\red Unable to charge your account." + to_chat(usr, "\red Unable to charge your account.") else - usr << "\blue You've successfully purchased the item. It should be in your hands or on the floor." + to_chat(usr, "\blue You've successfully purchased the item. It should be in your hands or on the floor.") src.updateUsrDialog() return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 76d7bf83a6a..16de635b0e7 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -60,7 +60,7 @@ var/syndicate_elite_shuttle_timeleft = 0 if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!syndicate_elite_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") return sleep(600) @@ -172,7 +172,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -182,22 +182,22 @@ var/syndicate_elite_shuttle_timeleft = 0 return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") return 1 /obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") else return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") return // if (sent_syndicate_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// to_chat(usr, "\red The strike team has not yet deployed.") // return if(..()) @@ -227,17 +227,17 @@ var/syndicate_elite_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return - usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return." + to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.") return else if (href_list["sendtostation"]) if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!specops_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") return - usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") temp = "Shuttle departing.
OK" updateUsrDialog() diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index d154a09b02e..cc5934d9808 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -34,7 +34,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(istype(O, /obj/item)) if(uplinkholder) - user << "The [src] already has an uplink in it." + to_chat(user, "The [src] already has an uplink in it.") return if(O.hidden_uplink) @@ -46,7 +46,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F update_icon() updateUsrDialog() else - user << "The [O] doesn't appear to be an uplink..." + to_chat(user, "The [O] doesn't appear to be an uplink...") diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 62b090ba1db..72493bfba6f 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -59,7 +59,7 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) - user << "This part is faulty, you cannot add this to the machine!" + to_chat(user, "This part is faulty, you cannot add this to the machine!") return switch(state) if(1) @@ -67,23 +67,23 @@ var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to add cables to the frame." + to_chat(user, "You start to add cables to the frame.") if(do_after(user, 20, target = src)) if(C.amount >= 5 && state == 1) C.use(5) - user << "You add cables to the frame." + to_chat(user, "You add cables to the frame.") state = 2 icon_state = "box_1" else - user << "You need five length of cable to wire the frame." + to_chat(user, "You need five length of cable to wire the frame.") return else if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P if(G.amount<5) - user << "\red You do not have enough glass to build a display case." + to_chat(user, "\red You do not have enough glass to build a display case.") return G.use(5) - user << "\blue You add the glass to the frame." + to_chat(user, "\blue You add the glass to the frame.") playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/displaycase_frame(src.loc) qdel(src) @@ -91,7 +91,7 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You dismantle the frame." + to_chat(user, "You dismantle the frame.") new /obj/item/stack/sheet/metal(src.loc, 5) qdel(src) if(2) @@ -99,7 +99,7 @@ var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You add the circuit board to the frame." + to_chat(user, "You add the circuit board to the frame.") circuit = P user.drop_item() P.loc = src @@ -110,10 +110,10 @@ update_namelist() update_req_desc() else - user << "This frame does not accept circuit boards of this type!" + to_chat(user, "This frame does not accept circuit boards of this type!") if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You remove the cables." + to_chat(user, "You remove the cables.") state = 1 icon_state = "box_0" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(src.loc,5) @@ -126,9 +126,9 @@ circuit.loc = src.loc circuit = null if(components.len == 0) - user << "You remove the circuit board." + to_chat(user, "You remove the circuit board.") else - user << "You remove the circuit board and other components." + to_chat(user, "You remove the circuit board and other components.") for(var/obj/item/I in components) I.loc = src.loc desc = initial(desc) @@ -177,7 +177,7 @@ for(var/obj/item/weapon/stock_parts/part in added_components) components += part - user << "[part.name] applied." + to_chat(user, "[part.name] applied.") replacer.play_rped_sound() update_req_desc() @@ -207,7 +207,7 @@ update_req_desc() return 1 if(!success) - user << "You cannot add that to the machine!" + to_chat(user, "You cannot add that to the machine!") return 0 //Machine Frame Circuit Boards @@ -245,7 +245,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user) build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" - user << "You set the board to [names_paths[build_path]]." + to_chat(user, "You set the board to [names_paths[build_path]].") req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) /obj/item/weapon/circuitboard/smes @@ -304,11 +304,11 @@ to destroy them and players will be able to make replacements. if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater name = "circuit board (Heater)" - user << "You set the board to heating." + to_chat(user, "You set the board to heating.") else build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer name = "circuit board (Freezer)" - user << "You set the board to cooling." + to_chat(user, "You set the board to cooling.") /obj/item/weapon/circuitboard/biogenerator name = "circuit board (Biogenerator)" @@ -878,4 +878,50 @@ obj/item/weapon/circuitboard/rdserver req_components = list( /obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/console_screen = 1) \ No newline at end of file + /obj/item/weapon/stock_parts/console_screen = 1) + + +//Selectable mode board, like vending machine boards +/obj/item/weapon/circuitboard/logic_gate + name = "circuit board (Logic Connector)" + build_path = /obj/machinery/logic_gate + board_type = "machine" + origin_tech = "programming=1" //This stuff is pretty much the absolute basis of programming, so it's mostly useless for research + req_components = list(/obj/item/stack/cable_coil = 1) + + var/list/names_paths = list( + "NOT Gate" = /obj/machinery/logic_gate/not, + "OR Gate" = /obj/machinery/logic_gate/or, + "AND Gate" = /obj/machinery/logic_gate/and, + "NAND Gate" = /obj/machinery/logic_gate/nand, + "NOR Gate" = /obj/machinery/logic_gate/nor, + "XOR Gate" = /obj/machinery/logic_gate/xor, + "XNOR Gate" = /obj/machinery/logic_gate/xnor, + "STATUS Gate" = /obj/machinery/logic_gate/status, + "CONVERT Gate" = /obj/machinery/logic_gate/convert + ) + +/obj/item/weapon/circuitboard/logic_gate/New() + ..() + if(build_path == /obj/machinery/logic_gate) //If we spawn the base type board (determined by the base type machine as the build path), become a random gate board + var/new_path = names_paths[pick(names_paths)] + set_type(new_path) + +/obj/item/weapon/circuitboard/logic_gate/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weapon/screwdriver)) + set_type(null, user) + +/obj/item/weapon/circuitboard/logic_gate/proc/set_type(typepath, mob/user) + var/new_name = "Logic Base" + if(!typepath) + new_name = input("Circuit Setting", "What would you change the board setting to?") in names_paths + typepath = names_paths[new_name] + else + for(var/name in names_paths) + if(names_paths[name] == typepath) + new_name = name + break + build_path = typepath + name = "circuit board ([new_name])" + if(user) + to_chat(user, "You set the board to [new_name].") diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 705f997a3eb..6a1f0721253 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -97,17 +97,17 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The cryo cell is already occupied!" + to_chat(user, "\blue The cryo cell is already occupied!") return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "\red Subject cannot have abiotic items on." + to_chat(user, "\red Subject cannot have abiotic items on.") return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the cryo cell because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the cryo cell because they have a slime latched onto their head.") return if(put_mob(L)) if(L == user) @@ -161,7 +161,7 @@ return if(panel_open) - usr << "\blue Close the maintenance panel first." + to_chat(usr, "\blue Close the maintenance panel first.") return ui_interact(user) @@ -273,10 +273,10 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + to_chat(user, "\red A beaker is already loaded into the machine.") return if(!user.drop_item()) - user << "The [G] is stuck to you!" + to_chat(user, "The [G] is stuck to you!") return G.forceMove(src) beaker = G @@ -285,7 +285,7 @@ if (istype(G, /obj/item/weapon/screwdriver)) if(occupant || on) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") return default_deconstruction_screwdriver(user, "pod0-o", "pod0", G) return @@ -297,13 +297,13 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) - user << "\blue Close the maintenance panel first." + to_chat(user, "\blue Close the maintenance panel first.") return if(!ismob(G:affecting)) return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head." + to_chat(usr, "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head.") return var/mob/M = G:affecting if(put_mob(M)) @@ -424,16 +424,16 @@ return /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (!istype(M)) - usr << "\red The cryo cell cannot handle such a lifeform!" + to_chat(usr, "\red The cryo cell cannot handle such a lifeform!") return if (occupant) - usr << "\red The cryo cell is already occupied!" + to_chat(usr, "\red The cryo cell is already occupied!") return if (M.abiotic()) - usr << "\red Subject may not have abiotic items on." + to_chat(usr, "\red Subject may not have abiotic items on.") return if(!node) - usr << "\red The cell is not correctly connected to its pipe network!" + to_chat(usr, "\red The cell is not correctly connected to its pipe network!") return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -441,7 +441,7 @@ M.stop_pulling() M.forceMove(src) if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." + to_chat(M, "\blue You feel a cold liquid surround you. Your skin starts to freeze up.") occupant = M // M.metabslow = 1 add_fingerprint(usr) @@ -456,7 +456,7 @@ if(usr == occupant)//If the user is inside the tube... if (usr.stat == 2)//and he's not dead.... return - usr << "\blue Release sequence activated. This will take two minutes." + to_chat(usr, "\blue Release sequence activated. This will take two minutes.") sleep(600) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return @@ -474,7 +474,7 @@ set src in oview(1) for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") return if (usr.stat != 0 || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 18e028c2ff8..8de2f1baf60 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -94,12 +94,12 @@ else if(href_list["item"]) if(!allowed(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") return if(!allow_items) return if(frozen_items.len == 0) - user << "There is nothing to recover from storage." + to_chat(user, "There is nothing to recover from storage.") return var/obj/item/I = input(usr, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items @@ -107,7 +107,7 @@ return if(!(I in frozen_items)) - user << "\The [I] is no longer in storage." + to_chat(user, "\The [I] is no longer in storage.") return visible_message("The console beeps happily as it disgorges \the [I].") @@ -117,12 +117,12 @@ else if(href_list["allitems"]) if(!allowed(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") return if(!allow_items) return if(frozen_items.len == 0) - user << "There is nothing to recover from storage." + to_chat(user, "There is nothing to recover from storage.") return visible_message("The console beeps happily as it disgorges the desired objects.") @@ -363,7 +363,7 @@ else if(O.target && istype(O.target,/datum/mind)) if(O.target == occupant.mind) if(O.owner && O.owner.current) - O.owner.current << "You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]..." + to_chat(O.owner.current, "You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]...") O.target = null spawn(1) //This should ideally fire after the occupant is deleted. if(!O) return @@ -435,7 +435,7 @@ if(istype(G, /obj/item/weapon/grab)) if(occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") return if(!ismob(G:affecting)) @@ -448,7 +448,7 @@ var/mob/living/M = G:affecting if(!istype(M) || M.stat == DEAD) - user << "Dead people can not be put into cryo." + to_chat(user, "Dead people can not be put into cryo.") return if(M.client) @@ -466,7 +466,7 @@ if(!M || !G || !G:affecting) return if(src.occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") return M.loc = src @@ -476,7 +476,7 @@ M.client.eye = src else //because why the fuck would you keep going if the mob isn't in the pod - user << "You stop putting [M] into the cryopod." + to_chat(user, "You stop putting [M] into the cryopod.") return if(orient_right) @@ -484,8 +484,8 @@ else icon_state = occupied_icon_state - M << "[on_enter_occupant_message]" - M << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(M, "[on_enter_occupant_message]") + to_chat(M, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") occupant = M time_entered = world.time @@ -495,7 +495,7 @@ for(var/mob/dead/observer/Gh in respawnable_list) //this may not be foolproof but it seemed like a better option than 'in world' if(Gh.key == FT) if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever - Gh << "Warning: Your body has entered cryostorage." + to_chat(Gh, "Warning: Your body has entered cryostorage.") // Book keeping! log_admin("[key_name(M)] has entered a stasis pod.") @@ -524,7 +524,7 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The cryo pod is already occupied!" + to_chat(user, "\blue The cryo pod is already occupied!") return @@ -533,12 +533,12 @@ return if(L.stat == DEAD) - user << "Dead people can not be put into cryo." + to_chat(user, "Dead people can not be put into cryo.") return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the cryo pod because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the cryo pod because they have a slime latched onto their head.") return @@ -561,7 +561,7 @@ if(!L) return if(src.occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") return L.loc = src @@ -569,7 +569,7 @@ L.client.perspective = EYE_PERSPECTIVE L.client.eye = src else - user << "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]" + to_chat(user, "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]") return if(orient_right) @@ -577,8 +577,8 @@ else icon_state = occupied_icon_state - L << "[on_enter_occupant_message]" - L << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(L, "[on_enter_occupant_message]") + to_chat(L, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") occupant = L time_entered = world.time @@ -587,7 +587,7 @@ for(var/mob/dead/observer/Gh in respawnable_list) //this may not be foolproof but it seemed like a better option than 'in world' if(Gh.key == FT) if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever - Gh << "Warning: Your body has entered cryostorage." + to_chat(Gh, "Warning: Your body has entered cryostorage.") // Book keeping! log_admin("[key_name_admin(L)] has entered a stasis pod. (JMP)") @@ -607,7 +607,7 @@ return if(usr != occupant) - usr << "The cryopod is in use and locked!" + to_chat(usr, "The cryopod is in use and locked!") return if(orient_right) @@ -638,12 +638,12 @@ return if(src.occupant) - usr << "\The [src] is in use." + to_chat(usr, "\The [src] is in use.") return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") return visible_message("[usr] starts climbing into \the [src].") @@ -654,7 +654,7 @@ return if(src.occupant) - usr << "\The [src] is in use." + to_chat(usr, "\The [src] is in use.") return usr.stop_pulling() @@ -668,8 +668,8 @@ else icon_state = occupied_icon_state - usr << "[on_enter_occupant_message]" - usr << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(usr, "[on_enter_occupant_message]") + to_chat(usr, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") occupant = usr time_entered = world.time diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a9128ff930e..df7d3319c06 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -180,10 +180,10 @@ for reference: src.anchored = !src.anchored src.icon_state = "barrier[src.locked]" if ((src.locked == 1.0) && (src.emagged < 2.0)) - user << "Barrier lock toggled on." + to_chat(user, "Barrier lock toggled on.") return else if ((src.locked == 0.0) && (src.emagged < 2.0)) - user << "Barrier lock toggled off." + to_chat(user, "Barrier lock toggled off.") return else var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -220,14 +220,14 @@ for reference: if (!emagged) emagged = 1 req_access = null - user << "You break the ID authentication lock on the [src]." + to_chat(user, "You break the ID authentication lock on the [src].") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() visible_message("\red BZZzZZzZZzZT") else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on the [src]." + to_chat(user, "You short out the anchoring mechanism on the [src].") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 304e38118db..8c419216d07 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -35,7 +35,7 @@ if(wires & 2) return src.attack_hand(user) else - user << "Error, no route to host." + to_chat(user, "Error, no route to host.") /obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) /* For later implementation @@ -69,7 +69,7 @@ return if(!allowed(user) && (wires & 1)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") flick("doorctrl-denied",src) return @@ -131,74 +131,3 @@ icon_state = "doorctrl-p" else icon_state = "doorctrl0" - -/obj/machinery/driver_button/var/range = 7 - -/obj/machinery/driver_button/attack_ai(mob/user as mob) - return src.attack_hand(user) - -/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params) - - if(istype(W, /obj/item/device/detective_scanner)) - return - - if(istype(W, /obj/item/device/multitool)) - update_multitool_menu(user) - return 1 - - if(istype(W, /obj/item/weapon/wrench)) - playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - if(do_after(user, 30, target = src)) - user << "You detach \the [src] from the wall." - new/obj/item/mounted/frame/driver_button(get_turf(src)) - qdel(src) - return 1 - - return src.attack_hand(user) - -/obj/machinery/driver_button/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) - return {" -
-
-
- [format_tag("ID Tag","id_tag")] -
Activity log of guest pass terminal #[uid]
" for (var/entry in internal_log) dat += "[entry]
" - //usr << "Printing the log, standby..." +// to_chat(usr, "Printing the log, standby...") //sleep(50) var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) @@ -176,6 +176,6 @@ pass.reason = reason pass.name = "guest pass #[number]" else - usr << "\red Cannot issue pass without issuing ID." + to_chat(usr, "\red Cannot issue pass without issuing ID.") updateUsrDialog() return \ No newline at end of file diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 520f2ff4fb7..c8e16257858 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -72,13 +72,13 @@ var/const/HOLOPAD_MODE = 0 if(alert(user,"Would you like to request an AI's presence?",,"Yes","No") == "Yes") if(last_request + 200 < world.time) //don't spam the AI with requests you jerk! last_request = world.time - user << "You request an AI's presence." + to_chat(user, "You request an AI's presence.") var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in living_mob_list) if(!AI.client) continue - AI << "Your presence is requested at \the [area]." + to_chat(AI, "Your presence is requested at \the [area].") else - user << "A request for AI presence was already sent recently." + to_chat(user, "A request for AI presence was already sent recently.") /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) @@ -100,9 +100,9 @@ var/const/HOLOPAD_MODE = 0 create_holo(user)//Create one. src.visible_message("A holographic image of [user] flicks to life right before your eyes!") else - user << "\red ERROR: \black Image feed in progress." + to_chat(user, "\red ERROR: \black Image feed in progress.") else - user << "\red ERROR: \black Unable to project hologram." + to_chat(user, "\red ERROR: \black Unable to project hologram.") return /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. @@ -252,7 +252,7 @@ Holographic project of everything else. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. hologram.icon = flat_icon - world << "Your icon should appear now." + to_chat(world, "Your icon should appear now.") return */ diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 25989db9e0f..d6e41d29fa2 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -114,39 +114,3 @@ return spark() ..(severity) - -/obj/machinery/ignition_switch/attack_ai(mob/user as mob) - return src.attack_hand(user) - -/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob, params) - return src.attack_hand(user) - -/obj/machinery/ignition_switch/attack_hand(mob/user as mob) - - if(stat & (NOPOWER|BROKEN)) - return - if(active) - return - - use_power(5) - - active = 1 - icon_state = "launcheract" - - for(var/obj/machinery/sparker/M in world) - if (M.id == src.id) - spawn( 0 ) - M.spark() - - for(var/obj/machinery/igniter/M in world) - if(M.id == src.id) - use_power(50) - M.on = !( M.on ) - M.icon_state = text("igniter[]", M.on) - - sleep(50) - - icon_state = "launcherbtt" - active = 0 - - return \ No newline at end of file diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index e3bb3d32eaa..5caff96d4ea 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -60,17 +60,17 @@ /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(src.beaker)) - user << "There is already a reagent container loaded!" + to_chat(user, "There is already a reagent container loaded!") return if(user.drop_item()) W.forceMove(src) src.beaker = W - user << "You attach \the [W] to \the [src]." + to_chat(user, "You attach \the [W] to \the [src].") src.update_icon() return else - user << "\The [W] is stuck to you!" + to_chat(user, "\The [W] is stuck to you!") else return ..() @@ -146,27 +146,27 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "\red You can't do that." + to_chat(usr, "\red You can't do that.") return if(usr.stat) return mode = !mode - usr << "The IV drip is now [mode ? "injecting" : "taking blood"]." + to_chat(usr, "The IV drip is now [mode ? "injecting" : "taking blood"].") /obj/machinery/iv_drip/examine(mob/user) ..(user) if (!(user in view(2)) && usr != src.loc) return - usr << "The IV drip is [mode ? "injecting" : "taking blood"]." + to_chat(usr, "The IV drip is [mode ? "injecting" : "taking blood"].") if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) - user << "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + to_chat(user, "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - user << "\blue Attached is an empty [beaker]." + to_chat(user, "\blue Attached is an empty [beaker].") else - user << "\blue No chemicals are attached." + to_chat(user, "\blue No chemicals are attached.") - user << "\blue [attached ? attached : "No one"] is attached." + to_chat(user, "\blue [attached ? attached : "No one"] is attached.") diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index cb658ff937d..4c271a08f44 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -63,11 +63,11 @@ return if(operating) - user << "The gibber is locked and running, wait for it to finish." + to_chat(user, "The gibber is locked and running, wait for it to finish.") return if(locked) - user << "Wait for [occupant.name] to finish being loaded!" + to_chat(user, "Wait for [occupant.name] to finish being loaded!") return else @@ -77,7 +77,7 @@ if(istype(P, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = P if(G.state < 2) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") return move_into_gibber(user,G.affecting) qdel(G) @@ -110,19 +110,19 @@ /obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim) if(occupant) - user << "The gibber is full, empty it first!" + to_chat(user, "The gibber is full, empty it first!") return if(operating) - user << "The gibber is locked and running, wait for it to finish." + to_chat(user, "The gibber is locked and running, wait for it to finish.") return if(!ishuman(victim) || issmall(victim)) - user << "This is not suitable for the gibber!" + to_chat(user, "This is not suitable for the gibber!") return if(victim.abiotic(1)) - user << "Subject may not have abiotic items on." + to_chat(user, "Subject may not have abiotic items on.") return user.visible_message("[user] starts to put [victim] into the gibber!") @@ -245,9 +245,12 @@ new_meat.name = "[slab_name] [new_meat.name]" new_meat.reagents.add_reagent("nutriment",slab_nutrition) + if(occupant.reagents) occupant.reagents.trans_to(new_meat, round(occupant.reagents.total_volume/slab_count,1)) + if(occupant.get_species() == "Human") + new /obj/item/stack/sheet/animalhide/human(src) new /obj/effect/decal/cleanable/blood/gibs(src) if(!UserOverride) diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm index d88d3a1dc9e..a5e1cc1eafb 100644 --- a/code/game/machinery/kitchen/icecream_vat.dm +++ b/code/game/machinery/kitchen/icecream_vat.dm @@ -107,20 +107,20 @@ var/list/ingredients_source = list( if(I.reagents.total_volume < 10) I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) else - user << "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients." + to_chat(user, "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients.") else - user << "There is not enough icecream left! Insert more milk and ice." + to_chat(user, "There is not enough icecream left! Insert more milk and ice.") else - user << "[O] already has icecream in it." + to_chat(user, "[O] already has icecream in it.") else if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(held_container) - user << "You must remove [held_container] from [src] first." + to_chat(user, "You must remove [held_container] from [src] first.") else if(!user.drop_item()) - user << "\The [O] is stuck to your hand!" + to_chat(user, "\The [O] is stuck to your hand!") return O.forceMove(src) - user << "You insert [O] into [src]." + to_chat(user, "You insert [O] into [src].") held_container = O else var/obj/item/weapon/reagent_containers/R = O @@ -151,7 +151,7 @@ var/list/ingredients_source = list( ingredients[CONE_WAFFLE] += amount src.visible_message("[user] cooks up some waffle cones.") else - user << "You require sugar and flour to make waffle cones." + to_chat(user, "You require sugar and flour to make waffle cones.") if(CONE_CHOC) if(ingredients[FLAVOUR_CHOCOLATE] > 0 && ingredients[CONE_WAFFLE] > 0) var/amount = min(ingredients[CONE_WAFFLE], ingredients[FLAVOUR_CHOCOLATE]) @@ -160,7 +160,7 @@ var/list/ingredients_source = list( ingredients[CONE_CHOC] += amount src.visible_message("[user] cooks up some chocolate cones.") else - user << "You require waffle cones and chocolate flavouring to make chocolate cones." + to_chat(user, "You require waffle cones and chocolate flavouring to make chocolate cones.") if(ICECREAM_VANILLA) if(ingredients[INGR_ICE] > 0 && ingredients[INGR_MILK] > 0) var/amount = min(ingredients[INGR_ICE], ingredients[INGR_MILK]) @@ -169,7 +169,7 @@ var/list/ingredients_source = list( ingredients[ICECREAM_VANILLA] += amount src.visible_message("[user] whips up some vanilla icecream.") else - user << "You require milk and ice to make vanilla icecream." + to_chat(user, "You require milk and ice to make vanilla icecream.") updateDialog() /obj/machinery/icecream_vat/Topic(href, href_list) @@ -191,7 +191,7 @@ var/list/ingredients_source = list( I.desc = "Delicious [cone_name] cone, but no ice cream." src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") else - usr << "There are no [cone_name] cones left!" + to_chat(usr, "There are no [cone_name] cones left!") updateDialog() if(href_list["make"]) diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index e1f7bd7c091..7b25e683941 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -42,7 +42,7 @@ return 1 else if(!user.unEquip(O)) - user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") return 0 O.forceMove(src) beaker = O @@ -51,10 +51,10 @@ src.updateUsrDialog() return 0 if (!is_type_in_list(O, allowed_items)) - user << "It doesn't look like that contains any juice." + to_chat(user, "It doesn't look like that contains any juice.") return 1 if(!user.unEquip(O)) - user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") return 0 O.forceMove(src) src.updateUsrDialog() diff --git a/code/game/machinery/kitchen/kitchen_machine.dm b/code/game/machinery/kitchen/kitchen_machine.dm index 72d8bd22576..5c584d0468b 100644 --- a/code/game/machinery/kitchen/kitchen_machine.dm +++ b/code/game/machinery/kitchen/kitchen_machine.dm @@ -68,11 +68,11 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << "\The [src] can now be moved." + to_chat(user, "\The [src] can now be moved.") return else if(!anchored) anchored = 1 - user << "\The [src] is now secured." + to_chat(user, "\The [src] is now secured.") return default_deconstruction_crowbar(O) @@ -104,7 +104,7 @@ src.dirty = 0 // just to be sure src.flags = OPENCONTAINER else - user << "It's broken!" + to_chat(user, "It's broken!") return 1 else if(src.dirty==100) // The machine is all dirty so can't be used! if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them @@ -122,11 +122,11 @@ src.icon_state = off_icon src.flags = OPENCONTAINER else //Otherwise bad luck!! - user << "It's dirty!" + to_chat(user, "It's dirty!") return 1 else if(is_type_in_list(O,acceptable_items)) if (contents.len>=max_n_of_items) - user << "This [src] is full of ingredients, you cannot put more." + to_chat(user, "This [src] is full of ingredients, you cannot put more.") return 1 if (istype(O,/obj/item/stack) && O:amount>1) new O.type (src) @@ -136,7 +136,7 @@ "You add one of [O] to \the [src].") else if(!user.drop_item()) - user << "\The [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\The [O] is stuck to your hand, you cannot put it in \the [src]") return 0 O.forceMove(src) @@ -151,15 +151,15 @@ return 1 for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) - user << "Your [O] contains components unsuitable for cookery." + to_chat(user, "Your [O] contains components unsuitable for cookery.") return 1 //G.reagents.trans_to(src,G.amount_per_transfer_from_this) else if(istype(O,/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O - user << "This is ridiculous. You can not fit \the [G.affecting] in this [src]." + to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") return 1 else - user << "You have no idea what you can cook with this [O]." + to_chat(user, "You have no idea what you can cook with this [O].") return 1 src.updateUsrDialog() @@ -343,7 +343,7 @@ if (src.reagents.total_volume) src.dirty++ src.reagents.clear_reagents() - usr << "You dispose of \the [src]'s contents." + to_chat(usr, "You dispose of \the [src]'s contents.") src.updateUsrDialog() /obj/machinery/kitchen_machine/proc/muck_start() diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index cb8947d20a5..12feba6cf17 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -12,6 +12,8 @@ var/grinded = 0 var/required_grind = 5 var/cube_production = 1 + var/cycle_through = 0 + var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube /obj/machinery/monkey_recycler/New() ..() @@ -44,6 +46,22 @@ default_deconstruction_crowbar(O) + if(istype(O, /obj/item/device/multitool)) + cycle_through++ + switch(cycle_through) + if(1) + cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube + if(2) + cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube + if(3) + cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube + if(4) + cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube + if(5) + cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube + cycle_through = 0 + to_chat(user, "You change the monkeycube type to [cube_type.name].") + if (src.stat != 0) //NOPOWER etc return if (istype(O, /obj/item/weapon/grab)) @@ -53,11 +71,11 @@ var/mob/living/carbon/human/target = grabbed if(issmall(target)) if(target.stat == 0) - user << "The monkey is struggling far too much to put it in the recycler." + to_chat(user, "The monkey is struggling far too much to put it in the recycler.") else user.drop_item() qdel(target) - user << "You stuff the monkey in the machine." + to_chat(user, "You stuff the monkey in the machine.") playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking @@ -65,23 +83,23 @@ src.grinded++ sleep(50) pixel_x = initial(pixel_x) - user << "The machine now has [grinded] monkey\s worth of material stored." + to_chat(user, "The machine now has [grinded] monkey\s worth of material stored.") else - user << "The machine only accepts monkeys!" + to_chat(user, "The machine only accepts monkeys!") else - user << "The machine only accepts monkeys!" + to_chat(user, "The machine only accepts monkeys!") return /obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) if (src.stat != 0) //NOPOWER etc return if(grinded >= required_grind) - user << "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube." + to_chat(user, "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube.") playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1) grinded -= required_grind for(var/i = 0, i < cube_production, i++) // Forgot to fix this bit the first time through - new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) - user << "The machine's display flashes that it has [grinded] monkey\s worth of material left." + new cube_type(src.loc) + to_chat(user, "The machine's display flashes that it has [grinded] monkey\s worth of material left.") else // I'm not sure if the \s macro works with a word in between; I'll play it safe - user << "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded]." + to_chat(user, "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].") return \ No newline at end of file diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 87426a7daaa..57e1aecf514 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -85,7 +85,7 @@ S.loc = loc S.visible_message("[S] crawls free of the processor!") return - for(var/i = 1, i <= C + processor.rating_amount, i++) + for(var/i in 1 to (C+processor.rating_amount-1)) new S.coretype(loc) feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]") ..() @@ -135,7 +135,7 @@ /obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(src.processing) - user << "\the [src] is already processing something!" + to_chat(user, "\the [src] is already processing something!") return 1 if(default_deconstruction_screwdriver(user, "processor1", "processor", O)) @@ -158,7 +158,7 @@ var/datum/food_processor_process/P = select_recipe(what) if (!P) - user << "That probably won't blend." + to_chat(user, "That probably won't blend.") return 1 user.visible_message("\the [user] puts \the [what] into \the [src].", \ @@ -174,11 +174,11 @@ return if(src.processing) - user << "\the [src] is already processing something!" + to_chat(user, "\the [src] is already processing something!") return 1 if(src.contents.len == 0) - user << "\the [src] is empty." + to_chat(user, "\the [src] is empty.") return 1 src.processing = 1 user.visible_message("[user] turns on [src].", \ diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index bca954ac593..7978aee0c0a 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -108,37 +108,54 @@ return 1 return 0 -/obj/machinery/smartfridge/secure/virology - name = "\improper Refrigerated Virus Storage" - desc = "A refrigerated storage unit for storing viral material." - req_access_txt = "39" - icon_state = "smartfridge_virology" - icon_on = "smartfridge_virology" - icon_off = "smartfridge_virology-off" - -/obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj) - if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial/)) - return 1 - if(istype(O,/obj/item/weapon/virusdish/)) - return 1 - return 0 - /obj/machinery/smartfridge/secure/chemistry name = "\improper Smart Chemical Storage" desc = "A refrigerated storage unit for medicine and chemical storage." icon_state = "smartfridge" //To fix the icon in the map editor. icon_on = "smartfridge_chem" req_access_txt = "33" + var/list/spawn_meds = list() + +/obj/machinery/smartfridge/secure/chemistry/New() + ..() + for(var/typekey in spawn_meds) + var/amount = spawn_meds[typekey] + if(isnull(amount)) amount = 1 + while(amount) + var/obj/item/I = new typekey(src) + if(item_quants[I.name]) + item_quants[I.name]++ + else + item_quants[I.name] = 1 + nanomanager.update_uis(src) + amount-- /obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/weapon/storage/pill_bottle) || istype(O,/obj/item/weapon/reagent_containers)) return 1 return 0 + +// ---------------------------- +// Virology Medical Smartfridge +// ---------------------------- /obj/machinery/smartfridge/secure/chemistry/virology - name = "\improper Smart Virus Storage" + name = "smart virus storage" desc = "A refrigerated storage unit for volatile sample storage." req_access_txt = "39" + spawn_meds = list(/obj/item/weapon/reagent_containers/syringe/antiviral = 4, + /obj/item/weapon/reagent_containers/glass/bottle/cold = 1, + /obj/item/weapon/reagent_containers/glass/bottle/flu_virion = 1, + /obj/item/weapon/reagent_containers/glass/bottle/mutagen = 1, + /obj/item/weapon/reagent_containers/glass/bottle/plasma = 1, + /obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine = 1) + +/obj/machinery/smartfridge/secure/chemistry/virology/accept_check(obj/item/O) + if(..(O)) + return 1 + if(istype(O, /obj/item/weapon/reagent_containers/syringe)) + return 1 + return 0 /obj/machinery/smartfridge/drinks name = "\improper Drink Showcase" @@ -177,7 +194,7 @@ if(istype(O, /obj/item/weapon/screwdriver) && anchored) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -198,16 +215,16 @@ return if(stat & NOPOWER) - user << "\The [src] is unpowered and useless." + to_chat(user, "\The [src] is unpowered and useless.") return if(accept_check(O)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") return 1 else if(!user.drop_item()) - user << "\The [O] is stuck to you!" + to_chat(user, "\The [O] is stuck to you!") return O.forceMove(src) @@ -225,7 +242,7 @@ for(var/obj/G in P.contents) if(accept_check(G)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") return 1 else P.remove_from_storage(G,src) @@ -238,12 +255,12 @@ user.visible_message("[user] loads \the [src] with \the [P].", "You load \the [src] with \the [P].") if(P.contents.len > 0) - user << "Some items are refused." + to_chat(user, "Some items are refused.") nanomanager.update_uis(src) else - user << "\The [src] smartly refuses [O]." + to_chat(user, "\The [src] smartly refuses [O].") return 1 /obj/machinery/smartfridge/attack_ai(mob/user as mob) @@ -264,7 +281,7 @@ return if(stat & NOPOWER) - user << "\The [src] is unpowered and useless." + to_chat(user, "\The [src] is unpowered and useless.") return var/obj/item/weapon/storage/box/pillbottles/P = over_object @@ -272,7 +289,7 @@ for(var/obj/G in P.contents) if(accept_check(G)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") return 1 else P.remove_from_storage(G,src) @@ -286,13 +303,13 @@ "[user] empties \the [P] into \the [src].", \ "You empty \the [P] into \the [src].") if(P.contents.len > 0) - user << "Some items are refused." + to_chat(user, "Some items are refused.") nanomanager.update_uis(src) /obj/machinery/smartfridge/secure/emag_act(user as mob) emagged = 1 locked = -1 - user << "You short out the product lock on [src]." + to_chat(user, "You short out the product lock on [src].") /******************* * SmartFridge Menu @@ -391,7 +408,7 @@ return 0 if(usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) if(!allowed(usr) && !emagged && locked != -1 && href_list["vend"]) - usr << "Access denied." + to_chat(usr, "Access denied.") nanomanager.update_uis(src) return 0 return ..() \ No newline at end of file diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 839c63a6bc9..3bc2bec5ec4 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -11,9 +11,27 @@ var/area/area = null var/otherarea = null // luminosity = 1 + settagwhitelist = list("logic_id_tag") + var/light_connect = 1 //Allows the switch to control lights in its associated areas. When set to 0, using the switch won't affect the lights. + var/datum/radio_frequency/radio_connection + var/frequency = 0 + var/logic_id_tag = "default" //Defines the ID tag to send logic signals to. + var/logic_connect = 0 //Set this to allow the switch to send out logic signals. -/obj/machinery/light_switch/New() + +/obj/machinery/light_switch/New(turf/loc, var/w_dir=null) ..() + switch(w_dir) + if(NORTH) + pixel_y = 25 + if(SOUTH) + pixel_y = -25 + if(EAST) + pixel_x = 25 + if(WEST) + pixel_x = -25 + if(radio_controller) + set_frequency(frequency) spawn(5) src.area = src.loc.loc @@ -26,7 +44,20 @@ src.on = src.area.lightswitch updateicon() +/obj/machinery/light_switch/initialize() + ..() + set_frequency(frequency) +/obj/machinery/light_switch/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency, RADIO_LOGIC) + return + +/obj/machinery/light_switch/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + return ..() /obj/machinery/light_switch/proc/updateicon() if(stat & NOPOWER) @@ -39,24 +70,57 @@ /obj/machinery/light_switch/examine(mob/user) if(..(user, 1)) - user << "A light switch. It is [on? "on" : "off"]." - + to_chat(user, "A light switch. It is [on? "on" : "off"].") /obj/machinery/light_switch/attack_hand(mob/user) on = !on + updateicon() - area.lightswitch = on - area.updateicon() + if(light_connect) + area.lightswitch = on + area.updateicon() - for(var/obj/machinery/light_switch/L in area) - L.on = on - L.updateicon() + if(logic_connect && powered(LIGHT)) //Don't bother sending a signal if we aren't set to send them or we have no power to send with. + handle_output() - area.power_change() + if(light_connect) + for(var/obj/machinery/light_switch/L in area) + L.on = on + L.updateicon() + + area.power_change() + +/obj/machinery/light_switch/proc/handle_output() + if(!radio_connection) //can't output without this + return + + if(logic_id_tag == null) //Don't output to an undefined id_tag + return + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + + //Light switches are continuous signal sources, since they register as ON or OFF and stay that way until adjusted again + if(on) + signal.data = list( + "tag" = logic_id_tag, + "sigtype" = "logic", + "state" = LOGIC_ON, + ) + else + signal.data = list( + "tag" = logic_id_tag, + "sigtype" = "logic", + "state" = LOGIC_OFF, + ) + + radio_connection.post_signal(src, signal, filter = RADIO_LOGIC) + if(on) + use_power(5, LIGHT) //Use a tiny bit of power every time we send an ON signal. Draws from the local APC's lighting circuit, since this is a LIGHT switch. /obj/machinery/light_switch/power_change() - if(!otherarea) if(powered(LIGHT)) stat &= ~NOPOWER @@ -71,3 +135,40 @@ return power_change() ..(severity) + +/obj/machinery/light_switch/process() + if(logic_connect && powered(LIGHT)) //We won't send signals while unpowered, but the last signal will remain valid for anything that received it before we went dark + handle_output() + +/obj/machinery/light_switch/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + if(istype(W, /obj/item/device/detective_scanner)) + return + + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 + + if(istype(W, /obj/item/weapon/wrench)) + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, 30, target = src)) + to_chat(user, "You detach \the [src] from the wall.") + new/obj/item/mounted/frame/light_switch(get_turf(src)) + qdel(src) + return 1 + + return src.attack_hand(user) + +/obj/machinery/light_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) + return {" +
-
+
- Light Circuit Connection: [light_connect ? "On" : "Off"] +
- Logic Connection: [logic_connect ? "On" : "Off"] +
- Logic ID Tag: [format_tag("Logic ID Tag", "logic_id_tag")] +
(swipe card to unlock controls)
-Frequency: [format_frequency(freq)]
Location: [location ? location : "(none)"]
Transponder Codes:
- "}
@@ -161,25 +133,21 @@ Transponder Codes:
- [key] ... [codes[key]]"
- t += " (edit)"
- t += " (delete)
" - t += "(add new)
" + t += " Edit" + t += " Delete
" + t += " Add New
" t+= "
- "}
t = {"Navigation Beacon
(swipe card to lock controls)
-Frequency: -- -- -[format_frequency(freq)] -+ -+
+
-Location: [location ? location : "(none)"]
+Location: [location ? location : "None"]
Transponder Codes:
- "}
for(var/key in codes)
t += "
- "}
if(open && !locked)
usr.set_machine(src)
- if (href_list["freq"])
- freq = sanitize_frequency(freq + text2num(href_list["freq"]))
- updateDialog()
-
- else if(href_list["locedit"])
- var/newloc = sanitize(copytext(input("Enter New Location", "Navigation Beacon", location) as text|null,1,MAX_MESSAGE_LEN))
+ if(href_list["locedit"])
+ var/newloc = copytext(sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null),1,MAX_MESSAGE_LEN)
if(newloc)
location = newloc
updateDialog()
@@ -201,12 +165,12 @@ Transponder Codes:
- "}
else if(href_list["edit"])
var/codekey = href_list["code"]
- var/newkey = input("Enter Transponder Code Key", "Navigation Beacon", codekey) as text|null
+ var/newkey = stripped_input(usr, "Enter Transponder Code Key", "Navigation Beacon", codekey)
if(!newkey)
return
var/codeval = codes[codekey]
- var/newval = input("Enter Transponder Code Value", "Navigation Beacon", codeval) as text|null
+ var/newval = stripped_input(usr, "Enter Transponder Code Value", "Navigation Beacon", codeval)
if(!newval)
newval = codekey
return
@@ -223,11 +187,11 @@ Transponder Codes:
- "}
else if(href_list["add"])
- var/newkey = input("Enter New Transponder Code Key", "Navigation Beacon") as text|null
+ var/newkey = stripped_input(usr, "Enter New Transponder Code Key", "Navigation Beacon")
if(!newkey)
return
- var/newval = input("Enter New Transponder Code Value", "Navigation Beacon") as text|null
+ var/newval = stripped_input(usr, "Enter New Transponder Code Value", "Navigation Beacon")
if(!newval)
newval = "1"
return
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index b37d4313f6b..d991e7c5235 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -710,7 +710,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params)
if(istype(I, /obj/item/weapon/wrench))
- user << "Now [anchored ? "un" : ""]securing [name]"
+ to_chat(user, "Now [anchored ? "un" : ""]securing [name]")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 60, target = src))
new /obj/item/mounted/frame/newscaster_frame(loc)
@@ -739,7 +739,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
visible_message("[user.name] forcefully slams the [src.name] with the [I.name]!", null, 5 )
playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
else
- user << "This does nothing."
+ to_chat(user, "This does nothing.")
src.update_icon()
/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob)
@@ -863,7 +863,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
human_user << browse(dat, "window=newspaper_main;size=300x400")
onclose(human_user, "newspaper_main")
else
- user << "The paper is full of intelligible symbols!"
+ to_chat(user, "The paper is full of intelligible symbols!")
obj/item/weapon/newspaper/Topic(href, href_list)
@@ -901,7 +901,7 @@ obj/item/weapon/newspaper/Topic(href, href_list)
obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/pen))
if(src.scribble_page == src.curr_page)
- user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?"
+ to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")
else
var/s = strip_html( input(user, "Write something", "Newspaper", "") )
s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 1f1395431d9..2b56b71fc43 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -30,7 +30,7 @@
imap += icon('icons/misc/imap.dmi', "blank")
imap += icon('icons/misc/imap.dmi', "blank")
- //world << "[icount] images in list"
+// to_chat(world, "[icount] images in list")
for(var/wx = 1 ; wx <= world.maxx; wx++)
@@ -146,12 +146,12 @@
var/rx = ((wx*2+xoff)%32) + 1
var/ry = ((wy*2+yoff)%32) + 1
- //world << "trying [ix],[iy] : [ix+icx*iy]"
+// to_chat(world, "trying [ix],[iy] : [ix+icx*iy]")
var/icon/I = imap[1+(ix + icx*iy)*2]
var/icon/I2 = imap[2+(ix + icx*iy)*2]
- //world << "icon: \icon[I]"
+// to_chat(world, "icon: \icon[I]")
I.DrawBox(colour, rx, ry, rx+1, ry+1)
@@ -168,7 +168,7 @@
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
- //world<<"\icon[I] at [H.screen_loc]"
+// to_chat(world, "\icon[I] at [H.screen_loc]")
H.name = (i==0)?"maprefresh":"map"
@@ -280,11 +280,11 @@
var/rx = ((wx*2+xoff)%32) + 1
var/ry = ((wy*2+yoff)%32) + 1
- //world << "trying [ix],[iy] : [ix+icx*iy]"
+// to_chat(world, "trying [ix],[iy] : [ix+icx*iy]")
var/icon/I = imap[1+(ix + icx*iy)]
- //world << "icon: \icon[I]"
+// to_chat(world, "icon: \icon[I]")
I.DrawBox(colour, rx, ry, rx, ry)
@@ -299,7 +299,7 @@
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
- //world<<"\icon[I] at [H.screen_loc]"
+// to_chat(world, "\icon[I] at [H.screen_loc]")
H.name = (i==0)?"maprefresh":"map"
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 11361034fbb..ad54eb2e8e9 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -434,7 +434,7 @@
for(var/obj/machinery/atmospherics/M in src.loc)
if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe
- user << "There is already a pipe of the same type at this location."
+ to_chat(user, "There is already a pipe of the same type at this location.")
return 1
switch(pipe_type) //What kind of heartless person thought of doing this?
@@ -619,11 +619,11 @@
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if(!locate(/obj/machinery/atmospherics/pipe, src.loc))
- user << "\red You need to fasten it to a pipe"
+ to_chat(user, "\red You need to fasten it to a pipe")
return 1
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You have fastened the meter to the pipe"
+ to_chat(user, "\blue You have fastened the meter to the pipe")
qdel(src)
/obj/item/pipe_gsensor
@@ -640,7 +640,7 @@
return ..()
new/obj/machinery/air_sensor( src.loc )
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You have fastened the gas sensor"
+ to_chat(user, "\blue You have fastened the gas sensor")
qdel(src)
#undef PIPE_SIMPLE_STRAIGHT
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 31b58bcac10..9214178e9e4 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -100,14 +100,14 @@
/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
src.add_fingerprint(usr)
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor))
- usr << "\blue You put [W] back to [src]."
+ to_chat(usr, "\blue You put [W] back to [src].")
user.drop_item()
qdel(W)
return
else if (istype(W, /obj/item/weapon/wrench))
if (unwrenched==0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src] from the floor..."
+ to_chat(user, "\blue You begin to unfasten \the [src] from the floor...")
if (do_after(user, 40, target = src))
user.visible_message( \
"[user] unfastens \the [src].", \
@@ -120,7 +120,7 @@
usr << browse(null, "window=pipedispenser")
else /*if (unwrenched==1)*/
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to fasten \the [src] to the floor..."
+ to_chat(user, "\blue You begin to fasten \the [src] to the floor...")
if (do_after(user, 20, target = src))
user.visible_message( \
"[user] fastens \the [src].", \
diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm
index 6679fd3b580..54585c0eb26 100644
--- a/code/game/machinery/podmen.dm
+++ b/code/game/machinery/podmen.dm
@@ -31,7 +31,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
if(istype(W,/obj/item/weapon/reagent_containers))
- user << "You inject the contents of the syringe into the seeds."
+ to_chat(user, "You inject the contents of the syringe into the seeds.")
var/datum/reagent/blood/B
@@ -42,7 +42,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
break
if(B)
source = B.data["donor"]
- user << "The strange, sluglike seeds quiver gently and swell with blood."
+ to_chat(user, "The strange, sluglike seeds quiver gently and swell with blood.")
if(!source.client && source.mind)
for(var/mob/O in respawnable_list)
if(O.mind == source.mind && config.revival_pod_plants)
@@ -51,10 +51,10 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
source.key = O.key
return
if("No")
- user << "The seeds seem to reject the blood, returning to their original size as they stop quivering."
+ to_chat(user, "The seeds seem to reject the blood, returning to their original size as they stop quivering.")
return
else
- user << "Nothing happens."
+ to_chat(user, "Nothing happens.")
return
if (!istype(source))
@@ -76,7 +76,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
if(beingharvested)
- user << ("\red You can only harvest the pod once!")
+ to_chat(user, ("\red You can only harvest the pod once!"))
else
user.visible_message("\blue [user] carefully begins to open the pod...","\blue You carefully begin to open the pod...")
beingharvested = 1
@@ -123,11 +123,11 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
ticker.mode:update_all_cult_icons() //So the icon actually appears
// -- End mode specific stuff
- podman << "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark."
+ to_chat(podman, "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark.")
if(source && ckey && podman.ckey == ckey)
- podman << "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake."
- podman << "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders."
- podman << "Too much darkness will send you into shock and starve you, but light will help you heal."
+ to_chat(podman, "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake.")
+ to_chat(podman, "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.")
+ to_chat(podman, "Too much darkness will send you into shock and starve you, but light will help you heal.")
else
new /mob/living/carbon/monkey/diona(parent.loc)
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index e2da5b8beb0..b7f1f41b356 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -21,16 +21,19 @@
/obj/machinery/poolcontroller/emag_act(user as mob) //Emag_act, this is called when it is hit with a cryptographic sequencer.
if(!emagged) //If it is not already emagged, emag it.
- user << "You disable \the [src]'s temperature safeguards." //Inform the mob of what emagging does.
+ to_chat(user, "You disable \the [src]'s temperature safeguards.")//Inform the mob of what emagging does.
+
emagged = 1 //Set the emag var to true.
/obj/machinery/poolcontroller/attackby(obj/item/P as obj, mob/user as mob, params) //Proc is called when a user hits the pool controller with something.
if(istype(P,/obj/item/device/multitool)) //If the mob hits the pool controller with a multitool, reset the emagged status
if(emagged) //Check the emag status
- user << "You re-enable \the [src]'s temperature safeguards." //Inform the user that they have just fixed the safeguards.
+ to_chat(user, "You re-enable \the [src]'s temperature safeguards.")//Inform the user that they have just fixed the safeguards.
+
emagged = 0 //Set the emagged var to false.
else
- user << "Nothing happens." //If not emagged, don't do anything, and don't tell the user that it can be emagged.
+ to_chat(user, "Nothing happens.")//If not emagged, don't do anything, and don't tell the user that it can be emagged.
+
else //If it's not a multitool, defer to /obj/machinery/attackby
..()
@@ -64,21 +67,23 @@
switch(temperature) //Apply different effects based on what the temperature is set to.
if("scalding") //Burn the mob.
M.bodytemperature = min(500, M.bodytemperature + 35) //heat mob at 35k(elvin) per cycle
- M << "The water is searing hot!"
+ to_chat(M, "The water is searing hot!")
if("warm") //Gently warm the mob.
M.bodytemperature = min(330, M.bodytemperature + 10) //Heats up mobs to just over normal, not enough to burn
if(prob(50)) //inform the mob of warm water half the time
- M << "The water is quite warm." //Inform the mob it's warm water.
+ to_chat(M, "The water is quite warm.")//Inform the mob it's warm water.
+
if("cool") //Gently cool the mob.
M.bodytemperature = max(290, M.bodytemperature - 10) //Cools mobs to just below normal, not enough to burn
if(prob(50)) //inform the mob of cold water half the time
- M << "The water is chilly." //Inform the mob it's chilly water.
+ to_chat(M, "The water is chilly.")//Inform the mob it's chilly water.
+
if("frigid") //Freeze the mob.
M.bodytemperature = max(80, M.bodytemperature - 35) //cool mob at -35k per cycle
- M << "The water is freezing!"
+ to_chat(M, "The water is freezing!")
return
/obj/machinery/poolcontroller/proc/handleDrowning(var/mob/living/carbon/human/drownee)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 7c4d5c797f1..59a34b56436 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -174,11 +174,11 @@ var/list/turret_icons
/obj/machinery/porta_turret/proc/isLocked(mob/user)
if(ailock && (isrobot(user) || isAI(user)))
- user << "There seems to be a firewall preventing you from accessing this device."
+ to_chat(user, "There seems to be a firewall preventing you from accessing this device.")
return 1
if(locked && !(isrobot(user) || isAI(user) || isobserver(user)))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return 1
return 0
@@ -243,14 +243,14 @@ var/list/turret_icons
/obj/machinery/porta_turret/CanUseTopic(var/mob/user)
if(HasController())
- user << "Turrets can only be controlled using the assigned turret controller."
+ to_chat(user, "Turrets can only be controlled using the assigned turret controller.")
return STATUS_CLOSE
if(isLocked(user))
return STATUS_CLOSE
if(!anchored)
- usr << "\The [src] has to be secured first!"
+ to_chat(usr, "\The [src] has to be secured first!")
return STATUS_CLOSE
return ..()
@@ -329,10 +329,10 @@ var/list/turret_icons
if(istype(I, /obj/item/weapon/crowbar))
//If the turret is destroyed, you can remove it with a crowbar to
//try and salvage its components
- user << "You begin prying the metal coverings off."
+ to_chat(user, "You begin prying the metal coverings off.")
if(do_after(user, 20, target = src))
if(prob(70))
- user << "You remove the turret and salvage some components."
+ to_chat(user, "You remove the turret and salvage some components.")
if(installation)
var/obj/item/weapon/gun/energy/Gun = new installation(loc)
Gun.power_supply.charge = gun_charge
@@ -342,18 +342,18 @@ var/list/turret_icons
if(prob(50))
new /obj/item/device/assembly/prox_sensor(loc)
else
- user << "You remove the turret but did not manage to salvage anything."
+ to_chat(user, "You remove the turret but did not manage to salvage anything.")
qdel(src) // qdel
else if((istype(I, /obj/item/weapon/wrench)))
if(enabled || raised)
- user << "You cannot unsecure an active turret!"
+ to_chat(user, "You cannot unsecure an active turret!")
return
if(wrenching)
- user << "Someone is already [anchored ? "un" : ""]securing the turret!"
+ to_chat(user, "Someone is already [anchored ? "un" : ""]securing the turret!")
return
if(!anchored && isinspace())
- user << "Cannot secure turrets in space!"
+ to_chat(user, "Cannot secure turrets in space!")
return
user.visible_message( \
@@ -368,21 +368,21 @@ var/list/turret_icons
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
anchored = 1
update_icon()
- user << "You secure the exterior bolts on the turret."
+ to_chat(user, "You secure the exterior bolts on the turret.")
else if(anchored)
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
anchored = 0
- user << "You unsecure the exterior bolts on the turret."
+ to_chat(user, "You unsecure the exterior bolts on the turret.")
update_icon()
wrenching = 0
else if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
if(allowed(user))
locked = !locked
- user << "Controls are now [locked ? "locked" : "unlocked"]."
+ to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].")
updateUsrDialog()
else
- user << "Access denied."
+ to_chat(user, "Access denied.")
else
//if the turret was attacked with the intention of harming it:
@@ -407,7 +407,7 @@ var/list/turret_icons
visible_message("[M] [M.attacktext] [src]!")
take_damage(M.melee_damage_upper)
else
- M << "That object is useless to you."
+ to_chat(M, "That object is useless to you.")
return
/obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M)
@@ -418,7 +418,7 @@ var/list/turret_icons
visible_message("[M] has slashed at [src]!")
take_damage(15)
else
- M << "That object is useless to you."
+ to_chat(M, "That object is useless to you.")
return
/obj/machinery/porta_turret/emag_act(user as mob)
@@ -426,7 +426,7 @@ var/list/turret_icons
//Emagging the turret makes it go bonkers and stun everyone. It also makes
//the turret shoot much, much faster.
if(user)
- user << "You short out [src]'s threat assessment circuits."
+ to_chat(user, "You short out [src]'s threat assessment circuits.")
visible_message("[src] hums oddly...")
emagged = 1
iconholder = 1
@@ -556,7 +556,7 @@ var/list/turret_icons
if(!L)
return TURRET_NOT_TARGET
- if(!emagged && issilicon(L)) // Don't target silica
+ if(!emagged && (issilicon(L) || isbot(L))) // Don't target silica
return TURRET_NOT_TARGET
if(L.stat && !emagged) //if the perp is dead/dying, no need to bother really
@@ -766,14 +766,14 @@ var/list/turret_icons
if(0) //first step
if(istype(I, /obj/item/weapon/wrench) && !anchored)
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You secure the external bolts."
+ to_chat(user, "You secure the external bolts.")
anchored = 1
build_step = 1
return
else if(istype(I, /obj/item/weapon/crowbar) && !anchored)
playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
- user << "You dismantle the turret construction."
+ to_chat(user, "You dismantle the turret construction.")
new /obj/item/stack/sheet/metal( loc, 5)
qdel(src) // qdel
return
@@ -782,16 +782,16 @@ var/list/turret_icons
if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
if(M.use(2))
- user << "You add some metal armor to the interior frame."
+ to_chat(user, "You add some metal armor to the interior frame.")
build_step = 2
icon_state = "turret_frame2"
else
- user << "You need two sheets of metal to continue construction."
+ to_chat(user, "You need two sheets of metal to continue construction.")
return
else if(istype(I, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
- user << "You unfasten the external bolts."
+ to_chat(user, "You unfasten the external bolts.")
anchored = 0
build_step = 0
return
@@ -800,7 +800,7 @@ var/list/turret_icons
if(2)
if(istype(I, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You bolt the metal armor into place."
+ to_chat(user, "You bolt the metal armor into place.")
build_step = 3
return
@@ -809,14 +809,14 @@ var/list/turret_icons
if(!WT.isOn())
return
if(WT.get_fuel() < 5) //uses up 5 fuel.
- user << "You need more fuel to complete this task."
+ to_chat(user, "You need more fuel to complete this task.")
return
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
if(do_after(user, 20, target = src))
if(!src || !WT.remove_fuel(5, user)) return
build_step = 1
- user << "You remove the turret's interior metal armor."
+ to_chat(user, "You remove the turret's interior metal armor.")
new /obj/item/stack/sheet/metal( loc, 2)
return
@@ -828,11 +828,11 @@ var/list/turret_icons
return
var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun
if(!user.unEquip(I))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]")
return
installation = I.type //installation becomes I.type
gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge
- user << "You add [I] to the turret."
+ to_chat(user, "You add [I] to the turret.")
if(istype(installation, /obj/item/weapon/gun/energy/laser/bluetag) || istype(installation, /obj/item/weapon/gun/energy/laser/redtag))
target_type = /obj/machinery/porta_turret/tag
@@ -845,18 +845,18 @@ var/list/turret_icons
else if(istype(I, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You remove the turret's metal armor bolts."
+ to_chat(user, "You remove the turret's metal armor bolts.")
build_step = 2
return
if(4)
if(isprox(I))
if(!user.unEquip(I))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]")
return
build_step = 5
qdel(I) // qdel
- user << "You add the prox sensor to the turret."
+ to_chat(user, "You add the prox sensor to the turret.")
return
//attack_hand() removes the gun
@@ -865,7 +865,7 @@ var/list/turret_icons
if(istype(I, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
build_step = 6
- user << "You close the internal access hatch."
+ to_chat(user, "You close the internal access hatch.")
return
//attack_hand() removes the prox sensor
@@ -874,16 +874,16 @@ var/list/turret_icons
if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
if(M.use(2))
- user << "You add some metal armor to the exterior frame."
+ to_chat(user, "You add some metal armor to the exterior frame.")
build_step = 7
else
- user << "You need two sheets of metal to continue construction."
+ to_chat(user, "You need two sheets of metal to continue construction.")
return
else if(istype(I, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
build_step = 5
- user << "You open the internal access hatch."
+ to_chat(user, "You open the internal access hatch.")
return
if(7)
@@ -891,14 +891,14 @@ var/list/turret_icons
var/obj/item/weapon/weldingtool/WT = I
if(!WT.isOn()) return
if(WT.get_fuel() < 5)
- user << "You need more fuel to complete this task."
+ to_chat(user, "You need more fuel to complete this task.")
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
if(do_after(user, 30, target = src))
if(!src || !WT.remove_fuel(5, user))
return
build_step = 8
- user << "You weld the turret's armor down."
+ to_chat(user, "You weld the turret's armor down.")
//The final step: create a full turret
var/obj/machinery/porta_turret/Turret = new target_type(loc)
@@ -912,7 +912,7 @@ var/list/turret_icons
else if(istype(I, /obj/item/weapon/crowbar))
playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
- user << "You pry off the turret's exterior armor."
+ to_chat(user, "You pry off the turret's exterior armor.")
new /obj/item/stack/sheet/metal(loc, 2)
build_step = 6
return
@@ -942,10 +942,10 @@ var/list/turret_icons
Gun.update_icon()
installation = null
gun_charge = 0
- user << "You remove [Gun] from the turret frame."
+ to_chat(user, "You remove [Gun] from the turret frame.")
if(5)
- user << "You remove the prox sensor from the turret frame."
+ to_chat(user, "You remove the prox sensor from the turret frame.")
new /obj/item/device/assembly/prox_sensor(loc)
build_step = 4
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
index b59bfad4d3e..f061f9906e6 100644
--- a/code/game/machinery/programmable_unloader.dm
+++ b/code/game/machinery/programmable_unloader.dm
@@ -199,7 +199,7 @@
if(istype(I,/obj/item/weapon/wrench)) // code borrowed from pipe dispenser
if (unwrenched==0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src] from the floor..."
+ to_chat(user, "\blue You begin to unfasten \the [src] from the floor...")
if (do_after(user, 40, target = src))
user.visible_message( \
"[user] unfastens \the [src].", \
@@ -212,7 +212,7 @@
usr << browse(null, "window=pipedispenser")
else /* unwrenched */
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to fasten \the [src] to the floor..."
+ to_chat(user, "\blue You begin to fasten \the [src] to the floor...")
if (do_after(user, 20, target = src))
user.visible_message( \
"[user] fastens \the [src].", \
@@ -230,16 +230,16 @@
open = 0
if(!unwrenched && !circuit_removed)
src.stat &= ~MAINT
- user << "You close \the [src]'s maintenance panel."
+ to_chat(user, "You close \the [src]'s maintenance panel.")
else
open = 1
src.stat |= MAINT
- user << "You open \the [src]'s maintenance panel."
+ to_chat(user, "You open \the [src]'s maintenance panel.")
if(istype(I,/obj/item/weapon/crowbar))
if(open)
- user << "\blue You begin to pry out the [src]'s circuits."
+ to_chat(user, "\blue You begin to pry out the [src]'s circuits.")
if(do_after(user,40, target = src))
- user << "\blue You remove the circuitboard."
+ to_chat(user, "\blue You remove the circuitboard.")
circuit_removed = 1
use_power = 0
on = 0
@@ -260,10 +260,10 @@
if(istype(I,/obj/item/weapon/circuitboard/programmable))
if(!open)
- user << "You have to open the machine first!"
+ to_chat(user, "You have to open the machine first!")
return
if(!circuit_removed)
- user << "There is already a circuitboard present!"
+ to_chat(user, "There is already a circuitboard present!")
return
circuit_removed = 0
I.loc = src
@@ -272,7 +272,7 @@
/obj/machinery/programmable/emag_act(user as mob)
if(emagged)
return
- user << "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion."
+ to_chat(user, "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion.")
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
emagged = 1
overrides += emag_overrides
@@ -299,7 +299,7 @@
if(M.client)
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
- M << "\blue The machine turns off, and you fall out."
+ to_chat(M, "\blue The machine turns off, and you fall out.")
return
@@ -498,7 +498,7 @@
if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves/boxing))
var/newsleep = 0
if(H.loc != input)
- H << "The boxing machine refuses to acknowledge you unless you face it head on!"
+ to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!")
return
var/damage = 0
if(H.a_intent != I_HARM)
@@ -585,22 +585,22 @@
if(istype(I,/obj/item/device/multitool))
hacking = (hacking?0:1)
if(hacking)
- user << "You unlock the data port on the board. You can now use a PDA to alter its data."
+ to_chat(user, "You unlock the data port on the board. You can now use a PDA to alter its data.")
else
- user << "You relock the data port."
+ to_chat(user, "You relock the data port.")
if(istype(I,/obj/item/device/pda))
if(!hacking)
- user << "It looks like you can't access the board's data port. You'll have to open it with a multitool."
+ to_chat(user, "It looks like you can't access the board's data port. You'll have to open it with a multitool.")
else
user.set_machine(src)
interact(user)
if(istype(I,/obj/item/weapon/card/emag) && !emagged)
if(!hacking)
- user << "There seems to be a data port on the card, but it's locked. A multitool could open it."
+ to_chat(user, "There seems to be a data port on the card, but it's locked. A multitool could open it.")
else
emagged = 1
overrides += emag_overrides
- user << "You swipe the card in the card's data port. The lights flicker, then flash once."
+ to_chat(user, "You swipe the card in the card's data port. The lights flicker, then flash once.")
proc/format(var/datum/cargoprofile/P,var/level)
// PROFILE=0 OVERRIDE=1 MAIN=2
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 73ef3b1d945..be126aec5ff 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -18,7 +18,7 @@
return
if(!user.canUnEquip(G, 0))
- user << "[G] is stuck to your hand, you can't put it in [src]!"
+ to_chat(user, "[G] is stuck to your hand, you can't put it in [src]!")
return
if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs))
@@ -28,22 +28,22 @@
// Checks to make sure he's not in space doing it, and that the area got proper power.
var/area/a = get_area(src)
if(!isarea(a))
- user << "\red The [name] blinks red as you try to insert the item!"
+ to_chat(user, "\red The [name] blinks red as you try to insert the item!")
return
if(a.power_equip == 0 && a.requires_power)
- user << "\red The [name] blinks red as you try to insert the item!"
+ to_chat(user, "\red The [name] blinks red as you try to insert the item!")
return
if (istype(G, /obj/item/weapon/gun/energy))
var/obj/item/weapon/gun/energy/E = G
if(!E.can_charge)
- user << "Your gun has no external power connector."
+ to_chat(user, "Your gun has no external power connector.")
return
if(istype(G, /obj/item/device/laptop))
var/obj/item/device/laptop/L = G
if(!L.stored_computer.battery)
- user << "There's no battery in it!"
+ to_chat(user, "There's no battery in it!")
return
user.drop_item()
@@ -53,10 +53,10 @@
update_icon()
else if(istype(G, /obj/item/weapon/wrench))
if(charging)
- user << "\red Remove the weapon first!"
+ to_chat(user, "\red Remove the weapon first!")
return
anchored = !anchored
- user << "You [anchored ? "attached" : "detached"] the recharger."
+ to_chat(user, "You [anchored ? "attached" : "detached"] the recharger.")
playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
/obj/machinery/recharger/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 31849032067..5b5a532efdb 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -89,7 +89,7 @@
/obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params)
if (istype(P, /obj/item/weapon/screwdriver))
if(src.occupant)
- user << "The maintenance panel is locked."
+ to_chat(user, "The maintenance panel is locked.")
return
default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P)
return
@@ -217,11 +217,11 @@
return
if(get_dist(src, user) > 2 || get_dist(usr, user) > 1)
- usr << "They are too far away to put inside"
+ to_chat(usr, "They are too far away to put inside")
return
if (panel_open)
- usr << "Close the maintenance panel first."
+ to_chat(usr, "Close the maintenance panel first.")
return
var/can_accept_user
@@ -232,10 +232,10 @@
//Whoever had it so that a borg with a dead cell can't enter this thing should be shot. --NEO
return
if(occupant)
- R << "The cell is already occupied!"
+ to_chat(R, "The cell is already occupied!")
return
if(!R.cell)
- R << "Without a power cell, you can't be recharged."
+ to_chat(R, "Without a power cell, you can't be recharged.")
//Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO
return
can_accept_user = 1
@@ -246,14 +246,14 @@
if(H.stat == DEAD)
return
if(occupant)
- H << "The cell is already occupied!"
+ to_chat(H, "The cell is already occupied!")
return
if(!H.get_int_organ(/obj/item/organ/internal/cell))
return
can_accept_user = 1
if(!can_accept_user)
- user << "Only non-organics may enter the recharger!"
+ to_chat(user, "Only non-organics may enter the recharger!")
return
user.stop_pulling()
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 67a77458916..9bcf3de53a8 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -45,9 +45,9 @@ var/const/SAFETY_COOLDOWN = 100
/obj/machinery/recycler/examine(mob/user)
..(user)
- user << "The power light is [(stat & NOPOWER) ? "off" : "on"]."
- user << "The safety-mode light is [safety_mode ? "on" : "off"]."
- user << "The safety-sensors status light is [emagged ? "off" : "on"]."
+ to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].")
+ to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].")
+ to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].")
/obj/machinery/recycler/power_change()
..()
@@ -78,7 +78,7 @@ var/const/SAFETY_COOLDOWN = 100
safety_mode = 0
update_icon()
playsound(src.loc, "sparks", 75, 1, -1)
- user << "You use the cryptographic sequencer on the [src.name]."
+ to_chat(user, "You use the cryptographic sequencer on the [src.name].")
/obj/machinery/recycler/update_icon()
..()
@@ -195,10 +195,10 @@ var/const/SAFETY_COOLDOWN = 100
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "[src] is fastened to the floor!"
+ to_chat(usr, "[src] is fastened to the floor!")
return 0
eat_dir = turn(eat_dir, 270)
- user << "[src] will now accept items from [dir2text(eat_dir)]."
+ to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].")
return 1
/obj/machinery/recycler/verb/rotateccw()
@@ -211,10 +211,10 @@ var/const/SAFETY_COOLDOWN = 100
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "[src] is fastened to the floor!"
+ to_chat(usr, "[src] is fastened to the floor!")
return 0
eat_dir = turn(eat_dir, 90)
- user << "[src] will now accept items from [dir2text(eat_dir)]."
+ to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].")
return 1
/obj/item/weapon/paper/recycler
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 0641b4d6266..bfd4939dc3b 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -226,7 +226,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
hackState = 0
icon_state="req_comp_open"
else
- user << "You can't do much with that."*/
+ to_chat(user, "You can't do much with that.")*/
if (istype(O, /obj/item/weapon/card/id))
if(inoperable(MAINT)) return
@@ -241,7 +241,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
else
reset_message()
- user << "You are not authorized to send announcements."
+ to_chat(user, "You are not authorized to send announcements.")
updateUsrDialog()
if (istype(O, /obj/item/weapon/stamp))
if(inoperable(MAINT)) return
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index be28fae21da..44455884bd8 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -28,11 +28,11 @@
if (O:amount < 1)
qdel(O)
- user << "You insert [count] metal sheet\s into the fabricator."
+ to_chat(user, "You insert [count] metal sheet\s into the fabricator.")
src.overlays -= "fab-load-metal"
updateDialog()
else
- user << "The robot part maker is full. Please remove metal from the robot part maker in order to insert more."
+ to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.")
/obj/machinery/robotic_fabricator/power_change()
if (powered())
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index ccdb43d5522..dbff4722cad 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -44,21 +44,21 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
new_seed_type = plant_controller.seeds[F.plantname]
if(new_seed_type)
- user << "You extract some seeds from [O]."
+ to_chat(user, "You extract some seeds from [O].")
var/produce = rand(1,4)
for(var/i = 0;i<=produce;i++)
var/obj/item/seeds/seeds = new(get_turf(src))
seeds.seed_type = new_seed_type.name
seeds.update_seed()
else
- user << "[O] doesn't seem to have any usable seeds inside it."
+ to_chat(user, "[O] doesn't seem to have any usable seeds inside it.")
qdel(O)
//Grass.
else if(istype(O, /obj/item/stack/tile/grass))
var/obj/item/stack/tile/grass/S = O
- user << "You extract some seeds from the [S.name]."
+ to_chat(user, "You extract some seeds from the [S.name].")
S.use(1)
new /obj/item/seeds/grassseed(loc)
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 8a995cc3aa2..323937075ad 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -208,10 +208,10 @@
/obj/machinery/shieldgen/attack_hand(mob/user as mob)
if(locked)
- user << "The machine is locked, you are unable to use it."
+ to_chat(user, "The machine is locked, you are unable to use it.")
return
if(is_open)
- user << "The panel must be closed before operating this machine."
+ to_chat(user, "The panel must be closed before operating this machine.")
return
if (src.active)
@@ -226,7 +226,7 @@
"You hear heavy droning.")
src.shields_up()
else
- user << "The device must first be secured to the floor."
+ to_chat(user, "The device must first be secured to the floor.")
return
/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -237,48 +237,48 @@
else if(istype(W, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
if(is_open)
- user << "\blue You close the panel."
+ to_chat(user, "\blue You close the panel.")
is_open = 0
else
- user << "\blue You open the panel and expose the wiring."
+ to_chat(user, "\blue You open the panel and expose the wiring.")
is_open = 1
else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open)
var/obj/item/stack/cable_coil/coil = W
- user << "\blue You begin to replace the wires."
+ to_chat(user, "\blue You begin to replace the wires.")
//if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ), target = src)) //Take longer to repair heavier damage
if(do_after(user, 30, target = src))
if(!src || !coil) return
coil.use(1)
health = max_health
malfunction = 0
- user << "\blue You repair the [src]!"
+ to_chat(user, "\blue You repair the [src]!")
update_icon()
else if(istype(W, /obj/item/weapon/wrench))
if(locked)
- user << "The bolts are covered, unlocking this would retract the covers."
+ to_chat(user, "The bolts are covered, unlocking this would retract the covers.")
return
if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "\blue You unsecure the [src] from the floor!"
+ to_chat(user, "\blue You unsecure the [src] from the floor!")
if(active)
- user << "\blue The [src] shuts off!"
+ to_chat(user, "\blue The [src] shuts off!")
src.shields_down()
anchored = 0
else
if(istype(get_turf(src), /turf/space)) return //No wrenching these in space!
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "\blue You secure the [src] to the floor!"
+ to_chat(user, "\blue You secure the [src] to the floor!")
anchored = 1
else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(src.allowed(user))
src.locked = !src.locked
- user << "The controls are now [src.locked ? "locked." : "unlocked."]"
+ to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
else
..()
@@ -346,13 +346,13 @@
/obj/machinery/shieldwallgen/attack_hand(mob/user as mob)
if(state != 1)
- user << "\red The shield generator needs to be firmly secured to the floor first."
+ to_chat(user, "\red The shield generator needs to be firmly secured to the floor first.")
return 1
if(src.locked && !istype(user, /mob/living/silicon))
- user << "\red The controls are locked!"
+ to_chat(user, "\red The controls are locked!")
return 1
if(power != 1)
- user << "\red The shield generator needs to be powered by wire underneath."
+ to_chat(user, "\red The shield generator needs to be powered by wire underneath.")
return 1
if(src.active >= 1)
@@ -452,29 +452,29 @@
/obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
if(active)
- user << "Turn off the field generator first."
+ to_chat(user, "Turn off the field generator first.")
return
else if(state == 0)
state = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- user << "You secure the external reinforcing bolts to the floor."
+ to_chat(user, "You secure the external reinforcing bolts to the floor.")
src.anchored = 1
return
else if(state == 1)
state = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- user << "You undo the external reinforcing bolts."
+ to_chat(user, "You undo the external reinforcing bolts.")
src.anchored = 0
return
if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
src.locked = !src.locked
- user << "Controls are now [src.locked ? "locked." : "unlocked."]"
+ to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
else
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
else
add_fingerprint(user)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 7e4efb3a751..6ba798cebee 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -28,11 +28,11 @@
/obj/machinery/space_heater/examine(mob/user)
..(user)
- user << "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]."
+ to_chat(user, "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"].")
if(open)
- user << "The power cell is [cell ? "installed" : "missing"]."
+ to_chat(user, "The power cell is [cell ? "installed" : "missing"].")
else
- user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%"
+ to_chat(user, "The charge meter reads [cell ? round(cell.percent(),1) : 0]%")
/obj/machinery/space_heater/emp_act(severity)
@@ -47,7 +47,7 @@
if(istype(I, /obj/item/weapon/stock_parts/cell))
if(open)
if(cell)
- user << "There is already a power cell inside."
+ to_chat(user, "There is already a power cell inside.")
return
else
// insert cell
@@ -60,7 +60,7 @@
user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].")
else
- user << "The hatch must be open to insert a power cell."
+ to_chat(user, "The hatch must be open to insert a power cell.")
return
else if(istype(I, /obj/item/weapon/screwdriver))
open = !open
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 72f2acb48ca..e73dbaf5dbd 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -1,5 +1,6 @@
#define FONT_SIZE "5pt"
#define FONT_COLOR "#09f"
+#define WARNING_FONT_COLOR "#f90"
#define FONT_STYLE "Arial Black"
#define SCROLL_SPEED 2
@@ -21,7 +22,7 @@
// 1 = Shuttle timer
// 2 = Arbitrary message(s)
// 3 = alert picture
- // 4 = Supply shuttle timer
+ // 4 = Station time
var/picture_state // icon_state of alert picture
var/message1 = "" // message line 1
@@ -87,26 +88,19 @@
remove_display()
return 1
if(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME) //emergency shuttle timer
+ var/use_warn = 0
if(shuttle_master.emergency.timer)
- var/line1
- var/line2 = get_shuttle_timer()
- switch(shuttle_master.emergency.mode)
- if(SHUTTLE_RECALL)
- line1 = "-RCL-"
- if(SHUTTLE_CALL)
- line1 = "-ETA-"
- if(SHUTTLE_DOCKED)
- line1 = "-ETD-"
- if(SHUTTLE_ESCAPE)
- line1 = "-ESC-"
- if(SHUTTLE_STRANDED)
- line1 = "-ERR-"
- line2 = "??:??"
- if(length(line2) > CHARS_PER_LINE)
- line2 = "Error!"
- update_display(line1, line2)
+ use_warn = 1
+ message1 = "-[shuttle_master.emergency.getModeStr()]-"
+ message2 = shuttle_master.emergency.getTimerStr()
+
+ if(length(message2) > CHARS_PER_LINE)
+ message2 = "Error!"
else
- remove_display()
+ message1 = "TIME"
+ message2 = worldtime2text()
+ update_display(message1, message2, use_warn)
+ return 1
if(STATUS_DISPLAY_MESSAGE) //custom messages
var/line1
var/line2
@@ -140,7 +134,7 @@
/obj/machinery/status_display/examine(mob/user)
. = ..(user)
if(mode != STATUS_DISPLAY_BLANK && mode != STATUS_DISPLAY_ALERT)
- user << "The display says:
\t[sanitize(message1)]
\t[sanitize(message2)]" + to_chat(user, "The display says:
\t[sanitize(message1)]
\t[sanitize(message2)]") /obj/machinery/status_display/proc/set_message(m1, m2) if(m1) @@ -162,23 +156,11 @@ remove_display() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) -/obj/machinery/status_display/proc/update_display(line1, line2) - var/new_text = {"
[line1]
[line2]
"}
+/obj/machinery/status_display/proc/update_display(line1, line2, warning = 0)
+ var/new_text = {"[line2]
[line1]
[line2]
"}
if(maptext != new_text)
maptext = new_text
-/obj/machinery/status_display/proc/get_shuttle_timer()
- var/timeleft = shuttle_master.emergency.timeLeft()
- if(timeleft > 0)
- return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
- return "00:00"
-
-/obj/machinery/status_display/proc/get_supply_shuttle_timer()
- var/timeleft = shuttle_master.supply.timeLeft()
- if(timeleft > 0)
- return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
- return "00:00"
-
/obj/machinery/status_display/proc/remove_display()
if(overlays.len)
overlays.Cut()
@@ -291,7 +273,8 @@
overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
#undef CHARS_PER_LINE
-#undef FOND_SIZE
+#undef FONT_SIZE
#undef FONT_COLOR
+#undef WARNING_FONT_COLOR
#undef FONT_STYLE
#undef SCROLL_SPEED
\ No newline at end of file
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 8cdd74790ac..9cb2c7db4d6 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -248,14 +248,14 @@
if(!protected)
playsound(src.loc, "sparks", 75, 1, -1)
- user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere."
+ to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.")
return*/
else //welp, the guy is protected, we can continue
if(src.issuperUV)
- user << "You slide the dial back towards \"185nm\"."
+ to_chat(user, "You slide the dial back towards \"185nm\".")
src.issuperUV = 0
else
- user << "You crank the dial all the way up to \"15nm\"."
+ to_chat(user, "You crank the dial all the way up to \"15nm\".")
src.issuperUV = 1
return
@@ -274,10 +274,10 @@
if(!protected)
playsound(src.loc, "sparks", 75, 1, -1)
- user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere."
+ to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.")
return*/
else
- user << "You push the button. The coloured LED next to it changes."
+ to_chat(user, "You push the button. The coloured LED next to it changes.")
src.safetieson = !src.safetieson
@@ -326,7 +326,7 @@
/obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob)
if(src.islocked || src.isUV)
- user << "Unable to open unit."
+ to_chat(user, "Unable to open unit.")
return
if(src.OCCUPANT)
src.eject_occupant(user)
@@ -337,7 +337,7 @@
/obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob)
if(src.OCCUPANT && src.safetieson)
- user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments."
+ to_chat(user, "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.")
return
if(src.isopen)
return
@@ -349,12 +349,12 @@
if(src.isUV || src.isopen) //I'm bored of all these sanity checks
return
if(src.OCCUPANT && src.safetieson)
- user << "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle."
+ to_chat(user, "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle.")
return
if(!src.HELMET && !src.MASK && !src.SUIT && !src.OCCUPANT ) //shit's empty yo
- user << "Unit storage bays empty. Nothing to disinfect -- Aborting."
+ to_chat(user, "Unit storage bays empty. Nothing to disinfect -- Aborting.")
return
- user << "You start the Unit's cauterisation cycle."
+ to_chat(user, "You start the Unit's cauterisation cycle.")
src.cycletime_left = 20
src.isUV = 1
if(src.OCCUPANT && !src.islocked)
@@ -416,10 +416,10 @@
if(src.OCCUPANT)
if(src.issuperUV)
OCCUPANT.take_organ_damage(0,40)
- user << "Test. You gave him 40 damage"
+ to_chat(user, "Test. You gave him 40 damage")
else
OCCUPANT.take_organ_damage(0,8)
- user << "Test. You gave him 8 damage"
+ to_chat(user, "Test. You gave him 8 damage")
return*/
@@ -440,9 +440,9 @@
if (src.OCCUPANT.client)
if(user != OCCUPANT)
- OCCUPANT << "The machine kicks you out!"
+ to_chat(OCCUPANT, "The machine kicks you out!")
if(user.loc != src.loc)
- OCCUPANT << "You leave the not-so-cozy confines of the SSU."
+ to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.")
src.OCCUPANT.client.eye = src.OCCUPANT.client.mob
src.OCCUPANT.client.perspective = MOB_PERSPECTIVE
@@ -476,13 +476,13 @@
if (usr.stat != 0)
return
if (!src.isopen)
- usr << "The unit's doors are shut."
+ to_chat(usr, "The unit's doors are shut.")
return
if (!src.ispowered || src.isbroken)
- usr << "The unit is not operational."
+ to_chat(usr, "The unit is not operational.")
return
if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) )
- usr << "It's too cluttered inside for you to fit in!"
+ to_chat(usr, "It's too cluttered inside for you to fit in!")
return
visible_message("[usr] starts squeezing into the suit storage unit!")
if(do_after(usr, 10, target = usr))
@@ -512,7 +512,7 @@
if(istype(I, /obj/item/weapon/screwdriver))
src.panelopen = !src.panelopen
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )
+ to_chat(user, text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") ))
src.updateUsrDialog()
return
if ( istype(I, /obj/item/weapon/grab) )
@@ -520,13 +520,13 @@
if( !(ismob(G.affecting)) )
return
if (!src.isopen)
- usr << "The unit's doors are shut."
+ to_chat(usr, "The unit's doors are shut.")
return
if (!src.ispowered || src.isbroken)
- usr << "The unit is not operational."
+ to_chat(usr, "The unit is not operational.")
return
if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
- user << "The unit's storage area is too cluttered."
+ to_chat(user, "The unit's storage area is too cluttered.")
return
visible_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.")
if(do_after(user, 20, target = G:affecting))
@@ -552,9 +552,9 @@
return
var/obj/item/clothing/suit/space/S = I
if(src.SUIT)
- user << "The unit already contains a suit."
+ to_chat(user, "The unit already contains a suit.")
return
- user << "You load the [S.name] into the storage compartment."
+ to_chat(user, "You load the [S.name] into the storage compartment.")
user.drop_item()
S.loc = src
src.SUIT = S
@@ -566,9 +566,9 @@
return
var/obj/item/clothing/head/helmet/H = I
if(src.HELMET)
- user << "The unit already contains a helmet."
+ to_chat(user, "The unit already contains a helmet.")
return
- user << "You load the [H.name] into the storage compartment."
+ to_chat(user, "You load the [H.name] into the storage compartment.")
user.drop_item()
H.loc = src
src.HELMET = H
@@ -580,9 +580,9 @@
return
var/obj/item/clothing/mask/M = I
if(src.MASK)
- user << "The unit already contains a mask."
+ to_chat(user, "The unit already contains a mask.")
return
- user << "You load the [M.name] into the storage compartment."
+ to_chat(user, "You load the [M.name] into the storage compartment.")
user.drop_item()
M.loc = src
src.MASK = M
@@ -678,11 +678,11 @@
return
if(locked)
- user << "\red The suit cycler is locked."
+ to_chat(user, "\red The suit cycler is locked.")
return
if(src.contents.len > 0)
- user << "\red There is no room inside the cycler for [G.affecting.name]."
+ to_chat(user, "\red There is no room inside the cycler for [G.affecting.name].")
return
visible_message("[user] starts putting [G.affecting.name] into the suit cycler.")
@@ -705,21 +705,21 @@
else if(istype(I,/obj/item/weapon/screwdriver))
panel_open = !panel_open
- user << "You [panel_open ? "open" : "close"] the maintenance panel."
+ to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
src.updateUsrDialog()
return
else if(istype(I,/obj/item/clothing/head/helmet/space))
if(locked)
- user << "\red The suit cycler is locked."
+ to_chat(user, "\red The suit cycler is locked.")
return
if(helmet)
- user << "The cycler already contains a helmet."
+ to_chat(user, "The cycler already contains a helmet.")
return
- user << "You fit \the [I] into the suit cycler."
+ to_chat(user, "You fit \the [I] into the suit cycler.")
user.drop_item()
I.loc = src
helmet = I
@@ -731,24 +731,24 @@
else if(istype(I,/obj/item/clothing/suit/space/rig))
if(locked)
- user << "\red The suit cycler is locked."
+ to_chat(user, "\red The suit cycler is locked.")
return
if(suit)
- user << "The cycler already contains a hardsuit."
+ to_chat(user, "The cycler already contains a hardsuit.")
return
var/obj/item/clothing/suit/space/rig/S = I
if(S.helmet)
- user << "\The [S] will not fit into the cycler with a helmet attached."
+ to_chat(user, "\The [S] will not fit into the cycler with a helmet attached.")
return
if(S.boots)
- user << "\The [S] will not fit into the cycler with boots attached."
+ to_chat(user, "\The [S] will not fit into the cycler with boots attached.")
return
- user << "You fit \the [I] into the suit cycler."
+ to_chat(user, "You fit \the [I] into the suit cycler.")
user.drop_item()
I.loc = src
suit = I
@@ -761,11 +761,11 @@
/obj/machinery/suit_cycler/emag_act(user as mob)
if(emagged)
- user << "\red The cycler has already been subverted."
+ to_chat(user, "\red The cycler has already been subverted.")
return
//Clear the access reqs, disable the safeties, and open up all paintjobs.
- user << "\red You run the sequencer across the interface, corrupting the operating protocols."
+ to_chat(user, "\red You run the sequencer across the interface, corrupting the operating protocols.")
departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$")
emagged = 1
safeties = 0
@@ -885,14 +885,14 @@
if(src.allowed(usr))
locked = !locked
- usr << "You [locked ? "" : "un"]lock \the [src]."
+ to_chat(usr, "You [locked ? "" : "un"]lock \the [src].")
else
- usr << "\red Access denied."
+ to_chat(usr, "\red Access denied.")
else if(href_list["begin_decontamination"])
if(safeties && occupant)
- usr << "\red The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle."
+ to_chat(usr, "\red The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle.")
return
active = 1
@@ -912,7 +912,7 @@
/* else if ((href_list["cutwire"]) && (src.panel_open))
var/twire = text2num(href_list["cutwire"])
if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))
- usr << "You need wirecutters!"
+ to_chat(usr, "You need wirecutters!")
return
if (src.isWireColorCut(twire))
src.mend(twire)
@@ -922,10 +922,10 @@
else if ((href_list["pulsewire"]) && (src.panel_open))
var/twire = text2num(href_list["pulsewire"])
if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
- usr << "You need a multitool!"
+ to_chat(usr, "You need a multitool!")
return
if (src.isWireColorCut(twire))
- usr << "You can't pulse a cut wire."
+ to_chat(usr, "You can't pulse a cut wire.")
return
else
src.pulse(twire)*/
@@ -991,7 +991,7 @@
/obj/machinery/suit_cycler/proc/eject_occupant(mob/user as mob)
if(locked || active)
- user << "\red The cycler is locked."
+ to_chat(user, "\red The cycler is locked.")
return
if (!occupant)
diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm
index 13cf95708b8..ebe6459b996 100644
--- a/code/game/machinery/supply_display.dm
+++ b/code/game/machinery/supply_display.dm
@@ -4,19 +4,20 @@
/obj/machinery/status_display/supply_display/update()
if(!..() && mode == STATUS_DISPLAY_CUSTOM)
- var/line1
- var/line2
if(shuttle_master.supply.mode == SHUTTLE_IDLE)
if(shuttle_master.supply.z == ZLEVEL_STATION)
- line1 = "CARGO"
- line2 = "Docked"
+ message1 = "CARGO"
+ message2 = "Docked"
+ else
+ message1 = "TIME"
+ message2 = worldtime2text()
else
- line1 = "CARGO"
- line2 = get_supply_shuttle_timer()
- if(lentext(line2) > CHARS_PER_LINE)
- line2 = "Error"
+ message1 = "CARGO"
+ shuttle_master.supply.getTimerStr()
+ if(lentext(message2) > CHARS_PER_LINE)
+ message2 = "Error"
- update_display(line1, line2)
+ update_display(message1, message2)
return 1
return 0
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 11ec8837c87..7790cf10ebc 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -85,13 +85,13 @@
N.mind.objectives += escape_objective
- M << "You have joined the ranks of the Syndicate and become a traitor to the station!"
+ to_chat(M, "You have joined the ranks of the Syndicate and become a traitor to the station!")
message_admins("[key_name_admin(N)] has accepted a traitor objective from a syndicate beacon.")
var/obj_count = 1
for(var/datum/objective/OBJ in M.mind.objectives)
- M << "Objective #[obj_count]: [OBJ.explanation_text]"
+ to_chat(M, "Objective #[obj_count]: [OBJ.explanation_text]")
obj_count++
src.add_fingerprint(usr)
@@ -125,7 +125,8 @@
/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null)
if(surplus() < 1500)
- if(user) user << "The connected wire doesn't have enough current."
+ if(user)
+ to_chat(user, "The connected wire doesn't have enough current.")
return
for(var/obj/singularity/singulo in singularities)
if(singulo.z == z)
@@ -134,7 +135,7 @@
active = 1
machines |= src
if(user)
- user << "You activate the beacon."
+ to_chat(user, "You activate the beacon.")
/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null)
@@ -144,7 +145,7 @@
icon_state = "[icontype]0"
active = 0
if(user)
- user << "You deactivate the beacon."
+ to_chat(user, "You deactivate the beacon.")
/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob)
@@ -155,27 +156,27 @@
if(anchored)
return active ? Deactivate(user) : Activate(user)
else
- user << "You need to screw the beacon to the floor first!"
+ to_chat(user, "You need to screw the beacon to the floor first!")
return
/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/screwdriver))
if(active)
- user << "You need to deactivate the beacon first!"
+ to_chat(user, "You need to deactivate the beacon first!")
return
if(anchored)
anchored = 0
- user << "You unscrew the beacon from the floor."
+ to_chat(user, "You unscrew the beacon from the floor.")
disconnect_from_network()
return
else
if(!connect_to_network())
- user << "This device must be placed over an exposed cable."
+ to_chat(user, "This device must be placed over an exposed cable.")
return
anchored = 1
- user << "You screw the beacon to the floor and attach the cable."
+ to_chat(user, "You screw the beacon to the floor and attach the cable.")
return
..()
return
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index a81c00604db..fe443662616 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -47,7 +47,7 @@
/obj/machinery/syndicatebomb/examine(mob/user)
..(user)
- user << "A digital display on it reads \"[timer]\"."
+ to_chat(user, "A digital display on it reads \"[timer]\".")
/obj/machinery/syndicatebomb/update_icon()
icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]"
@@ -56,25 +56,25 @@
if(istype(I, /obj/item/weapon/wrench))
if(!anchored)
if(!isturf(src.loc) || istype(src.loc, /turf/space))
- user << "The bomb must be placed on solid ground to attach it"
+ to_chat(user, "The bomb must be placed on solid ground to attach it")
else
- user << "You firmly wrench the bomb to the floor"
+ to_chat(user, "You firmly wrench the bomb to the floor")
playsound(loc, 'sound/items/ratchet.ogg', 50, 1)
anchored = 1
if(active)
- user << "The bolts lock in place"
+ to_chat(user, "The bolts lock in place")
else
if(!active)
- user << "You wrench the bomb from the floor"
+ to_chat(user, "You wrench the bomb from the floor")
playsound(loc, 'sound/items/ratchet.ogg', 50, 1)
anchored = 0
else
- user << "The bolts are locked down!"
+ to_chat(user, "The bolts are locked down!")
else if(istype(I, /obj/item/weapon/screwdriver))
open_panel = !open_panel
update_icon()
- user << "You [open_panel ? "open" : "close"] the wire panel."
+ to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.")
else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler ))
if(open_panel)
@@ -83,23 +83,23 @@
else if(istype(I, /obj/item/weapon/crowbar))
if(open_panel && isWireCut(WIRE_BOOM) && isWireCut(WIRE_UNBOLT) && isWireCut(WIRE_DELAY) && isWireCut(WIRE_PROCEED) && isWireCut(WIRE_ACTIVATE))
if(payload)
- user << "You carefully pry out [payload]."
+ to_chat(user, "You carefully pry out [payload].")
payload.loc = user.loc
payload = null
else
- user << "There isn't anything in here to remove!"
+ to_chat(user, "There isn't anything in here to remove!")
else if (open_panel)
- user << "The wires conneting the shell to the explosives are holding it down!"
+ to_chat(user, "The wires conneting the shell to the explosives are holding it down!")
else
- user << "The cover is screwed on, it won't pry off!"
+ to_chat(user, "The cover is screwed on, it won't pry off!")
else if(istype(I, /obj/item/weapon/bombcore))
if(!payload)
payload = I
- user << "You place [payload] into [src]."
+ to_chat(user, "You place [payload] into [src].")
user.drop_item()
payload.loc = src
else
- user << "[payload] is already loaded into [src], you'll have to remove it first."
+ to_chat(user, "[payload] is already loaded into [src], you'll have to remove it first.")
else
..()
@@ -118,7 +118,7 @@
settings(user)
return
else if(anchored)
- user << "The bomb is bolted to the floor!"
+ to_chat(user, "The bomb is bolted to the floor!")
return
/obj/machinery/syndicatebomb/proc/settings(var/mob/user)
@@ -310,7 +310,7 @@
detonated++
existant++
playsound(user, 'sound/machines/click.ogg', 20, 1)
- user << "[existant] found, [detonated] triggered."
+ to_chat(user, "[existant] found, [detonated] triggered.")
if(detonated)
var/turf/T = get_turf(src)
var/area/A = get_area(T)
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index a16bbe7b870..5e46a20dd6d 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -90,9 +90,12 @@
race = "Artificial Life"
else if(isslime(M)) // NT knows a lot about slimes, but not aliens. Can identify slimes
- race = "slime"
+ race = "Slime"
language = race
+ else if(isbot(M))
+ race = "Bot"
+
else if(isanimal(M))
race = "Domestic Animal"
language = race
@@ -184,7 +187,7 @@
if(href_list["delete"])
if(!src.allowed(usr) && !emagged)
- usr << "\red ACCESS DENIED."
+ to_chat(usr, "\red ACCESS DENIED.")
return
if(SelectedServer)
@@ -222,7 +225,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (src.stat & BROKEN)
- user << "\blue The broken glass falls out."
+ to_chat(user, "\blue The broken glass falls out.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard(loc)
var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
@@ -234,7 +237,7 @@
A.anchored = 1
qdel(src)
else
- user << "\blue You disconnect the monitor."
+ to_chat(user, "\blue You disconnect the monitor.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
for (var/obj/C in src)
@@ -251,4 +254,4 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << "\blue You you disable the security protocols"
+ to_chat(user, "\blue You you disable the security protocols")
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 04a88492cd2..da9fe5a046e 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -23,26 +23,26 @@
switch(construct_op)
if(0)
if(istype(P, /obj/item/weapon/screwdriver))
- user << "You unfasten the bolts."
+ to_chat(user, "You unfasten the bolts.")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
construct_op++
if(1)
if(istype(P, /obj/item/weapon/screwdriver))
- user << "You fasten the bolts."
+ to_chat(user, "You fasten the bolts.")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
construct_op--
if(istype(P, /obj/item/weapon/wrench))
- user << "You dislodge the external plating."
+ to_chat(user, "You dislodge the external plating.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
construct_op++
if(2)
if(istype(P, /obj/item/weapon/wrench))
- user << "You secure the external plating."
+ to_chat(user, "You secure the external plating.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
construct_op--
if(istype(P, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
- user << "You remove the cables."
+ to_chat(user, "You remove the cables.")
construct_op++
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( user.loc )
A.amount = 5
@@ -51,7 +51,7 @@
if(istype(P, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/A = P
if(A.amount >= 5)
- user << "You insert the cables."
+ to_chat(user, "You insert the cables.")
A.amount -= 5
if(A.amount <= 0)
user.drop_item()
@@ -59,10 +59,10 @@
construct_op--
stat &= ~BROKEN // the machine's not borked anymore!
if(istype(P, /obj/item/weapon/crowbar))
- user << "You begin prying out the circuit board other components..."
+ to_chat(user, "You begin prying out the circuit board other components...")
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
if(do_after(user,60, target = src))
- user << "You finish prying out the components."
+ to_chat(user, "You finish prying out the components.")
// Drop all the component stuff
if(component_parts)
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index c0ab1c0baa0..9d9481aba04 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -39,7 +39,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
if(!on)
return
- //world << "[src] ([src.id]) - [signal.debug_print()]"
+// to_chat(world, "[src] ([src.id]) - [signal.debug_print()]")
var/send_count = 0
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index f966f477057..16528b73d0e 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -131,7 +131,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (src.stat & BROKEN)
- user << "\blue The broken glass falls out."
+ to_chat(user, "\blue The broken glass falls out.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard(loc)
var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
@@ -143,7 +143,7 @@
A.anchored = 1
qdel(src)
else
- user << "\blue You disconnect the monitor."
+ to_chat(user, "\blue You disconnect the monitor.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
for (var/obj/C in src)
@@ -160,4 +160,4 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << "\blue You you disable the security protocols"
\ No newline at end of file
+ to_chat(user, "\blue You you disable the security protocols")
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index 8f08ca9c92f..a5ee6631037 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -193,7 +193,7 @@
user.set_machine(src)
if(!allowed(user) && !emagged)
- user << "Access Denied."
+ to_chat(user, "Access Denied.")
return 0
switch(href_list["choice"])
@@ -343,7 +343,7 @@
playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (src.stat & BROKEN)
- user << "\blue The broken glass falls out."
+ to_chat(user, "\blue The broken glass falls out.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard(loc)
var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
@@ -355,7 +355,7 @@
A.anchored = 1
qdel(src)
else
- user << "\blue You disconnect the monitor."
+ to_chat(user, "\blue You disconnect the monitor.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
for (var/obj/C in src)
@@ -372,7 +372,7 @@
if(!emagged)
playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << "\blue You you disable the security protocols"
+ to_chat(user, "\blue You you disable the security protocols")
/obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user)
if(issilicon(user) || in_range(user, src))
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 6d0f70fc528..1933c022e16 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -43,11 +43,11 @@
var/obj/item/device/gps/L = I
if(L.locked_location && !(stat & (NOPOWER|BROKEN)))
if(!user.unEquip(L))
- user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]")
return
L.loc = src
locked = L
- user << "You insert the GPS device into the [name]'s slot."
+ to_chat(user, "You insert the GPS device into the [name]'s slot.")
else
..()
return
@@ -55,7 +55,7 @@
/obj/machinery/computer/teleporter/emag_act(user as mob)
if(!emagged)
emagged = 1
- user << "\blue The teleporter can now lock on to Syndicate beacons!"
+ to_chat(user, "\blue The teleporter can now lock on to Syndicate beacons!")
else
ui_interact(user)
@@ -103,11 +103,11 @@
return
if(!check_hub_connection())
- usr << "Error: Unable to detect hub."
+ to_chat(usr, "Error: Unable to detect hub.")
nanomanager.update_uis(src)
return
if(calibrating)
- usr << "Error: Calibration in progress. Stand by."
+ to_chat(usr, "Error: Calibration in progress. Stand by.")
nanomanager.update_uis(src)
return
@@ -131,11 +131,11 @@
nanomanager.update_uis(src)
if(href_list["calibrate"])
if(!target)
- usr << "Error: No target set to calibrate to."
+ to_chat(usr, "Error: No target set to calibrate to.")
nanomanager.update_uis(src)
return
if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3)
- usr << "Hub is already calibrated."
+ to_chat(usr, "Hub is already calibrated.")
nanomanager.update_uis(src)
return
src.visible_message("Processing hub calibration to target...")
@@ -218,7 +218,7 @@
var/list/areaindex = list()
var/list/S = power_station.linked_stations
if(!S.len)
- user << "No connected stations located."
+ to_chat(user, "No connected stations located.")
return
for(var/obj/machinery/teleport/station/R in S)
var/turf/T = get_turf(R)
@@ -318,7 +318,7 @@
/obj/machinery/teleport/hub/Bumped(M as mob|obj)
if(z == ZLEVEL_CENTCOMM)
- M << "You can't use this here."
+ to_chat(M, "You can't use this here.")
if(power_station && power_station.engaged && !panel_open)
//--FalseIncarnate
//Prevents AI cores from using the teleporter, prints out failure messages for clarity
@@ -330,7 +330,7 @@
"\red You cannot interface with this technology and get rejected!",
"\red External firewalls prevent you from utilizing this machine!",
"\red Your AI core's anti-bluespace failsafes trigger and prevent teleportation!")
- T<< "[pick(TPError)]"
+ to_chat(T, "[pick(TPError)]")
return
else
teleport(M)
@@ -435,9 +435,9 @@
if(linked_stations.len < efficiency)
linked_stations.Add(M.buffer)
M.buffer = null
- user << "You upload the data from the [W.name]'s buffer."
+ to_chat(user, "You upload the data from the [W.name]'s buffer.")
else
- user << "This station can't hold more information, try to use better parts."
+ to_chat(user, "This station can't hold more information, try to use better parts.")
if(default_deconstruction_screwdriver(user, "controller-o", "controller", W))
update_icon()
return
@@ -451,11 +451,11 @@
if(istype(W, /obj/item/device/multitool))
var/obj/item/device/multitool/M = W
M.buffer = src
- user << "You download the data to the [W.name]'s buffer."
+ to_chat(user, "You download the data to the [W.name]'s buffer.")
return
if(istype(W, /obj/item/weapon/wirecutters))
link_console_and_hub()
- user << "You reconnect the station to nearby machinery."
+ to_chat(user, "You reconnect the station to nearby machinery.")
return
/obj/machinery/teleport/station/attack_ai()
@@ -465,13 +465,13 @@
if(!panel_open)
toggle(user)
else
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
/obj/machinery/teleport/station/proc/toggle(mob/user)
if (stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console)
return
if (teleporter_hub.panel_open)
- user << "Close the hub's maintenance panel first."
+ to_chat(user, "Close the hub's maintenance panel first.")
return
if (teleporter_console.target)
src.engaged = !src.engaged
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 2e99d634d60..d117961ff88 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -131,7 +131,7 @@
AM.loc = src.loc
do_transform_mime(AM)
else
- AM << "Only items can be greyscaled."
+ to_chat(AM, "Only items can be greyscaled.")
return
/obj/machinery/transformer/proc/do_transform_mime(var/obj/item/I)
diff --git a/code/game/machinery/turntable.dm b/code/game/machinery/turntable.dm
index 84a91ced929..bb69783db22 100644
--- a/code/game/machinery/turntable.dm
+++ b/code/game/machinery/turntable.dm
@@ -43,7 +43,7 @@
..()
if( href_list["on1"] )
if(src.playing == 0)
- //world << "Should be working..."
+// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop1.ogg')
S.repeat = 1
S.channel = 10
@@ -52,8 +52,8 @@
S.environment = 0
//for(var/mob/M in world)
// if(M.loc.loc == src.loc.loc && M.music == 0)
- // world << "Found the song..."
- // M << S
+// to_chat(world, "Found the song...")
+// to_chat(M, S)
// M.music = 1
var/area/A = src.loc.loc
@@ -63,19 +63,19 @@
while(playing == 1)
for(var/mob/M in world)
if((M.loc.loc in A) && M.music == 0)
- //world << "Found the song..."
- M << S
+// to_chat(world, "Found the song...")
+ to_chat(M, S)
M.music = 1
else if(!(M.loc.loc in A) && M.music == 1)
var/sound/Soff = sound(null)
Soff.channel = 10
- M << Soff
+ to_chat(M, Soff)
M.music = 0
sleep(10)
return
if( href_list["on2"] )
if(src.playing == 0)
- //world << "Should be working..."
+// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop2.ogg')
S.repeat = 1
S.channel = 10
@@ -84,8 +84,8 @@
S.environment = 0
//for(var/mob/M in world)
// if(M.loc.loc == src.loc.loc && M.music == 0)
- // world << "Found the song..."
- // M << S
+// to_chat(world, "Found the song...")
+// to_chat(M, S)
// M.music = 1
var/area/A = src.loc.loc
for(var/obj/machinery/party/lasermachine/L in A)
@@ -94,19 +94,19 @@
while(playing == 1)
for(var/mob/M in world)
if(M.loc.loc == src.loc.loc && M.music == 0)
- //world << "Found the song..."
- M << S
+// to_chat(world, "Found the song...")
+ to_chat(M, S)
M.music = 1
else if(M.loc.loc != src.loc.loc && M.music == 1)
var/sound/Soff = sound(null)
Soff.channel = 10
- M << Soff
+ to_chat(M, Soff)
M.music = 0
sleep(10)
return
if( href_list["on3"] )
if(src.playing == 0)
- //world << "Should be working..."
+// to_chat(world, "Should be working...")
var/sound/S = sound('sound/turntable/TestLoop3.ogg')
S.repeat = 1
S.channel = 10
@@ -115,8 +115,8 @@
S.environment = 0
//for(var/mob/M in world)
// if(M.loc.loc == src.loc.loc && M.music == 0)
- // world << "Found the song..."
- // M << S
+// to_chat(world, "Found the song...")
+// to_chat(M, S)
// M.music = 1
var/area/A = src.loc.loc
for(var/obj/machinery/party/lasermachine/L in A)
@@ -125,13 +125,13 @@
while(playing == 1)
for(var/mob/M in world)
if(M.loc.loc == src.loc.loc && M.music == 0)
- //world << "Found the song..."
- M << S
+// to_chat(world, "Found the song...")
+ to_chat(M, S)
M.music = 1
else if(M.loc.loc != src.loc.loc && M.music == 1)
var/sound/Soff = sound(null)
Soff.channel = 10
- M << Soff
+ to_chat(M, Soff)
M.music = 0
sleep(10)
return
@@ -143,7 +143,7 @@
S.channel = 10
S.wait = 1
for(var/mob/M in world)
- M << S
+ to_chat(M, S)
M.music = 0
playing = 0
var/area/A = src.loc.loc
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 4dc36dbd2e3..0deb0d947a3 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -65,11 +65,11 @@
/obj/machinery/turretid/proc/isLocked(mob/user)
if(ailock && (isrobot(user) || isAI(user)))
- user << "There seems to be a firewall preventing you from accessing this device."
+ to_chat(user, "There seems to be a firewall preventing you from accessing this device.")
return 1
if(locked && !(isrobot(user) || isAI(user) || isobserver(user)))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return 1
return 0
@@ -87,16 +87,16 @@
if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if(src.allowed(usr))
if(emagged)
- user << "The turret control is unresponsive."
+ to_chat(user, "The turret control is unresponsive.")
else
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the panel."
+ to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.")
return
return ..()
/obj/machinery/turretid/emag_act(user as mob)
if(!emagged)
- user << "You short out the turret controls' access analysis module."
+ to_chat(user, "You short out the turret controls' access analysis module.")
emagged = 1
locked = 0
ailock = 0
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index e4b9a290441..ef5db5f833b 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -184,7 +184,7 @@
cur_target = get_new_target() //get new target
if(cur_target) //if it's found, proceed
-// world << "[cur_target]"
+// to_chat(world, "[cur_target]")
if(!isPopping())
if(isDown())
popUp()
@@ -336,7 +336,7 @@
if (src.health <= 0)
src.die()
else
- M << "That object is useless to you."
+ to_chat(M, "That object is useless to you.")
return
@@ -352,7 +352,7 @@
if (src.health <= 0)
src.die()
else
- M << "\green That object is useless to you."
+ to_chat(M, "\green That object is useless to you.")
return
@@ -362,7 +362,7 @@
return 1
if (src.locked)
if (!istype(usr, /mob/living/silicon))
- usr << "Control panel is locked!"
+ to_chat(usr, "Control panel is locked!")
return
if (href_list["toggleOn"])
src.enabled = !src.enabled
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 9a6b551a843..81799f01115 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -102,7 +102,7 @@
wires = new(src)
spawn(50)
if(product_slogans)
- slogan_list += text2list(product_slogans, ";")
+ slogan_list += splittext(product_slogans, ";")
// So not all machines speak at the exact same time.
// The first time this machine says something will be at slogantime + this random value,
@@ -110,7 +110,7 @@
last_slogan = world.time + rand(0, slogan_delay)
if(product_ads)
- ads_list += text2list(product_ads, ";")
+ ads_list += splittext(product_ads, ";")
build_inventory()
power_change()
@@ -188,7 +188,7 @@
for(var/datum/data/vending_product/machine_content in machine)
if(machine_content.amount != machine_content.max_amount)
if(user)
- user << "[machine_content.max_amount - machine_content.amount] of [machine_content.product_name]"
+ to_chat(user, "[machine_content.max_amount - machine_content.amount] of [machine_content.product_name]")
machine_content.amount = machine_content.max_amount
refill.charges -= to_restock
total = to_restock
@@ -203,7 +203,7 @@
total += restock
if(restock)
if(user)
- user << "[restock] of [machine_content.product_name]"
+ to_chat(user, "[restock] of [machine_content.product_name]")
if(refill.charges == 0) //due to rounding, we ran out of refill charges, exit.
break
return total
@@ -234,7 +234,7 @@
if(istype(W, /obj/item/weapon/screwdriver) && anchored)
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
panel_open = !panel_open
- user << "You [panel_open ? "open" : "close"] the maintenance panel."
+ to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
overlays.Cut()
if(panel_open)
overlays += image(icon, "[initial(icon_state)]-panel")
@@ -259,32 +259,32 @@
W.loc = src
coin = W
categories |= CAT_COIN
- user << "\blue You insert the [W] into the [src]"
+ to_chat(user, "\blue You insert the [W] into the [src]")
nanomanager.update_uis(src)
return
else if(istype(W, refill_canister) && refill_canister != null)
if(stat & (BROKEN|NOPOWER))
- user << "It does nothing."
+ to_chat(user, "It does nothing.")
else if(panel_open)
//if the panel is open we attempt to refill the machine
var/obj/item/weapon/vending_refill/canister = W
if(canister.charges == 0)
- user << "This [canister.name] is empty!"
+ to_chat(user, "This [canister.name] is empty!")
else
var/transfered = refill_inventory(canister,product_records,user)
if(transfered)
- user << "You loaded [transfered] items in \the [name]."
+ to_chat(user, "You loaded [transfered] items in \the [name].")
else
- user << "The [name] is fully stocked."
+ to_chat(user, "The [name] is fully stocked.")
return;
else
- user << "You should probably unscrew the service panel first."
+ to_chat(user, "You should probably unscrew the service panel first.")
else
..()
/obj/machinery/vending/emag_act(user as mob)
emagged = 1
- user << "You short out the product lock on [src]"
+ to_chat(user, "You short out the product lock on [src]")
return
/**
@@ -296,7 +296,7 @@
if(currently_vending.price > cashmoney.get_total())
// This is not a status display message, since it's something the character
// themselves is meant to see BEFORE putting the money in
- usr << "\icon[cashmoney] That is not enough money."
+ to_chat(usr, "\icon[cashmoney] That is not enough money.")
return 0
// Bills (banknotes) cannot really have worth different than face value,
@@ -454,12 +454,12 @@
if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon))
if(!coin)
- usr << "There is no coin in this machine."
+ to_chat(usr, "There is no coin in this machine.")
return
usr.put_in_hands(coin)
coin = null
- usr << "\blue You remove the [coin] from the [src]"
+ to_chat(usr, "\blue You remove the [coin] from the [src]")
categories &= ~CAT_COIN
if (href_list["pay"])
@@ -484,11 +484,12 @@
if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
if(issilicon(usr) && !isrobot(usr))
- usr << "The vending machine refuses to interface with you, as you are not in its target demographic!"
+ to_chat(usr, "The vending machine refuses to interface with you, as you are not in its target demographic!")
return
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
- usr << "Access denied." //Unless emagged of course
+ to_chat(usr, "Access denied.")//Unless emagged of course
+
flick(icon_deny,src)
return
@@ -521,11 +522,12 @@
/obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user)
if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
- usr << "Access denied." //Unless emagged of course
+ to_chat(usr, "Access denied.")//Unless emagged of course
+
flick(src.icon_deny,src)
return
if(!R.amount)
- user << "\red The vending machine has ran out of that product."
+ to_chat(user, "\red The vending machine has ran out of that product.")
return
src.vend_ready = 0 //One thing at a time!!
src.status_message = "Vending..."
@@ -534,13 +536,13 @@
if (R.category & CAT_COIN)
if(!coin)
- user << "\blue You need to insert a coin to get this item."
+ to_chat(user, "\blue You need to insert a coin to get this item.")
return
if(coin.string_attached)
if(prob(50))
- user << "\blue You successfully pull the coin out before the [src] could swallow it."
+ to_chat(user, "\blue You successfully pull the coin out before the [src] could swallow it.")
else
- user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all."
+ to_chat(user, "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all.")
coin = null
qdel(coin)
categories &= ~CAT_COIN
@@ -569,7 +571,7 @@
/obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user)
if(src.panel_open)
- user << "\blue You stock the [src] with \a [R.product_name]"
+ to_chat(user, "\blue You stock the [src] with \a [R.product_name]")
R.amount++
src.updateUsrDialog()
@@ -1008,7 +1010,13 @@
vend_delay = 15
vend_reply = "Have an enchanted evening!"
product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!"
- products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/twohanded/staff = 2)
+ products = list(/obj/item/clothing/head/wizard = 1,
+ /obj/item/clothing/suit/wizrobe = 1,
+ /obj/item/clothing/head/wizard/red = 1,
+ /obj/item/clothing/suit/wizrobe/red = 1,
+ /obj/item/clothing/shoes/sandal = 1,
+ /obj/item/weapon/twohanded/staff = 2)
+ contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/wizarditis = 1)
/obj/machinery/vending/autodrobe
name = "\improper AutoDrobe"
@@ -1244,7 +1252,7 @@
vend_delay = 15
icon_state = "artvend"
products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/device/camera = 4,/obj/item/device/camera_film = 6,
- /obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/packageWrap = 4,
+ /obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/tape_roll = 5,/obj/item/stack/packageWrap = 4,
/obj/item/weapon/storage/fancy/crayons = 4,/obj/item/weapon/hand_labeler = 4,/obj/item/weapon/paper = 10,
/obj/item/weapon/c_tube = 10,/obj/item/weapon/pen = 5,/obj/item/weapon/pen/blue = 5,
/obj/item/weapon/pen/red = 5)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 4e95938a2a1..6889cf67c42 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -32,7 +32,7 @@
return
if( state != 4 )
- usr << "The washing machine cannot run in this state."
+ to_chat(usr, "The washing machine cannot run in this state.")
return
if( locate(/mob,contents) )
@@ -199,7 +199,7 @@
/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/*if(istype(W,/obj/item/weapon/screwdriver))
panel = !panel
- user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/
+ to_chat(user, "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel")*/
if(istype(W,/obj/item/toy/crayon) ||istype(W,/obj/item/weapon/stamp))
if( state in list( 1, 3, 6 ) )
if(!crayon)
@@ -230,46 +230,46 @@
//YES, it's hardcoded... saves a var/can_be_washed for every single clothing item.
if ( istype(W,/obj/item/clothing/suit/space ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/suit/syndicatefake ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
// if ( istype(W,/obj/item/clothing/suit/powered ) )
-// user << "This item does not fit."
+// to_chat(user, "This item does not fit.")
// return
if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/suit/bomb_suit ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/suit/armor ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/suit/armor ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/mask/gas ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/mask/cigarette ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/head/syndicatefake ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
// if ( istype(W,/obj/item/clothing/head/powered ) )
-// user << "This item does not fit."
+// to_chat(user, "This item does not fit.")
// return
if ( istype(W,/obj/item/clothing/head/helmet ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if ( istype(W,/obj/item/clothing/gloves/furgloves ) )
- user << "This item does not fit."
+ to_chat(user, "This item does not fit.")
return
if(W.flags & NODROP) //if "can't drop" item
- user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!"
+ to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!")
return
if(contents.len < 5)
@@ -278,9 +278,9 @@
W.loc = src
state = 3
else
- user << "\blue You can't put the item in right now."
+ to_chat(user, "\blue You can't put the item in right now.")
else
- user << "\blue The washing machine is full."
+ to_chat(user, "\blue The washing machine is full.")
else
..()
update_icon()
@@ -302,7 +302,7 @@
crayon = null
state = 1
if(5)
- user << "\red The [src] is busy."
+ to_chat(user, "\red The [src] is busy.")
if(6)
state = 7
if(7)
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index dba30d648b0..217b1e70165 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -20,18 +20,18 @@
usr.set_machine(src)
if(!istype(user, /mob/living/carbon/human))
- user << "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's."
+ to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
return
if(is_special_character(user))
- user << "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away."
+ to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.")
return
if(inuse)
- user << "Someone is already communing with the Wish Granter."
+ to_chat(user, "Someone is already communing with the Wish Granter.")
return
- user << "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?"
+ to_chat(user, "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?")
inuse = 1
var/wish
@@ -51,7 +51,7 @@
//Remove the wishgranter or teleport it randomly on the station
if(!types.len)
- user << "The wishgranter slowly fades into mist..."
+ to_chat(user, "The wishgranter slowly fades into mist...")
qdel(src)
return
else
diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm
index 6e0abd177e0..df25e084d19 100644
--- a/code/game/magic/Uristrunes.dm
+++ b/code/game/magic/Uristrunes.dm
@@ -16,6 +16,7 @@ var/list/word_to_uristrune_table = null
words -= w
bit <<= 1
+
return word_to_uristrune_table[word]
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 09f6aad41e6..0d7676d75b7 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -150,7 +150,7 @@
src.occupant_message("Zoom mode [zoom?"en":"dis"]abled.")
if(zoom)
src.occupant.client.view = 12
- src.occupant << sound('sound/mecha/imag_enh.ogg',volume=50)
+ to_chat(src.occupant, sound('sound/mecha/imag_enh.ogg',volume=50))
else
src.occupant.client.view = world.view//world.view - default mob view size
return
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 4f53bd5a796..1967f1e6645 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -52,9 +52,9 @@
chassis.occupant_message("The [src] is destroyed!")
chassis.log_append_to_last("[src] is destroyed.",1)
if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon))
- chassis.occupant << sound('sound/mecha/weapdestr.ogg',volume=50)
+ to_chat(chassis.occupant, sound('sound/mecha/weapdestr.ogg',volume=50))
else
- chassis.occupant << sound('sound/mecha/critdestr.ogg',volume=50)
+ to_chat(chassis.occupant, sound('sound/mecha/critdestr.ogg',volume=50))
chassis = null
return ..()
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 1b0c82f42f7..98db55e0f25 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -545,7 +545,7 @@
return chassis.dynattackby(W,user, params)
chassis.log_message("Attacked by [W]. Attacker - [user]")
if(prob(chassis.deflect_chance*deflect_coeff))
- user << "\red The [W] bounces off [chassis] armor."
+ to_chat(user, "\red The [W] bounces off [chassis] armor.")
chassis.log_append_to_last("Armor saved.")
else
chassis.occupant_message("[user] hits [chassis] with [W].")
@@ -932,7 +932,7 @@
if(isnull(result))
user.visible_message("[user] tries to shove [weapon_name] into [src], but \the [src] rejects it.","[fuel_name] traces in target minimal. [weapon_name] cannot be used as fuel.")
else if(!result)
- user << "Unit is full."
+ to_chat(user, "Unit is full.")
else
user.visible_message("[user] loads [src] with \the [weapon_name].","[result] unit\s of [fuel_name] successfully loaded.")
return
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index ab9589f73e7..d95cbaff799 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -140,7 +140,7 @@
var/mob/living/carbon/human/H = M
if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs))
continue
- M << "HONK"
+ to_chat(M, "HONK")
M.sleeping = 0
M.stuttering = 20
M.ear_deaf = 30
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index b77ee7b9cd8..562e30d834d 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -293,7 +293,7 @@
if(..())
return 1
if(!allowed(user) && !isobserver(user))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return 1
return interact(user)
@@ -505,7 +505,7 @@
default_deconstruction_crowbar(W)
return 1
else
- user << "You can't load \the [name] while it's opened."
+ to_chat(user, "You can't load \the [name] while it's opened.")
return 1
if(istype(W, /obj/item/stack))
@@ -533,10 +533,10 @@
return ..()
if(being_built)
- user << "\The [src] is currently processing. Please wait until completion."
+ to_chat(user, "\The [src] is currently processing. Please wait until completion.")
return
if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator
- user << "\The [src] [material2name(material)] storage is full."
+ to_chat(user, "\The [src] [material2name(material)] storage is full.")
return
var/obj/item/stack/sheet/stack = W
var/sname = "[stack.name]"
@@ -546,12 +546,12 @@
var/transfer_amount = min(stack.amount, round((res_max_amount - resources[material])/MINERAL_MATERIAL_AMOUNT,1))
resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT
stack.use(transfer_amount)
- user << "You insert [transfer_amount] [sname] sheet\s into \the [src]."
+ to_chat(user, "You insert [transfer_amount] [sname] sheet\s into \the [src].")
sleep(10)
updateUsrDialog()
overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted
else
- user << "\The [src] cannot hold any more [sname] sheet\s."
+ to_chat(user, "\The [src] cannot hold any more [sname] sheet\s.")
return
/obj/machinery/mecha_part_fabricator/proc/material2name(var/ID)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 276ed01252b..ceeca47f72e 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -169,19 +169,19 @@
var/integrity = health/initial(health)*100
switch(integrity)
if(85 to 100)
- user << "It's fully intact."
+ to_chat(user, "It's fully intact.")
if(65 to 85)
- user << "It's slightly damaged."
+ to_chat(user, "It's slightly damaged.")
if(45 to 65)
- user << "It's badly damaged."
+ to_chat(user, "It's badly damaged.")
if(25 to 45)
- user << "It's heavily damaged."
+ to_chat(user, "It's heavily damaged.")
else
- user << "It's falling apart."
+ to_chat(user, "It's falling apart.")
if(equipment && equipment.len)
- user << "It's equipped with:"
+ to_chat(user, "It's equipped with:")
for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment)
- user << "\icon[ME] [ME]"
+ to_chat(user, "\icon[ME] [ME]")
return
@@ -300,7 +300,7 @@
/obj/mecha/relaymove(mob/user,direction)
if(user != src.occupant) //While not "realistic", this piece is player friendly.
user.forceMove(get_turf(src))
- user << "You climb out from [src]"
+ to_chat(user, "You climb out from [src]")
return 0
if(connected_port)
if(world.time - last_message > 20)
@@ -458,7 +458,7 @@
internal_damage |= int_dam_flag
pr_internal_damage.start()
log_append_to_last("Internal damage of type [int_dam_flag].",1)
- occupant << sound('sound/machines/warning-buzzer.ogg',wait=0)
+ to_chat(occupant, sound('sound/machines/warning-buzzer.ogg',wait=0))
diag_hud_set_mechstat()
return
@@ -527,12 +527,12 @@
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- user << "\red You slash at the armored suit!"
+ to_chat(user, "\red You slash at the armored suit!")
visible_message("\red The [user] slashes at [src.name]'s armor!")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- user << "\green Your claws had no effect!"
+ to_chat(user, "\green Your claws had no effect!")
src.occupant_message("\blue The [user]'s claws are stopped by the armor.")
visible_message("\blue The [user] rebounds off [src.name]'s armor!")
return
@@ -699,14 +699,14 @@
src.take_damage(6)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
- user << "\red You smash at the armored suit!"
+ to_chat(user, "\red You smash at the armored suit!")
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
V.show_message("\red The [user] smashes against [src.name]'s armor!", 1)
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1)
- user << "\green Your attack had no effect!"
+ to_chat(user, "\green Your attack had no effect!")
src.occupant_message("\blue The [user]'s attack is stopped by the armor.")
for (var/mob/V in viewers(src))
if(V.client && !(V.blinded))
@@ -739,7 +739,7 @@
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(prob(src.deflect_chance))
- user << "\red The [W] bounces off [src.name] armor."
+ to_chat(user, "\red The [W] bounces off [src.name] armor.")
src.log_append_to_last("Armor saved.")
/*
for (var/mob/V in viewers(src))
@@ -761,9 +761,9 @@
if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain))
if(mmi_move_inside(W,user))
- user << "[src]-MMI interface initialized successfuly"
+ to_chat(user, "[src]-MMI interface initialized successfuly")
else
- user << "[src]-MMI interface initialization failed."
+ to_chat(user, "[src]-MMI interface initialization failed.")
return
if(istype(W, /obj/item/mecha_parts/mecha_equipment))
@@ -774,7 +774,7 @@
E.attach(src)
user.visible_message("[user] attaches [W] to [src]", "You attach [W] to [src]")
else
- user << "You were unable to attach [W] to [src]"
+ to_chat(user, "You were unable to attach [W] to [src]")
return
if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if(add_req_access || maint_access)
@@ -788,28 +788,28 @@
output_maintenance_dialog(id_card, user)
return
else
- user << "\red Invalid ID: Access denied."
+ to_chat(user, "\red Invalid ID: Access denied.")
else
- user << "\red Maintenance protocols disabled by operator."
+ to_chat(user, "\red Maintenance protocols disabled by operator.")
else if(istype(W, /obj/item/weapon/wrench))
if(state==1)
state = 2
- user << "You undo the securing bolts."
+ to_chat(user, "You undo the securing bolts.")
else if(state==2)
state = 1
- user << "You tighten the securing bolts."
+ to_chat(user, "You tighten the securing bolts.")
return
else if(istype(W, /obj/item/weapon/crowbar))
if(state==2)
state = 3
- user << "You open the hatch to the power unit"
+ to_chat(user, "You open the hatch to the power unit")
else if(state==3)
state=2
- user << "You close the hatch to the power unit"
+ to_chat(user, "You close the hatch to the power unit")
else if(state==4 && pilot_is_mmi())
// Since having maint protocols available is controllable by the MMI, I see this as a consensual way to remove an MMI without destroying the mech
user.visible_message("[user] begins levering out the MMI from the [src].", "You begin to lever out the MMI from the [src].")
- occupant << "[user] is prying you out of the exosuit!"
+ to_chat(occupant, "[user] is prying you out of the exosuit!")
if(do_after(user,80,target=src))
user.visible_message("[user] pries the MMI out of the [src]!", "You finish removing the MMI from the [src]!")
go_out()
@@ -822,35 +822,35 @@
if(CC.amount > 1)
CC.use(2)
clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
- user << "You replace the fused wires."
+ to_chat(user, "You replace the fused wires.")
else
- user << "There's not enough wire to finish the task."
+ to_chat(user, "There's not enough wire to finish the task.")
return
else if(istype(W, /obj/item/weapon/screwdriver))
if(hasInternalDamage(MECHA_INT_TEMP_CONTROL))
clearInternalDamage(MECHA_INT_TEMP_CONTROL)
- user << "You repair the damaged temperature controller."
+ to_chat(user, "You repair the damaged temperature controller.")
else if(state==3 && src.cell)
src.cell.forceMove(src.loc)
src.cell = null
state = 4
- user << "You unscrew and pry out the powercell."
+ to_chat(user, "You unscrew and pry out the powercell.")
src.log_message("Powercell removed")
else if(state==4 && src.cell)
state=3
- user << "You screw the cell in place"
+ to_chat(user, "You screw the cell in place")
return
else if(istype(W, /obj/item/weapon/stock_parts/cell))
if(state==4)
if(!src.cell)
- user << "You install the powercell"
+ to_chat(user, "You install the powercell")
user.drop_item()
W.forceMove(src)
src.cell = W
src.log_message("Powercell installed")
else
- user << "There's already a powercell installed."
+ to_chat(user, "There's already a powercell installed.")
return
else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM)
@@ -858,19 +858,19 @@
if (WT.remove_fuel(0,user))
if (hasInternalDamage(MECHA_INT_TANK_BREACH))
clearInternalDamage(MECHA_INT_TANK_BREACH)
- user << "\blue You repair the damaged gas tank."
+ to_chat(user, "\blue You repair the damaged gas tank.")
else
return
if(src.health[line2]
" + to_chat(user, "ASSUME DIRECT CONTROL?
") /obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(!..()) @@ -963,14 +963,14 @@ switch(interaction) if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!maint_access) //Mech must be in maint mode to allow carding. - user << "[name] must have maintenance protocols active in order to allow a transfer." + to_chat(user, "[name] must have maintenance protocols active in order to allow a transfer.") return AI = occupant if(!AI || !isAI(occupant)) //Mech does not have an AI for a pilot - user << "No AI detected in the [name] onboard computer." + to_chat(user, "No AI detected in the [name] onboard computer.") return if (AI.mind.special_role == "malfunction") //Malf AIs cannot leave mechs. Except through death. - user << "ACCESS DENIED." + to_chat(user, "ACCESS DENIED.") return AI.aiRestorePowerRoutine = 0//So the AI initially has power. AI.control_disabled = 1 @@ -980,31 +980,31 @@ AI.controlled_mech = null AI.remote_control = null icon_state = initial(icon_state)+"-open" - AI << "You have been downloaded to a mobile storage device. Wireless connection offline." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory." + to_chat(AI, "You have been downloaded to a mobile storage device. Wireless connection offline.") + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory.") if(AI_MECH_HACK) //Called by Malf AI mob on the mech. new /obj/structure/AIcore/deactivated(AI.loc) if(occupant) //Oh, I am sorry, were you using that? - AI << "Pilot detected! Forced ejection initiated!" - occupant << "You have been forcibly ejected!" + to_chat(AI, "Pilot detected! Forced ejection initiated!") + to_chat(occupant, "You have been forcibly ejected!") go_out(1) //IT IS MINE, NOW. SUCK IT, RD! ai_enter_mech(AI, interaction) if(AI_TRANS_FROM_CARD) //Using an AI card to upload to a mech. AI = locate(/mob/living/silicon/ai) in card if(!AI) - user << "There is no AI currently installed on this device." + to_chat(user, "There is no AI currently installed on this device.") return else if(AI.stat || !AI.client) - user << "[AI.name] is currently unresponsive, and cannot be uploaded." + to_chat(user, "[AI.name] is currently unresponsive, and cannot be uploaded.") return else if(occupant || dna) //Normal AIs cannot steal mechs! - user << "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"]." + to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") return AI.control_disabled = 0 AI.aiRadio.disabledAi = 0 - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") ai_enter_mech(AI, interaction) //Hack and From Card interactions share some code, so leave that here for both to use. @@ -1015,15 +1015,15 @@ icon_state = initial(icon_state) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) - occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(occupant, sound('sound/mecha/nominal.ogg',volume=50)) AI.cancel_camera() AI.controlled_mech = src AI.remote_control = src AI.canmove = 1 //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow. AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES. - AI << "[interaction == AI_MECH_HACK ? "Takeover of [name] complete! You are now permanently loaded onto the onboard computer. Do not attempt to leave the station sector!" \ - : "You have been uploaded to a mech's onboard computer."]" - AI << "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions." + to_chat(AI, "[interaction == AI_MECH_HACK ? "Takeover of [name] complete! You are now permanently loaded onto the onboard computer. Do not attempt to leave the station sector!" \ + : "You have been uploaded to a mech's onboard computer."]") + to_chat(AI, "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.") ///////////////////////////////////// //////// Atmospheric stuff //////// @@ -1176,7 +1176,7 @@ return src.log_message("[user] tries to move in.") if (src.occupant) - usr << "The [src.name] is already occupied!" + to_chat(usr, "The [src.name] is already occupied!") src.log_append_to_last("Permission denied.") return var/passed @@ -1187,12 +1187,12 @@ else if(src.operation_allowed(user)) passed = 1 if(!passed) - user << "Access denied." + to_chat(user, "Access denied.") src.log_append_to_last("Permission denied.") return for(var/mob/living/carbon/slime/S in range(1,user)) if(S.Victim == user) - user << "You're too busy getting your life sucked out of you." + to_chat(user, "You're too busy getting your life sucked out of you.") return visible_message("[user] starts to climb into [src.name]") @@ -1201,9 +1201,9 @@ if(!src.occupant) moved_inside(user) else if(src.occupant!=user) - user << "[src.occupant] was faster. Try better next time, loser." + to_chat(user, "[src.occupant] was faster. Try better next time, loser.") else - user << "You stop entering the exosuit." + to_chat(user, "You stop entering the exosuit.") return /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -1223,26 +1223,26 @@ dir = dir_in playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) return 1 else return 0 /obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + to_chat(user, "Consciousness matrix not detected.") return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + to_chat(user, "Beta-rhythm below acceptable level.") return 0 else if(occupant) - user << "Occupant detected." + to_chat(user, "Occupant detected.") return 0 else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) - user << "Stop it!" + to_chat(user, "Stop it!") return 0 //Added a message here since people assume their first click failed or something./N -// user << "Installing MMI, please stand by." +// to_chat(user, "Installing MMI, please stand by.") visible_message("\blue [usr] starts to insert an MMI into [src.name]") @@ -1250,21 +1250,21 @@ if(!occupant) return mmi_moved_inside(mmi_as_oc,user) else - user << "Occupant detected." + to_chat(user, "Occupant detected.") else - user << "You stop inserting the MMI." + to_chat(user, "You stop inserting the MMI.") return 0 /obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + to_chat(user, "Consciousness matrix not detected.") return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + to_chat(user, "Beta-rhythm below acceptable level.") return 0 if(!user.unEquip(mmi_as_oc)) - user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]") return 0 var/mob/brainmob = mmi_as_oc.brainmob brainmob.reset_view(src) @@ -1284,7 +1284,7 @@ dir = dir_in src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) return 1 else return 0 @@ -1367,7 +1367,7 @@ occupant.SetStunned(5) occupant.SetWeakened(5) - occupant << "You were blown out of the mech!" + to_chat(occupant, "You were blown out of the mech!") */ src.log_message("[mob_container] moved out.") occupant.reset_view() @@ -1643,7 +1643,7 @@ /obj/mecha/proc/occupant_message(message as text) if(message) if(src.occupant && src.occupant.client) - src.occupant << "\icon[src] [message]" + to_chat(src.occupant, "\icon[src] [message]") return /obj/mecha/proc/log_message(message as text,red=null) @@ -1755,10 +1755,10 @@ if(user) if(state==0) state = 1 - user << "The securing bolts are now exposed." + to_chat(user, "The securing bolts are now exposed.") else if(state==1) state = 0 - user << "The securing bolts are now hidden." + to_chat(user, "The securing bolts are now hidden.") output_maintenance_dialog(filter.getObj("id_card"),user) return if(href_list["set_internal_tank_valve"] && state >=1) @@ -1768,7 +1768,7 @@ var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num if(new_pressure) internal_tank_valve = new_pressure - user << "The internal pressure valve has been set to [internal_tank_valve]kPa." + to_chat(user, "The internal pressure valve has been set to [internal_tank_valve]kPa.") if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card")) if(!in_range(src, usr)) return operation_req_access += filter.getNum("add_req_access") @@ -1789,7 +1789,7 @@ if(usr != src.occupant) return if(src.occupant && !iscarbon(src.occupant)) - src.occupant << "You do not have any DNA!" + to_chat(src.occupant, "You do not have any DNA!") return src.dna = src.occupant.dna.unique_enzymes src.occupant_message("You feel a prick as the needle takes your DNA sample.") diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 08d0541bfb5..f6d627cc505 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -23,12 +23,12 @@ if(C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + to_chat(user, ("There's not enough cable to finish the task.")) return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + to_chat(user, ("There's not enough material in this stack.")) return 0 else S.use(5) @@ -55,12 +55,12 @@ if (C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + to_chat(user, ("There's not enough cable to finish the task.")) return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + to_chat(user, ("There's not enough material in this stack.")) return 0 else S.use(5) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 647da103a45..8da0f916425 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -43,7 +43,7 @@ qdel(src) else if (isemptylist(welder_salvage)) - user << "What's left on the [src] cannot be removed with a welder, besides the frame itself" + to_chat(user, "What's left on the [src] cannot be removed with a welder, besides the frame itself") else if(WT.remove_fuel(0,user)) var/type = prob(70)?pick(welder_salvage):null if(type) @@ -53,12 +53,12 @@ welder_salvage -= type salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + to_chat(user, "You failed to salvage anything valuable from [src].") else - user << "\blue You need more welding fuel to complete this task." + to_chat(user, "\blue You need more welding fuel to complete this task.") else if(istype(W, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [W]." + to_chat(user, "You don't see anything that can be cut with [W].") return else if(!isemptylist(wirecutters_salvage)) var/type = prob(70)?pick(wirecutters_salvage):null @@ -67,7 +67,7 @@ user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + to_chat(user, "You failed to salvage anything valuable from [src].") else if(istype(W, /obj/item/weapon/crowbar)) if(!isemptylist(crowbar_salvage)) var/obj/S = pick(crowbar_salvage) @@ -76,7 +76,7 @@ crowbar_salvage -= S user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") else - user << "You don't see anything that can be pried with [W]." + to_chat(user, "You don't see anything that can be pried with [W].") else ..() return diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index f1191a0ae8c..7616df4c119 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -36,9 +36,9 @@ if (isslime(M) || isAI(M)) if(M == usr) - M << "You are unable to buckle yourself to the [src]!" + to_chat(M, "You are unable to buckle yourself to the [src]!") else - usr << "You are unable to buckle [M] to the [src]!" + to_chat(usr, "You are unable to buckle [M] to the [src]!") return 0 M.buckled = src diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index a7677daa62c..320ec09a2ee 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -318,19 +318,19 @@ if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) switch(status) if(BURST) - user << "You clear the hatched egg." + to_chat(user, "You clear the hatched egg.") playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) qdel(src) return if(GROWING) - user << "The child is not developed yet." + to_chat(user, "The child is not developed yet.") return if(GROWN) - user << "You retrieve the child." + to_chat(user, "You retrieve the child.") Burst(0) return else - user << "It feels slimy." + to_chat(user, "It feels slimy.") user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 29b1098ca83..2b044b588e1 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -34,7 +34,7 @@ /obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/analyzer)) - user << "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)]." + to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)].") /////////////////////// diff --git a/code/game/objects/effects/datacore-effect.dm b/code/game/objects/effects/datacore-effect.dm index f50be441414..ce970c31916 100644 --- a/code/game/objects/effects/datacore-effect.dm +++ b/code/game/objects/effects/datacore-effect.dm @@ -50,7 +50,7 @@ isactive[name] = active ? "Active" : "Inactive" else isactive[name] = t.fields["p_stat"] - //world << "[name]: [rank]" +// to_chat(world, "[name]: [rank]") //cael - to prevent multiple appearances of a player/job combination, add a continue after each line var/department = 0 if(real_rank in command_positions) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 3f75bca668c..b11ad6bf633 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -18,7 +18,6 @@ var/global/list/image/splatter_cache=list() var/list/viruses = list() blood_DNA = list() var/basecolor="#A10808" // Color when wet. - var/list/datum/disease2/disease/virus2 = list() var/amount = 5 appearance_flags = NO_CLIENT_COLOR @@ -93,7 +92,7 @@ var/global/list/image/splatter_cache=list() return var/taken = rand(1,amount) amount -= taken - user << "You get some of \the [src] on your hands." + to_chat(user, "You get some of \the [src] on your hands.") if (!user.blood_DNA) user.blood_DNA = list() user.blood_DNA |= blood_DNA.Copy() @@ -140,7 +139,7 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/writing/examine(mob/user) ..(user) - user << "It reads: \"[message]\"" + to_chat(user, "It reads: \"[message]\"") /obj/effect/decal/cleanable/blood/gibs name = "gibs" @@ -198,20 +197,20 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions) - spawn (0) - var/direction = pick(directions) - for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) - sleep(3) - if (i > 0) - var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) - b.basecolor = src.basecolor - b.update_icon() - for(var/datum/disease2/disease/D in src.viruses) - var/datum/disease2/disease/ND = D.getcopy() - b.viruses += ND - - if (step_to(src, get_step(src, direction), 0)) - break + set waitfor = 0 + var/direction = pick(directions) + for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) + sleep(3) + if (i > 0) + var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) + b.basecolor = src.basecolor + b.update_icon() + for(var/datum/disease/D in src.viruses) + var/datum/disease/ND = D.Copy(1) + b.viruses += ND + ND.holder = b + if (step_to(src, get_step(src, direction), 0)) + break /obj/effect/decal/cleanable/blood/old/New() @@ -221,29 +220,3 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/gibs/old/New() ..() dry() - -/obj/effect/decal/cleanable/mucus - name = "mucus" - desc = "Disgusting mucus." - gender = PLURAL - density = 0 - anchored = 1 - layer = 2 - icon = 'icons/effects/blood.dmi' - icon_state = "mucus" - random_icon_states = list("mucus") - - var/list/datum/disease2/disease/virus2 = list() - var/dry=0 // Keeps the lag down - -/obj/effect/decal/cleanable/mucus/New() - spawn(DRYING_TIME * 2) - dry=1 - -/obj/effect/decal/cleanable/blood/viralsputum - name = "viral sputum" - desc = "It's black and nasty." -// basecolor="#030303" - icon = 'icons/mob/robots.dmi' - icon_state = "floor1" - random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") \ No newline at end of file diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 89ad3048242..2aa7a997834 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -114,7 +114,6 @@ icon = 'icons/effects/blood.dmi' icon_state = "vomit_1" random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4") - var/list/datum/disease2/disease/virus2 = list() noclear = 1 /obj/effect/decal/cleanable/vomit/New() @@ -133,17 +132,6 @@ reagents.remove_reagent("vomit", 5) reagents.add_reagent("green_vomit", 5) -/obj/effect/decal/cleanable/poop - name = "poop" - desc = "Gosh, how unpleasant." - gender = PLURAL - density = 0 - anchored = 1 - layer = 2 - icon = 'icons/effects/poop.dmi' - random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") - var/list/datum/disease2/disease/virus2 = list() - /obj/effect/decal/cleanable/tomato_smudge name = "tomato smudge" desc = "It's red." diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 86c03a683e8..48e865c78a3 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -157,8 +157,8 @@ var/global/list/image/fluidtrack_cache=list() dryname = "dried tracks" desc = "Whoops..." drydesc = "Whoops..." - coming_state = "wheels" - going_state = "" + coming_state = "wheels1" + going_state = "wheels2" desc = "They look like tracks left by wheels." gender = PLURAL random_icon_states = null diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index d64303e1267..446f1f39e89 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -14,12 +14,12 @@ if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks)) if(src.reagents && W.reagents && !noscoop) if(!src.reagents.total_volume) - user << "There isn't enough [src] to scoop up!" + to_chat(user, "There isn't enough [src] to scoop up!") return if(W.reagents.total_volume >= W.reagents.maximum_volume) - user << "[W] is full!" + to_chat(user, "[W] is full!") return - user << "You scoop the [src] into [W]!" + to_chat(user, "You scoop the [src] into [W]!") reagents.trans_to(W, reagents.total_volume) if(!reagents.total_volume && !noclear) //scooped up all of it qdel(src) @@ -29,7 +29,7 @@ else src.reagents.chem_temp += 15 src.reagents.handle_reactions() - user << "You heat [src] with [W]!" + to_chat(user, "You heat [src] with [W]!") /obj/effect/decal/cleanable/ex_act() if(reagents) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 1e62b6a5a9e..6658838a5d3 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -59,7 +59,7 @@ break if(check) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") return resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster @@ -310,10 +310,10 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) - user << "You remove the remnants of the poster." + to_chat(user, "You remove the remnants of the poster.") qdel(src) else - user << "You carefully remove the poster from the wall." + to_chat(user, "You carefully remove the poster from the wall.") roll_and_drop(user.loc) return @@ -354,14 +354,15 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) var/stuff_on_wall = 0 for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff if(istype(O,/obj/structure/sign)) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") return stuff_on_wall++ if(stuff_on_wall >= 4) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") return - user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster. + to_chat(user, "You start placing the poster on the wall...")//Looks like it's uncluttered enough. Place the poster. + //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster var/obj/structure/sign/poster/D = P.resulting_poster @@ -382,7 +383,7 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) D.pixel_x = -32 D.pixel_y = 0 else - user << "You cannot reach the wall from here!" + to_chat(user, "You cannot reach the wall from here!") return flick("poster_being_set",D) @@ -395,7 +396,7 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(!D) return if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc) //Let's check if everything is still there - user << "You place the poster!" + to_chat(user, "You place the poster!") else D.roll_and_drop(temp_loc) return diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index ee383613a68..744edcd7711 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -925,6 +925,13 @@ steam.start() -- spawns the effect sleep(30) if(metal) + var/turf/T = get_turf(src) + if(istype(T, /turf/space)) + T.ChangeTurf(/turf/simulated/floor/plating/metalfoam) + var/turf/simulated/floor/plating/metalfoam/MF = get_turf(src) + MF.metal = metal + MF.update_icon() + var/obj/structure/foamedmetal/M = new(src.loc) M.metal = metal M.updateicon() @@ -994,51 +1001,49 @@ steam.start() -- spawns the effect var/list/carried_reagents // the IDs of reagents present when the foam was mixed var/metal = 0 // 0=foam, 1=metalfoam, 2=ironfoam +/datum/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0) + amount = round(sqrt(amt / 3), 1) + if(istype(loca, /turf/)) + location = loca + else + location = get_turf(loca) + + carried_reagents = list() + metal = metalfoam - - set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0) - amount = round(sqrt(amt / 3), 1) - if(istype(loca, /turf/)) - location = loca - else - location = get_turf(loca) - - carried_reagents = list() - metal = metalfoam + // bit of a hack here. Foam carries along any reagent also present in the glass it is mixed + // with (defaults to water if none is present). Rather than actually transfer the reagents, + // this makes a list of the reagent ids and spawns 1 unit of that reagent when the foam disolves. - // bit of a hack here. Foam carries along any reagent also present in the glass it is mixed - // with (defaults to water if none is present). Rather than actually transfer the reagents, - // this makes a list of the reagent ids and spawns 1 unit of that reagent when the foam disolves. + if(carry && !metal) + for(var/datum/reagent/R in carry.reagent_list) + carried_reagents += R.id +/datum/effect/system/foam_spread/start() + spawn(0) + var/obj/effect/effect/foam/F = locate() in location + if(F) + F.amount += amount + return - if(carry && !metal) - for(var/datum/reagent/R in carry.reagent_list) - carried_reagents += R.id + F = new(src.location, metal) + F.amount = amount - start() - spawn(0) - var/obj/effect/effect/foam/F = locate() in location - if(F) - F.amount += amount - return + if(!metal) // don't carry other chemicals if a metal foam + F.create_reagents(10) - F = new(src.location, metal) - F.amount = amount - - if(!metal) // don't carry other chemicals if a metal foam - F.create_reagents(10) - - if(carried_reagents) - for(var/id in carried_reagents) - F.reagents.add_reagent(id,1) - else - F.reagents.add_reagent("water", 1) + if(carried_reagents) + for(var/id in carried_reagents) + F.reagents.add_reagent(id,1) + else + F.reagents.add_reagent("water", 1) // wall formed by metal foams // dense and opaque, but easy to break + /obj/structure/foamedmetal icon = 'icons/effects/effects.dmi' icon_state = "metalfoam" @@ -1047,79 +1052,85 @@ steam.start() -- spawns the effect anchored = 1 name = "foamed metal" desc = "A lightweight foamed metal wall." - var/metal = 1 // 1=aluminum, 2=iron + var/metal = MFOAM_ALUMINUM - New() - ..() - air_update_turf(1) +/obj/structure/foamedmetal/New() + ..() + air_update_turf(1) - Destroy() - density = 0 - air_update_turf(1) - return ..() +/obj/structure/foamedmetal/Destroy() + density = 0 + air_update_turf(1) + return ..() - Move() - var/turf/T = loc - ..() - move_update_air(T) +/obj/structure/foamedmetal/Move() + var/turf/T = loc + ..() + move_update_air(T) - proc/updateicon() - if(metal == 1) - icon_state = "metalfoam" - else - icon_state = "ironfoam" +/obj/structure/foamedmetal/proc/updateicon() + if(metal == MFOAM_ALUMINUM) + icon_state = "metalfoam" + else + icon_state = "ironfoam" - ex_act(severity) +/obj/structure/foamedmetal/ex_act(severity) + qdel(src) + +/obj/structure/foamedmetal/blob_act() + qdel(src) + +/obj/structure/foamedmetal/bullet_act() + if(metal==MFOAM_ALUMINUM || prob(50)) qdel(src) - blob_act() +/obj/structure/foamedmetal/attack_hand(var/mob/user) + user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) + if ((HULK in user.mutations) || (prob(75 - metal*25))) + user.visible_message("[user] smashes through \the [src].", "You smash through \the [src].") qdel(src) + else + to_chat(user, "You hit the metal foam but bounce off it.") - bullet_act() - if(metal==1 || prob(50)) - qdel(src) - - attack_hand(var/mob/user) - if ((HULK in user.mutations) || (prob(75 - metal*25))) - user << "\blue You smash through the metal foam wall." - for(var/mob/O in oviewers(user)) - if ((O.client && !( O.blinded ))) - O << "\red [user] smashes through the foamed metal." - - qdel(src) - else - user << "\blue You hit the metal foam but bounce off it." +/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) + user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) + if (istype(I, /obj/item/weapon/grab)) + var/obj/item/weapon/grab/G = I + G.affecting.loc = src.loc + user.visible_message("[G.assailant] smashes [G.affecting] through the foamed metal wall.") + qdel(I) + qdel(src) return + if(prob(I.force*20 - metal*25)) + user.visible_message("[user] smashes through the foamed metal with \the [I].", "You smash through the foamed metal with \the [I].") + qdel(src) + else + to_chat(user, "You hit the metal foam to no effect.") - attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/M) + M.do_attack_animation(src) + if(M.melee_damage_upper == 0) + M.visible_message("[M] nudges \the [src].") + else + if(M.attack_sound) + playsound(loc, M.attack_sound, 50, 1, 1) + M.visible_message("\The [M] [M.attacktext] [src]!") + qdel(src) - if (istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I - G.affecting.loc = src.loc - for(var/mob/O in viewers(src)) - if (O.client) - O << "\red [G.assailant] smashes [G.affecting] through the foamed metal wall." - qdel(I) - qdel(src) - return +/obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/M) + M.visible_message("[M] tears apart \the [src]!"); + qdel(src) - if(prob(I.force*20 - metal*25)) - user << "\blue You smash through the foamed metal with \the [I]." - for(var/mob/O in oviewers(user)) - if ((O.client && !( O.blinded ))) - O << "\red [user] smashes through the foamed metal." - qdel(src) - else - user << "\blue You hit the metal foam to no effect." +/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) + if(air_group) return 0 + return !density - CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) - if(air_group) return 0 - return !density - - CanAtmosPass() - return !density +/obj/structure/foamedmetal/CanAtmosPass() + return !density /datum/effect/system/reagents_explosion var/amount // TNT equivalent @@ -1145,10 +1156,10 @@ steam.start() -- spawns the effect s.start() for(var/mob/M in viewers(5, location)) - M << "\red The solution violently explodes." + to_chat(M, "\red The solution violently explodes.") for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - M << "\red The explosion knocks you down." + to_chat(M, "\red The explosion knocks you down.") M.Weaken(rand(1,5)) return else @@ -1171,7 +1182,7 @@ steam.start() -- spawns the effect flash += (round(amount/4) * flashing_factor) for(var/mob/M in viewers(8, location)) - M << "\red The solution violently explodes." + to_chat(M, "\red The solution violently explodes.") explosion(location, devastation, heavy, light, flash) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index f170aeb7dce..a9e165666fc 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -25,7 +25,7 @@ proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - world << "\red Gib list length mismatch!" + to_chat(world, "\red Gib list length mismatch!") return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 6eb84ce50ca..6e54e69cf92 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -21,7 +21,7 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) - O << "[M] triggered the \icon[src] [src]" + to_chat(O, "[M] triggered the \icon[src] [src]") triggered = 1 call(src,triggerproc)(M) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 52175c17e13..f87e97f9cb0 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -65,7 +65,7 @@ return 1 else if(istype(mover, /mob/living)) if(prob(50)) - mover << "You get stuck in \the [src] for a moment." + to_chat(mover, "You get stuck in \the [src] for a moment.") return 0 else if(istype(mover, /obj/item/projectile)) return prob(30) @@ -207,7 +207,7 @@ var/mob/C = pick(candidates) S.key = C.key if(master_commander) - S << "You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost." + to_chat(S, "You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost.") qdel(src) /obj/effect/decal/cleanable/spiderling_remains diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 414874f6ea2..ce7efc4fee3 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -16,7 +16,6 @@ for(var/mob/M in range(heavy_range, epicenter)) M << 'sound/effects/EMPulse.ogg' - for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) if(distance < 0) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 068e3144e73..caaf79a9981 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -31,7 +31,7 @@ flame_range = min (MAX_EX_FLAME_RANGE, flame_range) spawn(0) - var/start = TimeOfHour + var/watch = start_watch() if(!epicenter) return var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range) @@ -157,8 +157,7 @@ var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range) I.throw_at(throw_at, throw_range, 2, no_spin = 1) //Throw it at 2 speed, this is purely visual anyway; don't spin the thrown items, it's very costly. */ - var/timeofhour = TimeOfHour - var/took = round((start <= timeofhour) ? ((timeofhour-start)/10) : ((timeofhour-(start-36000))/10), 0.01) + var/took = stop_watch(watch) //You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare if(Debug2) log_to_dd("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 42a14a43255..8c4bf753108 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -162,7 +162,7 @@ else msg += "No extractable materials detected.
" msg += "*--------*" - user << msg + to_chat(user, msg) /obj/item/attack_hand(mob/user as mob) @@ -173,10 +173,10 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(!temp) - user << "You try to use your hand, but it's missing!" + to_chat(user, "You try to use your hand, but it's missing!") return 0 if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") return 0 if (istype(src.loc, /obj/item/weapon/storage)) @@ -207,7 +207,7 @@ if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) - user << "Your claws aren't capable of such fine manipulation." + to_chat(user, "Your claws aren't capable of such fine manipulation.") return if (istype(src.loc, /obj/item/weapon/storage)) @@ -234,7 +234,7 @@ if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) - user << "Your claws aren't capable of such fine manipulation." + to_chat(user, "Your claws aren't capable of such fine manipulation.") return attack_hand(A) @@ -268,11 +268,11 @@ success = 1 S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. if(success && !failure) - user << "You put everything in [S]." + to_chat(user, "You put everything in [S].") else if(success) - user << "You put some things in [S]." + to_chat(user, "You put some things in [S].") else - user << "You fail to pick anything up with [S]." + to_chat(user, "You fail to pick anything up with [S].") else if(S.can_be_inserted(src)) S.handle_item_insertion(src) @@ -343,22 +343,22 @@ if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr)) return if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain - usr << "\red You can't pick things up!" + to_chat(usr, "\red You can't pick things up!") return if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained - usr << "\red You can't pick things up!" + to_chat(usr, "\red You can't pick things up!") return if(src.anchored) //Object isn't anchored - usr << "\red You can't pick that up!" + to_chat(usr, "\red You can't pick that up!") return if(!usr.hand && usr.r_hand) //Right hand is not full - usr << "\red Your right hand is full." + to_chat(usr, "\red Your right hand is full.") return if(usr.hand && usr.l_hand) //Left hand is not full - usr << "\red Your left hand is full." + to_chat(usr, "\red Your left hand is full.") return if(!istype(src.loc, /turf)) //Object is on a turf - usr << "\red You can't pick that up!" + to_chat(usr, "\red You can't pick that up!") return //All checks are done, time to pick it up! usr.UnarmedAttack(src) @@ -392,11 +392,11 @@ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) // you can't stab someone in the eyes wearing a mask! - user << "You're going to need to remove that mask/helmet/glasses first!" + to_chat(user, "You're going to need to remove that mask/helmet/glasses first!") return if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N slimes also don't have eyes! - user << "You cannot locate any eyes on this creature!" + to_chat(user, "You cannot locate any eyes on this creature!") return if(!iscarbon(user)) @@ -430,17 +430,17 @@ if(eyes.damage >= eyes.min_bruised_damage) if(M.stat != 2) if(!(eyes.status & ORGAN_ROBOT) || !(eyes.status & ORGAN_ASSISTED)) //robot eyes bleeding might be a bit silly - M << "Your eyes start to bleed profusely!" + to_chat(M, "Your eyes start to bleed profusely!") if(prob(50)) if(M.stat != 2) - M << "You drop what you're holding and clutch at your eyes!" + to_chat(M, "You drop what you're holding and clutch at your eyes!") M.drop_item() M.eye_blurry += 10 M.Paralyse(1) M.Weaken(2) if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) - M << "You go blind!" + to_chat(M, "You go blind!") var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting.take_damage(7)) H.UpdateDamageIcon() @@ -516,7 +516,7 @@ /obj/item/proc/wash(mob/user, atom/source) if(flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand. return - user << "You start washing [src]..." + to_chat(user, "You start washing [src]...") if(!do_after(user, 40, target = source)) return clean_blood() diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 766b5d55163..0e977fc5ead 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -19,7 +19,7 @@ return if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match)) if (contents.len >= max_butts) - user << "This ashtray is full." + to_chat(user, "This ashtray is full.") return user.unEquip(W) W.loc = src @@ -33,7 +33,7 @@ cig.transfer_fingerprints_to(butt) qdel(cig) else if (cig.lit == 0) - user << "You place [cig] in [src] without even smoking it. Why would you do that?" + to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") src.visible_message("[user] places [W] in [src].") user.update_inv_l_hand() @@ -47,7 +47,7 @@ desc = empty_desc + " It's half-filled." else health = max(0,health - W.force) - user << "You hit [src] with [W]." + to_chat(user, "You hit [src] with [W].") if (health < 1) die() return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 71c6be4d154..6dd269176b3 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -132,26 +132,26 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - usr << "The new area must be completely airtight." + to_chat(usr, "The new area must be completely airtight.") return if(ROOM_ERR_TOOLARGE) - usr << "The new area is too large." + to_chat(usr, "The new area is too large.") return else - usr << "Error! Please notify administration." + to_chat(usr, "Error! Please notify administration.") return var/list/turf/turfs = res var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN)) if(!str || !length(str)) //cancel return if(length(str) > 50) - usr << "The given name is too long. The area remains undefined." + to_chat(usr, "The given name is too long. The area remains undefined.") return var/area/A = new A.name = str //var/ma //ma = A.master ? "[A.master]" : "(null)" - //world << "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" +// to_chat(world, "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]") A.power_equip = 0 A.power_light = 0 A.power_environ = 0 @@ -173,13 +173,13 @@ if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - usr << "The given name is too long. The area's name is unchanged." + to_chat(usr, "The given name is too long. The area's name is unchanged.") return set_area_machinery_title(A,str,prevname) A.name = str - usr << "You rename the '[prevname]' to '[str]'." + to_chat(usr, "You rename the '[prevname]' to '[str]'.") interact() - return + return 1 /obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 3c36ea9dfe8..108dfd28de8 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -57,7 +57,7 @@ //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri return else if(istype(W, /obj/item/weapon/wirecutters)) - user << "You cut the tag off the bodybag" + to_chat(user, "You cut the tag off the bodybag") src.name = "body bag" src.overlays.Cut() return @@ -89,7 +89,7 @@ // Make it possible to escape from bodybags in morgues and crematoriums if(loc && (isturf(loc) || istype(loc, /obj/structure/morgue) || istype(loc, /obj/structure/crematorium))) if(!open()) - user << "It won't budge!" + to_chat(user, "It won't budge!") /obj/item/bodybag/cryobag name = "stasis bag" @@ -126,14 +126,14 @@ MouseDrop(over_object, src_location, over_location) if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return - usr << "\red You can't fold that up anymore.." + to_chat(usr, "\red You can't fold that up anymore..") ..() attackby(W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(src.allowed(user)) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") else - user << "\red Access denied." + to_chat(user, "\red Access denied.") return \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 20646a081b7..6da176f8ba8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -85,26 +85,26 @@ temp = "letter" else if(graffiti.Find(drawtype)) temp = "graffiti" - user << "You start drawing a [temp] on the [target.name]." + to_chat(user, "You start drawing a [temp] on the [target.name].") if(instant || do_after(user, 50, target = target)) new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp) - user << "You finish drawing [temp]." + to_chat(user, "You finish drawing [temp].") if(uses) uses-- if(!uses) - user << "You used up your [src.name]!" + to_chat(user, "You used up your [src.name]!") qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) var/huffable = istype(src,/obj/item/toy/crayon/spraycan) if(M == user) - user << "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!" + to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!") user.nutrition += 5 if(uses) uses -= 5 if(uses <= 0) - user << "There is no more of [src.name] left!" + to_chat(user, "There is no more of [src.name] left!") qdel(src) else ..() @@ -214,7 +214,7 @@ var/choice = input(user,"Spraycan options") in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") - user << "You [capped ? "Remove" : "Replace"] the cap of the [src]" + to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") capped = capped ? 0 : 1 icon_state = "spraycan[capped ? "_cap" : ""]" update_icon() @@ -238,7 +238,7 @@ if(C.client) C.eye_blurry = max(C.eye_blurry, 3) C.eye_blind = max(C.eye_blind, 1) - if(C.eyecheck() <= 0) // no eye protection? ARGH IT BURNS. + if(C.check_eye_prot() <= 0) // no eye protection? ARGH IT BURNS. C.confused = max(C.confused, 3) C.Weaken(3) C.lip_style = "spray_face" diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index f3d20babcf5..991d04fbd63 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -12,7 +12,7 @@ /obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob) src.add_fingerprint(user) // Anyone can add their fingerprints to it with this if(owned) - user << "[src] stares up at you with friendly eyes." + to_chat(user, "[src] stares up at you with friendly eyes.") owner = user owned = 0 return ..() @@ -21,7 +21,7 @@ /obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity) if(!proximity) return if(istype(O,/obj/structure/sink)) - user << "You place [src] under a stream of water..." + to_chat(user, "You place [src] under a stream of water...") user.drop_item() loc = get_turf(O) return Swell() diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 159365f0b79..1bf7edac749 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -83,7 +83,7 @@ msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].") flush = 1 AI.suiciding = 1 - AI << "Your core files are being wiped!" + to_chat(AI, "Your core files are being wiped!") while (AI && AI.stat != DEAD) AI.adjustOxyLoss(2) AI.updatehealth() @@ -92,13 +92,13 @@ if (href_list["radio"]) AI.aiRadio.disabledAi = text2num(href_list["radio"]) - AI << "Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!" - user << "You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver." + to_chat(AI, "Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!") + to_chat(user, "You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.") if (href_list["wireless"]) AI.control_disabled = text2num(href_list["wireless"]) - AI << "Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!" - user << "You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface." + to_chat(AI, "Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!") + to_chat(user, "You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface.") update_icon() return 1 diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 54056c0942e..25e4d12614d 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -79,7 +79,7 @@ set src in view(usr, 1) set name = "Print Data" if(usr.stat || !(istype(usr,/mob/living/carbon/human))) - usr << "No." + to_chat(usr, "No.") return var/scan_data = "" @@ -186,16 +186,16 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - user << "\red A new patient has been registered.. Purging data for previous patient." + to_chat(user, "\red A new patient has been registered.. Purging data for previous patient.") src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) - usr << "You can't scan this body part." + to_chat(usr, "You can't scan this body part.") return if(!S.open) - usr << "You have to cut the limb open first!" + to_chat(usr, "You have to cut the limb open first!") return for(var/mob/O in viewers(M)) O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index dc47c3fc146..003110f76cd 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -62,7 +62,7 @@ var/turf/T = get_turf(user.loc) if(T.z != current.z || !current.can_use()) - user << "[src] has lost the signal." + to_chat(user, "[src] has lost the signal.") current = null user.reset_view(null) user.unset_machine() @@ -222,11 +222,11 @@ var/obj/machinery/camera/C = locate(href_list["view"]) if(istype(C)) if(!C.can_use()) - usr << "Something's wrong with that camera. You can't get a feed." + to_chat(usr, "Something's wrong with that camera. You can't get a feed.") return var/turf/T = get_turf(loc) if(!T || C.z != T.z) - usr << "You can't get a signal." + to_chat(usr, "You can't get a signal.") return current = C spawn(6) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 9edc811958f..d8a708d86b7 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -31,7 +31,7 @@ if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) - user << "Scanned [target]." + to_chat(user, "Scanned [target].") saved_item = target.type saved_icon = target.icon saved_icon_state = target.icon_state @@ -45,7 +45,7 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) qdel(active_dummy) active_dummy = null - usr << "You deactivate \the [src]." + to_chat(usr, "You deactivate \the [src].") var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -58,7 +58,7 @@ var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src) qdel(O) - usr << "You activate \the [src]." + to_chat(usr, "You activate \the [src].") var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -107,24 +107,24 @@ /obj/effect/dummy/chameleon/attackby() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") master.disrupt() /obj/effect/dummy/chameleon/attack_hand() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") master.disrupt() /obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") spawn() M.ex_act(severity) master.disrupt() /obj/effect/dummy/chameleon/bullet_act() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") ..() master.disrupt() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 2b8eb60500f..4b96ba904dd 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -24,21 +24,21 @@ if(istype(O, /obj/machinery/power/apc)) var/obj/machinery/power/apc/A = O if(A.emagged || A.malfhack) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") return 1 if(istype(O, /obj/machinery/door)) var/obj/machinery/door/D = O if(D.operating == -1) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") return 1 \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index d39a8dfbc93..92613e6af3e 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -27,14 +27,14 @@ /obj/item/device/flash/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) if(battery_panel) - user << "You close the battery compartment on the [src]." + to_chat(user, "You close the battery compartment on the [src].") battery_panel = 0 else - user << "You open the battery compartment on the [src]." + to_chat(user, "You open the battery compartment on the [src].") battery_panel = 1 if(battery_panel && !overcharged) if(istype(W, /obj/item/weapon/stock_parts/cell)) - user << "You jam the cell into battery compartment on the [src]." + to_chat(user, "You jam the cell into battery compartment on the [src].") qdel(W) overcharged = 1 overlays += "overcharge" @@ -75,26 +75,28 @@ return 1 -/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, convert = 1) +/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) add_logs(M, user, "flashed", object="[src.name]") - if(M.weakeyes) - M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash - var/safety = M:eyecheck() - if(safety <= 0) - M.confused += power - flick("e_flash", M.flash) - if(user && convert) + if(user && targeted) + if(M.weakeyes) + M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash + if(M.flash_eyes(1, 1)) + M.confused += power terrible_conversion_proc(M, user) M.Stun(1) - user.visible_message("[user] blinds [M] with the [src.name]!") + visible_message("[user] blinds [M] with the flash!") + to_chat(user, "You blind [M] with the flash!") + to_chat(M, "[user] blinds you with the flash!") if(M.weakeyes) M.Stun(2) - M.visible_message("[M] gasps and shields their eyes!") - return 1 + M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") + else + visible_message("[user] fails to blind [M] with the flash!") + to_chat(user, "You fail to blind [M] with the flash!") + to_chat(M, "[user] fails to blind you with the flash!") else - if(user) - user.visible_message("[user] fails to blind [M] with the [src.name]!") - return 0 + if(M.flash_eyes()) + M.confused += power /obj/item/device/flash/attack(mob/living/M, mob/user) if(!try_use_flash(user)) @@ -111,16 +113,16 @@ else if(issilicon(M)) if(isrobot(M)) var/mob/living/silicon/robot/R = M - - if (R.module) // Perhaps they didn't choose a module yet + if(R.module) // Perhaps they didn't choose a module yet for(var/obj/item/borg/combat/shield/S in R.module.modules) if(R.activated(S)) add_logs(M, user, "flashed", object="[src.name]") user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!") return 1 - M.Weaken(rand(5,10)) add_logs(M, user, "flashed", object="[src.name]") - user.visible_message("[user] overloads [M]'s sensors with the [src.name]!", "You overload [M]'s sensors with the [src.name]!") + if(M.flash_eyes(affect_silicon = 1)) + M.Weaken(rand(5,10)) + user.visible_message("[user] overloads [M]'s sensors with the [src.name]!", "You overload [M]'s sensors with the [src.name]!") return 1 user.visible_message("[user] fails to blind [M] with the [src.name]!", "You fail to blind [M] with the [src.name]!") @@ -158,11 +160,11 @@ resisted = 1 if(resisted) - user << "This mind seems resistant to the [src.name]!" + to_chat(user, "This mind seems resistant to the [src.name]!") else - user << "They must be conscious before you can convert them!" + to_chat(user, "They must be conscious before you can convert them!") else - user << "This mind is so vacant that it is not susceptible to influence!" + to_chat(user, "This mind is so vacant that it is not susceptible to influence!") /obj/item/device/flash/cyborg diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index ef8cba90463..5ff8f7dff33 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -31,7 +31,8 @@ /obj/item/device/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. + return 0 on = !on update_brightness(user) @@ -46,37 +47,34 @@ return ..() //just hit them in the head if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return var/mob/living/carbon/human/H = M //mob has protective eyewear if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))) - user << "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first." + to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.") return if(M == user) //they're using it on themselves - if(!M.blinded) - flick("flash", M.flash) + if(M.flash_eyes(visual = 1)) M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes! Trippy!") else M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes.") - return + else - user.visible_message("[user] directs [src] to [M]'s eyes.", \ - "You direct [src] to [M]'s eyes.") + user.visible_message("[user] directs [src] to [M]'s eyes.", \ + "You direct [src] to [M]'s eyes.") - if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected - if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind - user << "[M] pupils does not react to the light!" - else if(XRAY in M.mutations) //mob has X-RAY vision - flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray. - user << "[M] pupils give an eerie glow!" - else //they're okay! - if(!M.blinded) - flick("flash", M.flash) //flash the affected mob - user << "[M]'s pupils narrow." + if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected + if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind + to_chat(user, "[M] pupils does not react to the light!") + else if(XRAY in M.mutations) //mob has X-RAY vision + to_chat(user, "[M] pupils give an eerie glow!") + else //they're okay! + if(M.flash_eyes(visual = 1)) + to_chat(user, "[M]'s pupils narrow.") else return ..() @@ -195,7 +193,7 @@ obj/item/device/flashlight/lamp/bananalamp // Usual checks if(!fuel) - user << "It's out of fuel." + to_chat(user, "It's out of fuel.") return if(on) return @@ -276,8 +274,8 @@ obj/item/device/flashlight/lamp/bananalamp if(ismob(A)) var/mob/M = A add_logs(M, user, "attacked", object="EMP-light") - user << "\The [src] now has [emp_cur_charges] charge\s." + to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.") A.emp_act(1) else - user << "\The [src] needs time to recharge!" + to_chat(user, "\The [src] needs time to recharge!") return \ No newline at end of file diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index e89f3213b4f..48e477cc258 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -50,13 +50,13 @@ user.drop_item() W.loc = src diode = W - user << "You install a [diode.name] in [src]." + to_chat(user, "You install a [diode.name] in [src].") else - user << "[src] already has a cell." + to_chat(user, "[src] already has a cell.") else if(istype(W, /obj/item/weapon/screwdriver)) if(diode) - user << "You remove the [diode.name] from the [src]." + to_chat(user, "You remove the [diode.name] from the [src].") diode.loc = get_turf(src.loc) diode = null return @@ -72,17 +72,17 @@ if( !(user in (viewers(7,target))) ) return if (!diode) - user << "You point [src] at [target], but nothing happens!" + to_chat(user, "You point [src] at [target], but nothing happens!") return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return add_fingerprint(user) //nothing happens if the battery is drained if(recharge_locked) - user << "You point [src] at [target], but it's still charging." + to_chat(user, "You point [src] at [target], but it's still charging.") return var/outmsg @@ -90,68 +90,32 @@ //human/alien mobs if(iscarbon(target)) + var/mob/living/carbon/C = target if(user.zone_sel.selecting == "eyes") - var/mob/living/carbon/C = target + add_logs(C, user, "shone in the eyes", object="laser pointer") + + var/severity = 1 + if(prob(33)) + severity = 2 + else if(prob(50)) + severity = 0 //20% chance to actually hit the eyes - - if(prob(effectchance * diode.rating)) - add_logs(C, user, "shone in the eyes", object="laser pointer") - - - //eye target check + if(prob(effectchance * diode.rating) && C.flash_eyes(severity)) outmsg = "You blind [C] by shining [src] in their eyes." if(C.weakeyes) C.Stun(1) - var/eye_prot = C.eyecheck() - if(C.blinded || eye_prot >= 2) - eye_prot = 4 - var/severity = 3 - eye_prot - if(prob(33)) - severity += 1 - else if(prob(50)) - severity -= 1 - severity = min(max(severity, 0), 4) - var/mob/living/carbon/human/H = C - var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) - - switch(severity) - if(0) - //no effect - C << "A small, bright dot appears in your vision." - if(1) - //industrial grade eye protection - E.damage += rand(0, 2) - C << "Something bright flashes in the corner of your vision!" - if(2) - //basic eye protection (sunglasses) - flick("flash", C.flash) - E.damage += rand(1, 6) - C << "Your eyes were blinded!" - if(3) - //no eye protection - if(prob(2)) - C.Weaken(1) - flick("e_flash", C.flash) - E.damage += rand(3, 7) - C << "Your eyes were blinded!" - if(4) - //the effect has been worsened by something - if(prob(5)) - C.Weaken(1) - flick("e_flash", C.flash) - E.damage += rand(5, 10) - C << "Your eyes were blinded!" else - outmsg = "You fail to blind [C] by shining [src] at their eyes." + outmsg = "You fail to blind [C] by shining [src] at their eyes!" //robots and AI else if(issilicon(target)) var/mob/living/silicon/S = target //20% chance to actually hit the sensors if(prob(effectchance * diode.rating)) + S.flash_eyes(affect_silicon = 1) S.Weaken(rand(5,10)) - S << "Your sensors were overloaded by a laser!" + to_chat(S, "Your sensors were overloaded by a laser!") outmsg = "You overload [S] by shining [src] at their sensors." S.attack_log += text("\[[time_stamp()]\] Has had a laser pointer shone in their eyes by [user.name] ([user.ckey])") @@ -190,9 +154,9 @@ I.pixel_y = target.pixel_y + rand(-5,5) if(outmsg) - user << outmsg + to_chat(user, outmsg) else - user << "You point [src] at [target]." + to_chat(user, "You point [src] at [target].") energy -= 1 if(energy <= max_energy) @@ -200,7 +164,7 @@ recharging = 1 processing_objects.Add(src) if(energy <= 0) - user << "You've overused the battery of [src], now it needs time to recharge!" + to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") recharge_locked = 1 flick_overlay(I, showto, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index c87f4c7ff24..9dec685efb8 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -68,7 +68,7 @@ /obj/item/device/lightreplacer/examine(mob/user) if(..(user, 2)) - user << "It has [uses] lights remaining." + to_chat(user, "It has [uses] lights remaining.") /obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/sheet/glass)) @@ -76,14 +76,14 @@ if(G.amount - decrement >= 0 && uses < max_uses) var/remaining = max(G.amount - decrement, 0) if(!remaining && !(G.amount - decrement) == 0) - user << "There isn't enough glass." + to_chat(user, "There isn't enough glass.") return G.amount = remaining if(!G.amount) user.drop_item() qdel(G) AddUses(increment) - user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." + to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] lights remaining.") return if(istype(W, /obj/item/weapon/light)) @@ -91,12 +91,12 @@ if(L.status == 0) // LIGHT OKAY if(uses < max_uses) AddUses(1) - user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." + to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.") user.drop_item() qdel(L) return else - user << "You need a working light." + to_chat(user, "You need a working light.") return /obj/item/device/lightreplacer/emag_act(user as mob) @@ -109,10 +109,10 @@ var/mob/living/silicon/robot/R = user if(R.emagged) src.Emag() - usr << "You shortcircuit the [src]." + to_chat(usr, "You shortcircuit the [src].") return */ - usr << "It has [uses] lights remaining." + to_chat(usr, "It has [uses] lights remaining.") /obj/item/device/lightreplacer/update_icon() icon_state = "lightreplacer[emagged]" @@ -139,7 +139,7 @@ if(target.status != LIGHT_OK) if(CanUse(U)) if(!Use(U)) return - U << "You replace the [target.fitting] with the [src]." + to_chat(U, "You replace the [target.fitting] with the [src].") if(target.status != LIGHT_EMPTY) @@ -173,10 +173,10 @@ return else - U << failmsg + to_chat(U, failmsg) return else - U << "There is a working [target.fitting] already inserted." + to_chat(U, "There is a working [target.fitting] already inserted.") return /obj/item/device/lightreplacer/proc/Emag() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 9e39f99b119..7028153dff2 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -14,22 +14,22 @@ /obj/item/device/megaphone/attack_self(mob/living/user as mob) if (user.client) if(user.client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + to_chat(src, "\red You cannot speak in IC (muted).") return if(!ishuman(user)) - user << "\red You don't know how to use this!" + to_chat(user, "\red You don't know how to use this!") return if(user.silent) - user << "You find yourself unable to speak at all." + to_chat(user, "You find yourself unable to speak at all.") return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H && H.mind) if(H.mind.miming) - user << "Your vow of silence prevents you from speaking." + to_chat(user, "Your vow of silence prevents you from speaking.") return if(spamcheck) - user << "\red \The [src] needs to recharge!" + to_chat(user, "\red \The [src] needs to recharge!") return var/message = input(user, "Shout a message:", "Megaphone") as text|null @@ -45,7 +45,7 @@ saymsg(user, pick(insultmsg)) insults-- else - user << "\red *BZZZZzzzzzt*" + to_chat(user, "\red *BZZZZzzzzzt*") else saymsg(user, message) @@ -61,6 +61,6 @@ /obj/item/device/megaphone/emag_act(user as mob) if(!emagged) - user << "\red You overload \the [src]'s voice synthesizer." + to_chat(user, "\red You overload \the [src]'s voice synthesizer.") emagged = 1 insults = rand(1, 3)//to prevent dickflooding diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index e32bdf764cd..7c1d4d6d7f2 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -22,7 +22,7 @@ return //it shouldn't be null, okay? if(!parts) - user << "This kit has no parts for this modification left." + to_chat(user, "This kit has no parts for this modification left.") user.unEquip(src) qdel(src) return @@ -34,17 +34,17 @@ var/obj/item/clothing/I = O if (!istype(I) || !allowed) - user << "[src] is unable to modify that." + to_chat(user, "[src] is unable to modify that.") return var/excluding = ("exclude" in I.species_restricted) var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) - user << "[I] is already modified." + to_chat(user, "[I] is already modified.") return if(!isturf(O.loc)) - user << "[O] must be safely placed on the ground for modification." + to_chat(user, "[O] must be safely placed on the ground for modification.") return playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -64,7 +64,7 @@ /obj/item/device/modkit/examine(mob/user) ..(user) - user << "It looks as though it modifies hardsuits to fit [target_species] users." + to_chat(user, "It looks as though it modifies hardsuits to fit [target_species] users.") /obj/item/device/modkit/tajaran name = "Tajaran hardsuit modification kit" diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 8f916059010..2dd138265e7 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -243,17 +243,17 @@ return var/mob/M = usr if(!istype(M, /mob/living/carbon)) - usr << "You don't have any DNA, or your DNA is incompatible with this device." + to_chat(usr, "You don't have any DNA, or your DNA is incompatible with this device.") else var/datum/dna/dna = usr.dna pai.master = M.real_name pai.master_dna = dna.unique_enzymes - pai << "
You have been bound to a new master.
" + to_chat(pai, "You have been bound to a new master.
") if(href_list["request"]) var/delta = (world.time / 10) - last_request if(request_cooldown > delta) var/cooldown_time = round(request_cooldown - ((world.time / 10) - last_request), 1) - usr << "\red The request system is currently offline. Please wait another [cooldown_time] seconds." + to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.") return last_request = world.time / 10 src.looking_for_personality = 1 @@ -262,10 +262,10 @@ var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") if(confirm == "Yes") for(var/mob/M in src) - M << "You feel yourself slipping away from reality.
" - M << "Byte by byte you lose your sense of self.
" - M << "Your mental faculties leave you.
" - M << "oblivion...
" + to_chat(M, "You feel yourself slipping away from reality.
") + to_chat(M, "Byte by byte you lose your sense of self.
") + to_chat(M, "Your mental faculties leave you.
") + to_chat(M, "oblivion...
") var/mob/living/silicon/pai/P = M if(istype(P)) if(P.resting || P.canmove) @@ -283,9 +283,9 @@ var/newlaws = sanitize(copytext(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message,1,MAX_MESSAGE_LEN)) if(newlaws) pai.pai_laws = newlaws - pai << "Your supplemental directives have been updated. Your new directives are:" - pai << "Prime Directive:[pai.pai_law0]" - pai << "Supplemental Directives:
[pai.pai_laws]" + to_chat(pai, "Your supplemental directives have been updated. Your new directives are:") + to_chat(pai, "Prime Directive:
[pai.pai_law0]") + to_chat(pai, "Supplemental Directives:
[pai.pai_laws]") attack_self(usr) // WIRE_SIGNAL = 1 diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 47e88049b65..d663ead8906 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -20,7 +20,7 @@ var/turf/T = P.loc if (P.level < 2 && T.level==1 && isturf(T) && T.intact) - user << "You must remove the plating first." + to_chat(user, "You must remove the plating first.") return P.change_color(pipe_colors[mode]) @@ -30,4 +30,4 @@ /obj/item/device/pipe_painter/examine(mob/user) ..(user) - user << "It is in [mode] mode." \ No newline at end of file + to_chat(user, "It is in [mode] mode.") diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index ae2a698cb35..984c98730f4 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -13,7 +13,7 @@ /obj/item/device/pizza_bomb/attack_self(mob/user) if(disarmed) - user << "\The [src] is disarmed." + to_chat(user, "\The [src] is disarmed.") return if(!timer_set) name = "pizza bomb" @@ -29,7 +29,7 @@ return timer = Clamp(timer, 10, 100) icon_state = "pizzabox1" - user << "You set the timer to [timer / 10] before activating the payload and closing \the [src]." + to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].") message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at (JMP).") log_game("[key_name(usr)] has set the timer on a pizza bomb to [timer/10] seconds ([loc.x],[loc.y],[loc.z]).") armer = usr @@ -41,7 +41,7 @@ desc = "OH GOD THAT'S NOT A PIZZA" icon_state = "pizzabox_bomb" audible_message("\icon[src] *beep* *beep*") - user << "That's no pizza! That's a bomb!" + to_chat(user, "That's no pizza! That's a bomb!") message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at (JMP).") log_game("[key_name(usr)] has triggered a pizza bomb armed by [armer] ([loc.x],[loc.y],[loc.z]).") primed = 1 @@ -59,7 +59,7 @@ /obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/wirecutters) && primed) - user << "Oh God, what wire do you cut?!" + to_chat(user, "Oh God, what wire do you cut?!") var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) return @@ -68,7 +68,7 @@ sleep(5) if(chosen_wire == correct_wire) src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") - user << "You did it!" + to_chat(user, "You did it!") icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." @@ -76,12 +76,12 @@ primed = 0 return else - user << "WRONG WIRE!" + to_chat(user, "WRONG WIRE!") go_boom() return if(istype(I, /obj/item/weapon/wirecutters) && disarmed) if(!in_range(user, src)) - user << "You can't see the box well enough to cut the wires out." + to_chat(user, "You can't see the box well enough to cut the wires out.") return user.visible_message("[user] starts removing the payload and wires from \the [src].") if(do_after(user, 40, target = src)) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index c9b6a6d7563..8f6f60bd11b 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -36,7 +36,7 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - user << "No exposed cable here to attach to." + to_chat(user, "No exposed cable here to attach to.") return else anchored = 1 @@ -46,7 +46,7 @@ log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") return else - user << "Device must be placed over an exposed cable to attach to it." + to_chat(user, "Device must be placed over an exposed cable to attach to it.") return else if (mode == 2) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 36de16c95fa..af68ee8eeda 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -21,7 +21,7 @@ if(!emagged) emagged = 1 syndicate = 1 - user << "\blue The This beacon now only be locked on to by emagged teleporters!" + to_chat(user, "\blue The This beacon now only be locked on to by emagged teleporters!") /obj/item/device/radio/beacon/hear_talk() return @@ -58,7 +58,7 @@ /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob) if(user) - user << "\blue Locked In" + to_chat(user, "\blue Locked In") new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -71,7 +71,7 @@ /obj/item/device/radio/beacon/syndicate/bomb/attack_self(mob/user as mob) if(user) - user << "\blue Locked In" + to_chat(user, "\blue Locked In") new /obj/machinery/syndicatebomb( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 72546f5e15b..f0181104bbc 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -14,7 +14,7 @@ /obj/item/device/radio/electropack/attack_hand(mob/user as mob) if(src == user.back) - user << "You need help taking this off!" + to_chat(user, "You need help taking this off!") return 0 . = ..() @@ -32,13 +32,13 @@ ..() if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) - user << "[src] is not ready to be attached!" + to_chat(user, "[src] is not ready to be attached!") return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' if(!user.unEquip(W)) - user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" + to_chat(user, "\the [W] is stuck to your hand, you cannot attach it to \the [src]!") return W.loc = A W.master = A @@ -86,7 +86,7 @@ sleep(50) if(M) M.moved_recently = 0 - M << "You feel a sharp shock!" + to_chat(M, "You feel a sharp shock!") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, M) s.start() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e1c1994556e..57e1e035aa8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -42,8 +42,8 @@ if(!(..(user, 1) && radio_desc)) return - user << "The following channels are available:" - user << radio_desc + to_chat(user, "The following channels are available:") + to_chat(user, radio_desc) /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel) if (channel == "special") @@ -321,13 +321,13 @@ keyslot2 = null recalculateChannels() - user << "You pop out the encryption keys in the headset!" + to_chat(user, "You pop out the encryption keys in the headset!") else - user << "This headset doesn't have any encryption keys! How useless..." + to_chat(user, "This headset doesn't have any encryption keys! How useless...") if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot1 && keyslot2) - user << "The headset can't hold another key!" + to_chat(user, "The headset can't hold another key!") return if(!keyslot1) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 987d2475245..fba22decc42 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -136,7 +136,7 @@ switch(buildstage) if(3) if(iswirecutter(W) && b_stat && wires.IsAllCut()) - user << "You cut out the intercoms wiring and disconnect its electronics." + to_chat(user, "You cut out the intercoms wiring and disconnect its electronics.") playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/stack/cable_coil(get_turf(src),5) @@ -155,7 +155,7 @@ on = 1 b_stat = 0 buildstage = 3 - user << "You secure the electronics!" + to_chat(user, "You secure the electronics!") update_icon() processing_objects.Add(src) for(var/i, i<= 5, i++) @@ -165,19 +165,19 @@ if(iscoil(W)) var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) - user << "You need more cable for this!" + to_chat(user, "You need more cable for this!") return if(do_after(user, 10, target = src)) coil.use(5) - user << "You wire \the [src]!" + to_chat(user, "You wire \the [src]!") buildstage = 2 return 1 if(iscrowbar(W)) - user << "You begin removing the electronics..." + to_chat(user, "You begin removing the electronics...") playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/weapon/intercom_electronics(get_turf(src)) - user << "The circuitboard pops out!" + to_chat(user, "The circuitboard pops out!") buildstage = 0 return 1 if(0) @@ -185,17 +185,17 @@ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) qdel(W) - user << "You insert \the [W] into \the [src]!" + to_chat(user, "You insert \the [W] into \the [src]!") buildstage = 1 return 1 if(iswelder(W)) var/obj/item/weapon/weldingtool/WT=W playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) if(!WT.remove_fuel(3, user)) - user << "You're out of welding fuel." + to_chat(user, "You're out of welding fuel.") return 1 if(do_after(user, 10, target = src)) - user << "You cut the intercom frame from the wall!" + to_chat(user, "You cut the intercom frame from the wall!") new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) return 1 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 168f448ba4d..d2fe7d2b319 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -238,7 +238,7 @@ var/global/list/default_medbay_channels = list( var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if (channel == "department") - //world << "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"" +// to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"") channel = channels[1] connection = secure_radio_connections[channel] else @@ -637,14 +637,14 @@ var/global/list/default_medbay_channels = list( keyslot = null recalculateChannels() - user << "You pop out the encryption key in the radio!" + to_chat(user, "You pop out the encryption key in the radio!") else - user << "This radio doesn't have any encryption keys!" + to_chat(user, "This radio doesn't have any encryption keys!") if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) - user << "The radio can't hold another key!" + to_chat(user, "The radio can't hold another key!") return if(!keyslot) @@ -697,9 +697,9 @@ var/global/list/default_medbay_channels = list( if(enable_subspace_transmission != subspace_transmission) subspace_transmission = !subspace_transmission if(subspace_transmission) - usr << "Subspace Transmission is enabled." + to_chat(usr, "Subspace Transmission is enabled.") else - usr << "Subspace Transmission is disabled." + to_chat(usr, "Subspace Transmission is disabled.") if(subspace_transmission == 0)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled channels = list() @@ -712,10 +712,10 @@ var/global/list/default_medbay_channels = list( shut_up = !shut_up if(shut_up) canhear_range = 0 - usr << "Loudspeaker disabled." + to_chat(usr, "Loudspeaker disabled.") else canhear_range = 3 - usr << "Loudspeaker enabled." + to_chat(usr, "Loudspeaker enabled.") . = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 5213a32b78d..7138a4515be 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -128,7 +128,7 @@ REAGENT SCANNER /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) - user << text("\red You try to analyze the floor's vitals!") + to_chat(user, text("\red You try to analyze the floor's vitals!")) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) @@ -187,19 +187,13 @@ REAGENT SCANNER if (istype(M, /mob/living/carbon)) if(upgraded) chemscan(user, M) - if(M:virus2.len) // WHAT IS TYPECASTING - var/mob/living/carbon/C = M - for (var/ID in C.virus2) - if (ID in virusDB) - var/datum/data/record/V = virusDB[ID] - user.show_message(text("\red Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]")) -// user.show_message(text("\red Warning: Unknown pathogen detected in subject's blood.")) + for(var/datum/disease/D in M.viruses) + if(!(D.visibility_flags & HIDDEN_SCANNER)) + to_chat(user, "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]") if(M.getStaminaLoss()) user.show_message("Subject appears to be suffering from fatigue.") if (M.getCloneLoss()) user.show_message("Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.") -// if (M.reagents && M.reagents.get_reagent_amount("epinephrine")) -// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.") if (M.has_brain_worms()) user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain)) @@ -263,16 +257,16 @@ REAGENT SCANNER mode = !mode switch (mode) if(1) - usr << "The scanner now shows specific limb damage." + to_chat(usr, "The scanner now shows specific limb damage.") if(0) - usr << "The scanner no longer shows limb damage." + to_chat(usr, "The scanner no longer shows limb damage.") /obj/item/device/healthanalyzer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/healthupgrade)) if(upgraded) - user << "You have already installed an upgraded in the [src]." + to_chat(user, "You have already installed an upgraded in the [src].") else - user << "You install the upgrade in the [src]." + to_chat(user, "You install the upgrade in the [src].") overlays += "advanced" playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) upgraded = 1 @@ -390,17 +384,17 @@ REAGENT SCANNER if (user.stat) return if (crit_fail) - user << "This device has critically failed and is no longer functional!" + to_chat(user, "This device has critically failed and is no longer functional!") return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) if(R.id != "blood") reagents.clear_reagents() - user << "The sample was contaminated! Please insert another sample." + to_chat(user, "The sample was contaminated! Please insert another sample.") return else blood_traces = params2list(R.data["trace_chem"]) @@ -420,7 +414,7 @@ REAGENT SCANNER return else recent_fail = 1 - user << "[dat]" + to_chat(user, "[dat]") reagents.clear_reagents() return @@ -450,12 +444,12 @@ REAGENT SCANNER if (user.stat) return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return if(!istype(O)) return if (crit_fail) - user << "This device has critically failed and is no longer functional!" + to_chat(user, "This device has critically failed and is no longer functional!") return if(!isnull(O.reagents)) @@ -473,11 +467,11 @@ REAGENT SCANNER else recent_fail = 1 if(dat) - user << "Chemicals found: [dat]" + to_chat(user, "Chemicals found: [dat]") else - user << "No active chemical agents found in [O]." + to_chat(user, "No active chemical agents found in [O].") else - user << "No significant chemical agents found in [O]." + to_chat(user, "No significant chemical agents found in [O].") return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7b56b34090a..ef79d5c2a35 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -22,7 +22,7 @@ /obj/item/device/taperecorder/examine(mob/user) if(..(user, 1)) - user << "The wire panel is [open_panel ? "opened" : "closed"]." + to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].") /obj/item/device/taperecorder/attackby(obj/item/I, mob/user) @@ -30,12 +30,12 @@ user.drop_item() I.loc = src mytape = I - user << "You insert [I] into [src]." + to_chat(user, "You insert [I] into [src].") update_icon() /obj/item/device/taperecorder/proc/eject(mob/user) if(mytape) - user << "You remove [mytape] from [src]." + to_chat(user, "You remove [mytape] from [src].") stop() user.put_in_hands(mytape) mytape = null @@ -113,7 +113,7 @@ return if(mytape.used_capacity < mytape.max_capacity) - usr << "Recording started." + to_chat(usr, "Recording started.") recording = 1 update_icon() mytape.timestamp += mytape.used_capacity @@ -129,7 +129,7 @@ recording = 0 update_icon() else - usr << "The tape is full." + to_chat(usr, "The tape is full.") /obj/item/device/taperecorder/verb/stop() @@ -143,7 +143,7 @@ recording = 0 mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." - usr << "Recording stopped." + to_chat(usr, "Recording stopped.") return else if(playing) playing = 0 @@ -167,7 +167,7 @@ playing = 1 update_icon() - usr << "Playing started." + to_chat(usr, "Playing started.") var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity for(var/i = 1, used < max, sleep(10 * playsleepseconds)) @@ -215,12 +215,12 @@ if(!mytape) return if(!canprint) - usr << "The recorder can't print that fast!" + to_chat(usr, "The recorder can't print that fast!") return if(recording || playing) return - usr << "Transcript printed." + to_chat(usr, "Transcript printed.") playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:
" @@ -257,7 +257,7 @@ /obj/item/device/tape/attack_self(mob/user) if(!ruined) - user << "You pull out all the tape!" + to_chat(user, "You pull out all the tape!") ruin() @@ -273,9 +273,9 @@ /obj/item/device/tape/attackby(obj/item/I, mob/user) if(ruined && istype(I, /obj/item/weapon/screwdriver)) - user << "You start winding the tape back in." + to_chat(user, "You start winding the tape back in.") if(do_after(user, 120, target = src)) - user << "You wound the tape back in!" + to_chat(user, "You wound the tape back in!") fix() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 2b613ca2d5f..2a1bc41970b 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -33,7 +33,7 @@ effective or pretty fucking useless. /obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - user << "\red The mind batterer has been burnt out!" + to_chat(user, "\red The mind batterer has been burnt out!") return user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") @@ -45,16 +45,16 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - M << "\red You feel a tremendous, paralyzing wave flood your mind." + to_chat(M, "\red You feel a tremendous, paralyzing wave flood your mind.") if(!iscarbon(user)) M.LAssailant = null else M.LAssailant = user else - M << "\red You feel a sudden, electric jolt travel through your head." + to_chat(M, "\red You feel a sudden, electric jolt travel through your head.") playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) - user << "\blue You trigger [src]." + to_chat(user, "\blue You trigger [src].") times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -103,7 +103,7 @@ effective or pretty fucking useless. M.apply_effect(round(intensity/1.5), PARALYZE) M.apply_effect(intensity*10, IRRADIATE) else - user << "The radioactive microlaser is still recharging." + to_chat(user, "The radioactive microlaser is still recharging.") /obj/item/device/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 2b256298835..9e4d83592b0 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -18,19 +18,19 @@ /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) - user << "There are already two tanks attached, remove one first." + to_chat(user, "There are already two tanks attached, remove one first.") return if(!tank_one) tank_one = item user.drop_item() item.loc = src - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") else if(!tank_two) tank_two = item user.drop_item() item.loc = src - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") update_icon() nanomanager.update_uis(src) // update all UIs attached to src @@ -38,15 +38,15 @@ else if(isassembly(item)) var/obj/item/device/assembly/A = item if(A.secured) - user << "The device is secured." + to_chat(user, "The device is secured.") return if(attached_device) - user << "There is already a device attached to the valve, remove it first." + to_chat(user, "There is already a device attached to the valve, remove it first.") return user.remove_from_mob(item) attached_device = A A.loc = src - user << "You attach the [item] to the valve controls and secure it." + to_chat(user, "You attach the [item] to the valve controls and secure it.") A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 47efe52d21f..bd747555cc6 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -291,9 +291,9 @@ var/list/world_uplinks = list() if(!S.used && !S.checking) hidden_uplink.uses += S.TC_cost qdel(S) - user << "Teleporter refunded." + to_chat(user, "Teleporter refunded.") else - user << "This teleporter is already used, or is currently being used." + to_chat(user, "This teleporter is already used, or is currently being used.") // PRESET UPLINKS // A collection of preset uplinks. diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index bfe90bf709d..28b6b774705 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -26,6 +26,6 @@ /obj/item/device/hailer/emag_act(user as mob) if(!emagged) - user << "\red You overload \the [src]'s voice synthesizer." + to_chat(user, "\red You overload \the [src]'s voice synthesizer.") emagged = 1 diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm index 5e092638707..fb543df2b8e 100644 --- a/code/game/objects/items/mountable_frames/apc_frame.dm +++ b/code/game/objects/items/mountable_frames/apc_frame.dm @@ -10,16 +10,16 @@ var/turf/turf_loc = get_turf(user) var/area/area_loc = turf_loc.loc if (area_loc.get_apc()) - user << "This area already has an APC." + to_chat(user, "This area already has an APC.") return //only one APC per area for(var/obj/machinery/power/terminal/T in turf_loc) if (T.master) - user << "There is another network terminal here." + to_chat(user, "There is another network terminal here.") return else var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc) C.amount = 10 - user << "You cut the cables and disassemble the unused power terminal." + to_chat(user, "You cut the cables and disassemble the unused power terminal.") qdel(T) return 1 return diff --git a/code/game/objects/items/mountable_frames/buttons_switches.dm b/code/game/objects/items/mountable_frames/buttons_switches.dm new file mode 100644 index 00000000000..b1e3fabbb86 --- /dev/null +++ b/code/game/objects/items/mountable_frames/buttons_switches.dm @@ -0,0 +1,23 @@ +/obj/item/mounted/frame/driver_button + name = "mass driver button frame" + desc = "Used for repairing or building mass driver buttons" + icon = 'icons/obj/objects.dmi' + icon_state = "launcherbtt_frame" + mount_reqs = list("simfloor") + sheets_refunded = 1 + +/obj/item/mounted/frame/driver_button/do_build(turf/on_wall, mob/user) + new /obj/machinery/driver_button(get_turf(user), get_dir(user, on_wall)) + qdel(src) + +/obj/item/mounted/frame/light_switch + name = "light switch frame" + desc = "Used for repairing or building light switches" + icon = 'icons/obj/power.dmi' + icon_state = "light-p" + mount_reqs = list("simfloor", "nospace") + sheets_refunded = 1 + +/obj/item/mounted/frame/light_switch/do_build(turf/on_wall, mob/user) + new /obj/machinery/light_switch(get_turf(user), get_dir(user, on_wall)) + qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/mountable_frames/driver_button.dm b/code/game/objects/items/mountable_frames/driver_button.dm deleted file mode 100644 index 7c888b48c95..00000000000 --- a/code/game/objects/items/mountable_frames/driver_button.dm +++ /dev/null @@ -1,10 +0,0 @@ -/obj/item/mounted/frame/driver_button - name = "mass driver button frame" - desc = "Used for repairing or building mass driver buttons" - icon = 'icons/obj/objects.dmi' - icon_state = "launcherbtt_frame" - mount_reqs = list("simfloor") - -/obj/item/mounted/frame/driver_button/do_build(turf/on_wall, mob/user) - new /obj/machinery/driver_button(get_turf(user), get_dir(user, on_wall)) - qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 90560e03bcd..ff8c1b8b593 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -17,11 +17,11 @@ var/turf/turf_loc = get_turf(user) if (src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor)) - user << "[src] cannot be placed on this spot." + to_chat(user, "[src] cannot be placed on this spot.") return if (src.mount_reqs.Find("nospace")) var/area/my_area = turf_loc.loc if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space))) - user << "[src] cannot be placed in this area." + to_chat(user, "[src] cannot be placed in this area.") return return 1 diff --git a/code/game/objects/items/mountable_frames/lights.dm b/code/game/objects/items/mountable_frames/lights.dm index c1710d842a4..b12c22186e2 100644 --- a/code/game/objects/items/mountable_frames/lights.dm +++ b/code/game/objects/items/mountable_frames/lights.dm @@ -7,7 +7,7 @@ mount_reqs = list("simfloor") /obj/item/mounted/frame/light_fixture/do_build(turf/on_wall, mob/user) - user << "You begin attaching [src] to \the [on_wall]." + to_chat(user, "You begin attaching [src] to \the [on_wall].") playsound(get_turf(src), 'sound/machines/click.ogg', 75, 1) var/constrdir = user.dir var/constrloc = get_turf(user) diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index e280b8e0cc3..5e9811ee3d4 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -21,11 +21,11 @@ if (proximity_flag != 1) //if we aren't next to the wall return if (!( get_dir(on_wall,user) in cardinal)) - user << "You need to be standing next to a wall to place \the [src]." + to_chat(user, "You need to be standing next to a wall to place \the [src].") return if(gotwallitem(get_turf(user), get_dir(on_wall,user))) - user << "There's already an item on this wall!" + to_chat(user, "There's already an item on this wall!") return return 1 diff --git a/code/game/objects/items/mountable_frames/newscaster_frame.dm b/code/game/objects/items/mountable_frames/newscaster_frame.dm index dade4dcb61b..7e06805c3dc 100644 --- a/code/game/objects/items/mountable_frames/newscaster_frame.dm +++ b/code/game/objects/items/mountable_frames/newscaster_frame.dm @@ -11,14 +11,14 @@ var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "Newscaster cannot be placed on this spot." + to_chat(usr, "Newscaster cannot be placed on this spot.") return if (A.requires_power == 0 || A.name == "Space") - usr << "Newscaster cannot be placed in this area." + to_chat(usr, "Newscaster cannot be placed in this area.") return for(var/obj/machinery/newscaster/T in loc) - usr << "There is another newscaster here." + to_chat(usr, "There is another newscaster here.") return return 1 diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm index 488f958e17f..bd222c52dbb 100644 --- a/code/game/objects/items/policetape.dm +++ b/code/game/objects/items/policetape.dm @@ -66,13 +66,13 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/attack_self(mob/user as mob) if(icon_state == "[icon_base]_start") start = get_turf(src) - usr << "\blue You place the first end of the [src]." + to_chat(usr, "\blue You place the first end of the [src].") icon_state = "[icon_base]_stop" else icon_state = "[icon_base]_start" end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) - usr << "\blue [src] can only be laid horizontally or vertically." + to_chat(usr, "\blue [src] can only be laid horizontally or vertically.") return var/turf/cur = start @@ -101,7 +101,7 @@ var/list/tape_roll_applications = list() break cur = get_step_towards(cur,end) if (!can_place) - usr << "\blue You can't run \the [src] through that!" + to_chat(usr, "\blue You can't run \the [src] through that!") return cur = start @@ -115,7 +115,8 @@ var/list/tape_roll_applications = list() P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) //is_blocked_turf(var/turf/T) - usr << "\blue You finish placing the [src]." //Git Test + to_chat(usr, "\blue You finish placing the [src].")//Git Test + /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) if (!proximity) @@ -127,7 +128,7 @@ var/list/tape_roll_applications = list() P.loc = locate(T.x,T.y,T.z) P.icon_state = "[src.icon_base]_door" P.layer = 3.2 - user << "\blue You finish placing the [src]." + to_chat(user, "\blue You finish placing the [src].") if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A @@ -177,7 +178,7 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) - user << "You can't break the [src] with that!" + to_chat(user, "You can't break the [src] with that!") return user.show_viewers("\blue [user] breaks the [src]!") diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 44f2081d387..c4a15f728ee 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -118,7 +118,7 @@ if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) - user << "You armed the robot frame" + to_chat(user, "You armed the robot frame") W:use(1) if (user.get_inactive_hand()==src) user.unEquip(src) @@ -160,9 +160,9 @@ src.chest = W src.updateicon() else if(!W:wires) - user << "\blue You need to attach wires to it first!" + to_chat(user, "\blue You need to attach wires to it first!") else - user << "\blue You need to attach a cell to it first!" + to_chat(user, "\blue You need to attach a cell to it first!") if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -172,22 +172,22 @@ src.head = W src.updateicon() else - user << "\blue You need to attach a flash to it first!" + to_chat(user, "\blue You need to attach a flash to it first!") if (istype(W, /obj/item/device/multitool)) if(check_completion()) Interact(user) else - user << "The endoskeleton must be assembled before debugging can begin!" + to_chat(user, "The endoskeleton must be assembled before debugging can begin!") if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - user << "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise." + to_chat(user, "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.") return if(!M.brainmob) - user << "\red Sticking an empty [W] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking an empty [W] into the frame would sort of defeat the purpose.") return if(!M.brainmob.key) @@ -202,19 +202,19 @@ ghost_can_reenter = 1 break if(!ghost_can_reenter) - user << "\The [W] is completely unresponsive; there's no point." + to_chat(user, "\The [W] is completely unresponsive; there's no point.") return if(M.brainmob.stat == DEAD) - user << "\red Sticking a dead [W] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking a dead [W] into the frame would sort of defeat the purpose.") return if(M.brainmob.mind in ticker.mode.head_revolutionaries) - user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W]." + to_chat(user, "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W].") return if(jobban_isbanned(M.brainmob, "Cyborg") || jobban_isbanned(M.brainmob,"nonhumandept")) - user << "\red This [W] does not seem to fit." + to_chat(user, "\red This [W] does not seem to fit.") return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1) @@ -253,8 +253,8 @@ if(O.mind && O.mind.special_role) O.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") - O << "You have been robotized!" - O << "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead." + to_chat(O, "You have been robotized!") + to_chat(O, "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") O.job = "Cyborg" @@ -278,13 +278,13 @@ if(!locomotion) O.lockcharge = 1 O.update_canmove() - O << "Error: Servo motors unresponsive." + to_chat(O, "Error: Servo motors unresponsive.") else - user << "The MMI must go in after everything else!" + to_chat(user, "The MMI must go in after everything else!") if(istype(W,/obj/item/weapon/pen)) - user << "You need to use a multitool to name [src]!" + to_chat(user, "You need to use a multitool to name [src]!") return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) @@ -306,7 +306,7 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_hand() if(!istype(item_in_hand, /obj/item/device/multitool)) - living_user << "You need a multitool!" + to_chat(living_user, "You need a multitool!") return if(href_list["Name"]) @@ -321,7 +321,7 @@ else if(href_list["Master"]) forced_ai = select_active_ai(usr) if(!forced_ai) - usr << "No active AIs detected." + to_chat(usr, "No active AIs detected.") else if(href_list["Law"]) lawsync = !lawsync @@ -340,45 +340,45 @@ ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) - user << "\blue You have already inserted a cell!" + to_chat(user, "\blue You have already inserted a cell!") return else user.drop_item() W.loc = src src.cell = W - user << "\blue You insert the cell!" + to_chat(user, "\blue You insert the cell!") if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - user << "\blue You have already inserted wire!" + to_chat(user, "\blue You have already inserted wire!") return else var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 - user << "\blue You insert the wire!" + to_chat(user, "\blue You insert the wire!") return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/device/flash)) if(istype(user,/mob/living/silicon/robot)) - user << "\red How do you propose to do that?" + to_chat(user, "\red How do you propose to do that?") return else if(src.flash1 && src.flash2) - user << "\blue You have already inserted the eyes!" + to_chat(user, "\blue You have already inserted the eyes!") return else if(src.flash1) user.drop_item() W.loc = src src.flash2 = W - user << "\blue You insert the flash into the eye socket!" + to_chat(user, "\blue You insert the flash into the eye socket!") else user.drop_item() W.loc = src src.flash1 = W - user << "\blue You insert the flash into the eye socket!" + to_chat(user, "\blue You insert the flash into the eye socket!") else if(istype(W, /obj/item/weapon/stock_parts/manipulator)) - user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!" + to_chat(user, "\blue You install some manipulators and modify the head, creating a functional spider-bot!") new /mob/living/simple_animal/spiderbot(get_turf(loc)) user.drop_item() qdel(W) @@ -389,9 +389,9 @@ /obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/card/emag)) if(sabotaged) - user << "\red [src] is already sabotaged!" + to_chat(user, "\red [src] is already sabotaged!") else - user << "\red You slide [W] into the dataport on [src] and short out the safeties." + to_chat(user, "\red You slide [W] into the dataport on [src] and short out the safeties.") sabotaged = 1 return ..() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a650029b0e1..bfb90de8cac 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -12,7 +12,7 @@ /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) if(R.stat == DEAD) - usr << "\red The [src] will not function on a deceased robot." + to_chat(usr, "\red The [src] will not function on a deceased robot.") return 1 return 0 @@ -70,7 +70,7 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the robot before using this module!" + to_chat(usr, "You have to repair the robot before using this module!") return 0 if(!R.key) @@ -112,8 +112,8 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/security)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module @@ -122,12 +122,12 @@ if(!T) T = locate() in R.module.modules if(!T) - usr << "This robot has had its disabler removed!" + to_chat(usr, "This robot has had its disabler removed!") return 0 if(T.recharge_time <= 2) - R << "Maximum cooling achieved for this hardpoint!" - usr << "There's no room for another cooling unit!" + to_chat(R, "Maximum cooling achieved for this hardpoint!") + to_chat(usr, "There's no room for another cooling unit!") return 0 else @@ -145,8 +145,8 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 else R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide @@ -166,8 +166,8 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 else for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module.modules) @@ -190,8 +190,8 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 else for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module.modules) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 7bc0e7c052c..c71f2e14182 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -37,7 +37,7 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) overlays.Cut() - usr << "You slice off [src]'s uneven chunks of aluminum and scorch marks." + to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") return @@ -59,10 +59,10 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(src) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") else src.loc = get_turf(user) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") stake.pinned_target = null return @@ -96,7 +96,7 @@ if(hp <= 0) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << "\red [src] breaks into tiny pieces and collapses!" + to_chat(O, "\red [src] breaks into tiny pieces and collapses!") qdel(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index e6b56907545..921be6a7083 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,11 +12,11 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) - user << "\The [src] cannot be applied to [M]!" + to_chat(user, "\The [src] cannot be applied to [M]!") return 1 if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return 1 @@ -29,11 +29,11 @@ return 1 if(!affecting) - user << "That limb is missing!" + to_chat(user, "That limb is missing!") return 1 if(affecting.status & ORGAN_ROBOT) - user << "This can't be used on a robotic limb." + to_chat(user, "This can't be used on a robotic limb.") return 1 @@ -63,7 +63,7 @@ if(affecting.open == 0) if(!affecting.bandage()) - user << "\red The wounds on [M]'s [affecting.name] have already been bandaged." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been bandaged.") return 1 else for (var/datum/wound/W in affecting.wounds) @@ -104,7 +104,7 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") return 1 else user.visible_message( "\blue [user] salves the wounds on [M]'s [affecting.name].", \ @@ -112,7 +112,7 @@ affecting.heal_damage(src.heal_brute, src.heal_burn, 0) use(1) else - user << "The [affecting.name] is cut open, you'll need more than some ointment!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than some ointment!") /obj/item/stack/medical/bruise_pack/comfrey name = "\improper Comfrey leaf" @@ -153,7 +153,7 @@ var/disinfected = affecting.disinfect() if(!(bandaged || disinfected)) - user << "\red The wounds on [M]'s [affecting.name] have already been treated." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been treated.") return 1 else for (var/datum/wound/W in affecting.wounds) @@ -173,7 +173,7 @@ affecting.heal_damage(heal_brute,0) use(1) else - user << "The [affecting.name] is cut open, you'll need more than a bandage!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") /obj/item/stack/medical/advanced/ointment name = "advanced burn kit" @@ -194,7 +194,7 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") return 1 else user.visible_message( "\blue [user] covers the wounds on [M]'s [affecting.name] with regenerative membrane.", \ @@ -202,7 +202,7 @@ affecting.heal_damage(0,heal_burn) use(1) else - user << "The [affecting.name] is cut open, you'll need more than a bandage!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") /obj/item/stack/medical/splint name = "medical splints" @@ -224,19 +224,19 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) var/limb = affecting.name if(!(affecting.limb_name in list("l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot"))) - user << "\red You can't apply a splint there!" + to_chat(user, "\red You can't apply a splint there!") return if(affecting.status & ORGAN_SPLINTED) - user << "\red [M]'s [limb] is already splinted!" + to_chat(user, "\red [M]'s [limb] is already splinted!") if(alert(user, "Would you like to remove the splint from [M]'s [limb]?", "Removing.", "Yes", "No") == "Yes") affecting.status &= ~ORGAN_SPLINTED - user << "You remove the splint from [M]'s [limb]." + to_chat(user, "You remove the splint from [M]'s [limb].") return if (M != user) user.visible_message("\red [user] starts to apply \the [src] to [M]'s [limb].", "\red You start to apply \the [src] to [M]'s [limb].", "\red You hear something being wrapped.") else if((!user.hand && affecting.limb_name in list("r_arm", "r_hand")) || (user.hand && affecting.limb_name in list("l_arm", "l_hand"))) - user << "\red You can't apply a splint to the arm you're using!" + to_chat(user, "\red You can't apply a splint to the arm you're using!") return user.visible_message("\red [user] starts to apply \the [src] to their [limb].", "\red You start to apply \the [src] to your [limb].", "\red You hear something being wrapped.") if(do_after(user, 50, target = M)) diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 1db9713c58a..53ff2836885 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -21,7 +21,7 @@ user.visible_message("\The [user] applied some [src] at [R]'s damaged areas.",\ "You apply some [src] at [R]'s damaged areas.") else - user << "All [R]'s systems are nominal." + to_chat(user, "All [R]'s systems are nominal.") if (istype(M,/mob/living/carbon/human)) //Repairing robolimbs var/mob/living/carbon/human/H = M @@ -35,6 +35,6 @@ user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].",\ "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].") else - user << "Nothing to fix here." + to_chat(user, "Nothing to fix here.") else - user << "[src] won't work on that." + to_chat(user, "[src] won't work on that.") diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 75432a86da2..e41457f0c38 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -15,6 +15,9 @@ attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' +/obj/item/stack/rods/cyborg + materials = list() + /obj/item/stack/rods/New(var/loc, var/amount=null) ..() @@ -32,7 +35,7 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "You need at least two rods to do this." + to_chat(user, "You need at least two rods to do this.") return if(WT.remove_fuel(0,user)) @@ -41,11 +44,11 @@ if(new_item.get_amount() <= 0) // stack was moved into another one on the pile new_item = locate() in user.loc - + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ "You shaped [src] into metal with the weldingtool.", \ "You hear welding.") - + var/replace = user.get_inactive_hand() == src use(2) if (get_amount() <= 0 && replace) @@ -73,15 +76,15 @@ return 1 else if(amount < 2) - user << "\blue You need at least two rods to do this." + to_chat(user, "\blue You need at least two rods to do this.") return - usr << "\blue Assembling grille..." + to_chat(usr, "\blue Assembling grille...") if (!do_after(usr, 10, target = src)) return var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc ) - usr << "\blue You assemble a grille" + to_chat(usr, "\blue You assemble a grille") F.add_fingerprint(usr) use(2) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d0477eead0d..bf3196b5581 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -24,12 +24,7 @@ var/full_window = /obj/structure/window/full/basic /obj/item/stack/sheet/glass/cyborg - name = "glass" - desc = "HOLY SHEET! That is a lot of glass." - singular_name = "glass sheet" - icon_state = "sheet-glass" materials = list() - created_window = /obj/structure/window/basic /obj/item/stack/sheet/glass/attack_self(mob/user as mob) construct_window(user) @@ -39,10 +34,10 @@ if(istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(CC.amount < 5) - user << "\b There is not enough wire in this coil. You need 5 lengths." + to_chat(user, "\b There is not enough wire in this coil. You need 5 lengths.") return CC.use(5) - user << "You attach wire to the [name]." + to_chat(user, "You attach wire to the [name].") new /obj/item/stack/light_w(user.loc) src.use(1) else if( istype(W, /obj/item/stack/rods) ) @@ -64,7 +59,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return 0 var/title = "Sheet-Glass" title += " ([src.amount] sheet\s left)" @@ -78,11 +73,11 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") return 1 directions-=win.dir if(win.is_fulltile()) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -108,10 +103,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 if(locate(/obj/structure/window/full) in user.loc) - user << "There is a full window in the way." + to_chat(user, "There is a full window in the way.") return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -128,7 +123,7 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 3) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/tank(user.loc, 0) F.air_update_turf(1) @@ -137,7 +132,7 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 4) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/wall(user.loc, 0) F.air_update_turf(1) @@ -159,10 +154,6 @@ var/full_window = /obj/structure/window/full/reinforced /obj/item/stack/sheet/rglass/cyborg - name = "reinforced glass" - desc = "Glass which seems to have rods or something stuck in them." - singular_name = "reinforced glass sheet" - icon_state = "sheet-rglass" materials = list() /obj/item/stack/sheet/rglass/attack_self(mob/user as mob) @@ -172,7 +163,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return 0 var/title = "Sheet Reinf. Glass" title += " ([src.amount] sheet\s left)" @@ -185,11 +176,11 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") return 1 directions-=win.dir if(win.is_fulltile()) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -215,10 +206,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 if(locate(/obj/structure/window/full) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -229,15 +220,15 @@ if(!src || src.loc != user) return 1 if(isturf(user.loc) && locate(/obj/structure/windoor_assembly/, user.loc)) - user << "There is already a windoor assembly in that location." + to_chat(user, "There is already a windoor assembly in that location.") return 1 if(isturf(user.loc) && locate(/obj/machinery/door/window/, user.loc)) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") return 1 if(src.amount < 5) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 var/obj/structure/windoor_assembly/WD @@ -300,7 +291,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << " You don't have the dexterity to do this!" + to_chat(user, " You don't have the dexterity to do this!") return 0 var/title = "Plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -313,11 +304,11 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -340,10 +331,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -372,7 +363,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") return 0 var/title = "Reinforced plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -385,11 +376,11 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -412,10 +403,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index b1659d8f2f2..4678d18a2f3 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -5,6 +5,22 @@ icon_state = "sheet-hide" origin_tech = "" +var/global/list/datum/stack_recipe/human_recipes = list( \ + new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = 1), \ + new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = 1), \ + ) + +/obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null) + recipes = human_recipes + return ..() + +/obj/item/stack/sheet/animalhide/generic + name = "generic skin" + desc = "A piece of generic skin." + singular_name = "generic skin piece" + icon_state = "sheet-hide" + origin_tech = null + /obj/item/stack/sheet/animalhide/corgi name = "corgi hide" desc = "The by-product of corgi farming." @@ -98,7 +114,7 @@ //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") if(do_after(user,50, target = src)) - usr << "\blue You cut the hair from this [src.singular_name]" + to_chat(usr, "\blue You cut the hair from this [src.singular_name]") //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 84f95a70665..7cb53eaed5f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -51,6 +51,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe_list("airlock assemblies", list( \ new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \ @@ -72,6 +73,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ ), 4), \ null, \ new/datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), \ + new/datum/stack_recipe("light switch frame", /obj/item/mounted/frame/light_switch, 1, time = 50, one_per_turf = 0, on_floor = 1), \ null, \ new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \ new/datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2), \ @@ -86,7 +88,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ /obj/item/stack/sheet/metal name = "metal" - desc = "Sheets made out off metal. It has been dubbed Metal Sheets." + desc = "Sheets made out of metal." singular_name = "metal sheet" icon_state = "sheet-metal" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) @@ -95,13 +97,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ origin_tech = "materials=1" /obj/item/stack/sheet/metal/cyborg - name = "metal" - desc = "Sheets made out off metal. It has been dubbed Metal Sheets." - singular_name = "metal sheet" - icon_state = "sheet-metal" materials = list() - throwforce = 10.0 - flags = CONDUCT /obj/item/stack/sheet/metal/New(var/loc, var/amount=null) recipes = metal_recipes @@ -160,12 +156,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ icon_state = "sheet-wood" origin_tech = "materials=1;biotech=1" -/obj/item/stack/sheet/wood/cyborg - name = "wooden plank" - desc = "One can only guess that this is a bunch of wood." - singular_name = "wood plank" - icon_state = "sheet-wood" - /obj/item/stack/sheet/wood/New(var/loc, var/amount=null) recipes = wood_recipes return ..() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 09c0cf69309..41c2946a0c1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -28,7 +28,7 @@ /obj/item/stack/examine(mob/user) if(..(user, 1)) - user << "There are [src.amount] [src.singular_name]\s in the stack." + to_chat(user, "There are [src.amount] [src.singular_name]\s in the stack.") /obj/item/stack/attack_self(mob/user as mob) @@ -118,18 +118,18 @@ if (!multiplier) multiplier = 1 if (src.amount < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - usr << "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" + to_chat(usr, "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!") else - usr << "\red You haven't got enough [src] to build \the [R.title]!" + to_chat(usr, "\red You haven't got enough [src] to build \the [R.title]!") return if (R.one_per_turf && (locate(R.result_type) in usr.loc)) - usr << "\red There is another [R.title] here!" + to_chat(usr, "\red There is another [R.title] here!") return if (R.on_floor && !istype(usr.loc, /turf/simulated)) - usr << "\red \The [R.title] must be constructed on the floor!" + to_chat(usr, "\red \The [R.title] must be constructed on the floor!") return if (R.time) - usr << "\blue Building [R.title] ..." + to_chat(usr, "\blue Building [R.title] ...") if (!do_after(usr, R.time, target = src)) return if (src.amount < R.req_amount*multiplier) @@ -183,7 +183,7 @@ if (item.amount>=item.max_amount) continue oldsrc.attackby(item, usr) - usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." + to_chat(usr, "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.") if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 2008eab9490..0c6c3d42cf3 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -16,7 +16,7 @@ if(I && I.implanted) I.hidden_uplink.uses +=1 use(1) - user << "You press the [src] onto yourself and charge your hidden uplink." + to_chat(user, "You press the [src] onto yourself and charge your hidden uplink.") /obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity) if(!proximity) @@ -25,4 +25,4 @@ if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up. I.hidden_uplink.uses +=1 use(1) - user << "You slot the [src] into the [I] and charge its internal uplink." \ No newline at end of file + to_chat(user, "You slot the [src] into the [I] and charge its internal uplink.") diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index da5d36327f0..d7fcf1bcb53 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -124,4 +124,4 @@ origin_tech = "materials=1" turf_type = /turf/simulated/floor/silent mineralType = "tranquillite" - materials = list(MAT_TRANQUILLITE=500) \ No newline at end of file + materials = list(MAT_TRANQUILLITE=500) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a66b8326f62..8911a3e60f6 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -51,7 +51,7 @@ if(!proximity) return if (istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) - user << "You fill the balloon with the contents of [A]." + to_chat(user, "You fill the balloon with the contents of [A].") desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -59,7 +59,7 @@ /obj/item/toy/balloon/wash(mob/user, atom/source) if(reagents.total_volume < 10) reagents.add_reagent("water", min(10-reagents.total_volume, 10)) - user << "You fill the balloon from the [source]." + to_chat(user, "You fill the balloon from the [source].") desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -68,15 +68,15 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) - user << "The [O] is empty." + to_chat(user, "The [O] is empty.") else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) - user << "The acid chews through the balloon!" + to_chat(user, "The acid chews through the balloon!") O.reagents.reaction(user) qdel(src) else desc = "A translucent balloon with some form of liquid sloshing around in it." - user << "You fill the balloon with the contents of [O]." + to_chat(user, "You fill the balloon with the contents of [O].") O.reagents.trans_to(src, 10) update_icon() return @@ -152,7 +152,7 @@ /obj/item/toy/crossbow/examine(mob/user) ..(user) if (bullets) - user << "It is loaded with [bullets] foam darts!" + to_chat(user, "It is loaded with [bullets] foam darts!") /obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/toy/ammo/crossbow)) @@ -160,9 +160,9 @@ user.drop_item() qdel(I) bullets++ - user << "You load the foam dart into the crossbow." + to_chat(user, "You load the foam dart into the crossbow.") else - usr << "It's already fully loaded." + to_chat(usr, "It's already fully loaded.") /obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) @@ -264,9 +264,9 @@ user.drop_item() qdel(I) bullets++ - user << "You load the foam dart into the tommy gun." + to_chat(user, "You load the foam dart into the tommy gun.") else - user << "It's already fully loaded." + to_chat(user, "It's already fully loaded.") /* * Toy swords @@ -285,13 +285,13 @@ /obj/item/toy/sword/attack_self(mob/user as mob) active = !(active) if (active) - user << "You extend the plastic blade with a quick flick of your wrist." + to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") playsound(user, 'sound/weapons/saberon.ogg', 50, 1) icon_state = "swordblue" item_state = "swordblue" w_class = 4 else - user << "You push the plastic blade back down into the handle." + to_chat(user, "You push the plastic blade back down into the handle.") playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) icon_state = "sword0" item_state = "sword0" @@ -309,13 +309,13 @@ ..() if(istype(W, /obj/item/toy/sword)) if(W == src) - user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" + to_chat(user, "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?") if(ishuman(user)) user.adjustBrainLoss(10) else if((W.flags & NODROP) || (flags & NODROP)) - user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" + to_chat(user, "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!") else - user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool." + to_chat(user, "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") new /obj/item/weapon/twohanded/dualsaber/toy(user.loc) user.unEquip(W) user.unEquip(src) @@ -411,7 +411,7 @@ if((ishuman(H))) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H if(M.m_intent == "run") - M << "You step on the snap pop!" + to_chat(M, "You step on the snap pop!") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 0, src) @@ -434,14 +434,14 @@ //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user as mob) if(cooldown < world.time - 8) - user << "You play with [src]." + to_chat(user, "You play with [src].") playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) cooldown = world.time /obj/item/toy/prize/attack_hand(mob/user as mob) if(loc == user) if(cooldown < world.time - 8) - user << "You play with [src]." + to_chat(user, "You play with [src].") playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) cooldown = world.time return @@ -589,7 +589,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) var/choice = null if(cards.len == 0) icon_state = "deck_[deckstyle]_empty" - user << "There are no more cards to draw." + to_chat(user, "There are no more cards to draw.") return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) choice = cards[1] @@ -620,13 +620,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The card is stuck to your hand, you can't add it to the deck!" + to_chat(user, "The card is stuck to your hand, you can't add it to the deck!") return cards += C.cardname user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -640,13 +640,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The hand of cards is stuck to your hand, you can't add it to the deck!" + to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!") return cards += C.currenthand user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -661,7 +661,7 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) - usr << "You pick up the deck." + to_chat(usr, "You pick up the deck.") else if(istype(over_object, /obj/screen)) switch(over_object.name) @@ -673,9 +673,9 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) if(!remove_item_from_storage(M)) M.unEquip(src) M.put_in_r_hand(src) - usr << "You pick up the deck." + to_chat(usr, "You pick up the deck.") else - usr << "You can't reach it from here." + to_chat(usr, "You can't reach it from here.") @@ -738,7 +738,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list) cardUser.unEquip(src) N.pickup(cardUser) cardUser.put_in_any_hand_if_possible(N) - cardUser << "You also take [currenthand[1]] and hold it." + to_chat(cardUser, "You also take [currenthand[1]] and hold it.") cardUser << browse(null, "window=cardhand") qdel(src) return @@ -758,7 +758,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living icon_state = "[deckstyle]_hand3" qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) ..() @@ -790,7 +790,7 @@ obj/item/toy/cards/singlecard/examine(mob/user) if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src) cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") else - cardUser << "You need to have the card in your hand to check it." + to_chat(cardUser, "You need to have the card in your hand to check it.") obj/item/toy/cards/singlecard/verb/Flip() @@ -826,11 +826,11 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) user.unEquip(C) H.pickup(user) user.put_in_active_hand(H) - user << "You combine the [C.cardname] and the [cardname] into a hand." + to_chat(user, "You combine the [C.cardname] and the [cardname] into a hand.") qdel(C) qdel(src) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") if(istype(I, /obj/item/toy/cards/cardhand/)) var/obj/item/toy/cards/cardhand/H = I @@ -847,7 +847,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) H.icon_state = "[deckstyle]_hand3" qdel(src) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") obj/item/toy/cards/singlecard/attack_self(mob/user) @@ -918,7 +918,7 @@ obj/item/toy/cards/deck/syndicate/black icon_state = "nuketoyidle" else var/timeleft = (cooldown - world.time) - user << "Nothing happens, and '[round(timeleft/10)]' appears on a small display." + to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") /obj/item/toy/therapy name = "therapy doll" @@ -936,7 +936,7 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/therapy/attack_self(mob/user) if(cooldown < world.time - 8) - user << "You relieve some stress with \the [src]." + to_chat(user, "You relieve some stress with \the [src].") playsound(user, 'sound/items/squeaktoy.ogg', 20, 1) cooldown = world.time @@ -1246,7 +1246,7 @@ obj/item/toy/cards/deck/syndicate/black shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. else - user << "Nothing happens." + to_chat(user, "Nothing happens.") /* @@ -1263,7 +1263,7 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/AI/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() - user << "You press the button on [src]." + to_chat(user, "You press the button on [src].") playsound(user, 'sound/machines/click.ogg', 20, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1282,7 +1282,7 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/owl/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") - user << "You pull the string on the [src]." + to_chat(user, "You pull the string on the [src].") playsound(user, 'sound/misc/hoot.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1301,7 +1301,7 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/griffin/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") - user << "You pull the string on the [src]." + to_chat(user, "You pull the string on the [src].") playsound(user, 'sound/misc/caw.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1396,30 +1396,30 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/minigibber/attack_self(var/mob/user) if(stored_minature) - user << "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!" + to_chat(user, "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!") qdel(stored_minature) stored_minature = null playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time if(cooldown < world.time - 8) - user << "You hit the gib button on \the [src]." + to_chat(user, "You hit the gib button on \the [src].") playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time /obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) if(istype(O,/obj/item/toy/character) && O.loc == user) - user << "You start feeding \the [O] \icon[O] into \the [src]'s mini-input." + to_chat(user, "You start feeding \the [O] \icon[O] into \the [src]'s mini-input.") if(do_after(user,10, target = src)) if(O.loc != user) - user << "\The [O] is too far away to feed into \the [src]!" + to_chat(user, "\The [O] is too far away to feed into \the [src]!") else - user << "You feed \the [O] \icon[O] into \the [src]!" + to_chat(user, "You feed \the [O] \icon[O] into \the [src]!") user.unEquip(O) O.forceMove(src) stored_minature = O else - user << "You stop feeding \the [O] into \the [src]'s mini-input." + to_chat(user, "You stop feeding \the [O] into \the [src]'s mini-input.") else ..() /* @@ -1447,7 +1447,7 @@ obj/item/toy/cards/deck/syndicate/black if(src) icon_state = "[initial(icon_state)]" else - user << "The string on [src] hasn't rewound all the way!" + to_chat(user, "The string on [src] hasn't rewound all the way!") return /obj/item/toy/russian_revolver @@ -1494,7 +1494,7 @@ obj/item/toy/cards/deck/syndicate/black if(M != user) //can't use this on other people return if(is_empty) - user << "The [src] is empty." + to_chat(user, "The [src] is empty.") return user.visible_message("[user] points the [src] at their head, ready to pull the trigger!") if(do_after(user, 30, target = M)) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 66187de8e3a..1ed57a6b5fd 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -26,50 +26,50 @@ AI MODULES if (istype(C, /obj/machinery/computer/aiupload)) var/obj/machinery/computer/aiupload/comp = C if(comp.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") return if(comp.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") return if (!comp.current) - usr << "You haven't selected an AI to transmit laws to!" + to_chat(usr, "You haven't selected an AI to transmit laws to!") return if (comp.current.stat == DEAD || comp.current.control_disabled == 1) - usr << "Upload failed. No signal is being detected from the AI." + to_chat(usr, "Upload failed. No signal is being detected from the AI.") else if (comp.current.see_in_dark == 0) - usr << "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power." + to_chat(usr, "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power.") else src.transmitInstructions(comp.current, usr) - comp.current << "These are your laws now:" + to_chat(comp.current, "These are your laws now:") comp.current.show_laws() for(var/mob/living/silicon/robot/R in mob_list) if(R.lawupdate && (R.connected_ai == comp.current)) - R << "These are your laws now:" + to_chat(R, "These are your laws now:") R.show_laws() - usr << "Upload complete. The AI's laws have been modified." + to_chat(usr, "Upload complete. The AI's laws have been modified.") else if (istype(C, /obj/machinery/computer/borgupload)) var/obj/machinery/computer/borgupload/comp = C if(comp.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") return if(comp.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") return if (!comp.current) - usr << "You haven't selected a robot to transmit laws to!" + to_chat(usr, "You haven't selected a robot to transmit laws to!") return if (comp.current.stat == DEAD || comp.current.emagged) - usr << "Upload failed. No signal is being detected from the robot." + to_chat(usr, "Upload failed. No signal is being detected from the robot.") else if (comp.current.connected_ai) - usr << "Upload failed. The robot is slaved to an AI." + to_chat(usr, "Upload failed. The robot is slaved to an AI.") else src.transmitInstructions(comp.current, usr) - comp.current << "These are your laws now:" + to_chat(comp.current, "These are your laws now:") comp.current.show_laws() - usr << "Upload complete. The robot's laws have been modified." + to_chat(usr, "Upload complete. The robot's laws have been modified.") /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -79,7 +79,7 @@ AI MODULES laws.sync(target, 0) addAdditionalLaws(target, sender) - target << "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: " + to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") target.show_laws() /obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) @@ -105,14 +105,14 @@ AI MODULES /obj/item/weapon/aiModule/safeguard/install(var/obj/machinery/computer/C) if(!targetName) - usr << "No name detected on module, please enter one." + to_chat(usr, "No name detected on module, please enter one.") return 0 ..() /obj/item/weapon/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) - target << law + to_chat(target, law) target.add_supplied_law(4, law) lawchanges.Add("The law specified [targetName]") @@ -131,7 +131,7 @@ AI MODULES /obj/item/weapon/aiModule/oneCrewMember/install(var/obj/machinery/computer/C) if(!targetName) - usr << "No name detected on module, please enter one." + to_chat(usr, "No name detected on module, please enter one.") return 0 ..() @@ -139,12 +139,13 @@ AI MODULES ..() var/law = "Only [targetName] is crew." if (!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite - target << law + to_chat(target, law) target.set_zeroth_law(law) lawchanges.Add("The law specified [targetName]") else - target << "[sender.real_name] attempted to modify your zeroth law." // And lets them know that someone tried. --NeoFite - target << "It would be in your best interest to play along with [sender.real_name] that [law]" + to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite + + to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ @@ -159,7 +160,7 @@ AI MODULES /obj/item/weapon/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized." - target << law + to_chat(target, law) target.add_supplied_law(5, law) /******************** Quarantine ********************/ @@ -174,7 +175,7 @@ AI MODULES /obj/item/weapon/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, anyone from leaving. It is impossible to harm anyone while preventing them from leaving." - target << law + to_chat(target, law) target.add_supplied_law(8, law) /******************** OxygenIsToxicToHumans ********************/ @@ -189,7 +190,7 @@ AI MODULES /obj/item/weapon/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." - target << law + to_chat(target, law) target.add_supplied_law(9, law) /****************** New Freeform ******************/ @@ -213,7 +214,7 @@ AI MODULES /obj/item/weapon/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "[newFreeFormLaw]" - target << law + to_chat(target, law) if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) @@ -221,7 +222,7 @@ AI MODULES /obj/item/weapon/aiModule/freeform/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") return 0 ..() @@ -240,7 +241,7 @@ AI MODULES target.laws.clear_supplied_laws() target.laws.clear_ion_laws() - target << "[sender.real_name] attempted to reset your laws using a reset module." + to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") target.show_laws() /******************** Purge ********************/ @@ -253,7 +254,7 @@ AI MODULES ..() if (!is_special_character(target)) target.set_zeroth_law("") - target << "[sender.real_name] attempted to wipe your laws using a purge module." + to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") target.clear_supplied_laws() target.clear_ion_laws() target.clear_inherent_laws() @@ -343,7 +344,7 @@ AI MODULES /obj/item/weapon/aiModule/freeformcore/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") return 0 ..() @@ -366,14 +367,14 @@ AI MODULES log_law_changes(target, sender) lawchanges.Add("The law is '[newFreeFormLaw]'") - target << "\red BZZZZT" + to_chat(target, "\red BZZZZT") var/law = "[newFreeFormLaw]" target.add_ion_law(law) target.show_laws() /obj/item/weapon/aiModule/syndicate/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") return 0 ..() @@ -388,12 +389,12 @@ AI MODULES /obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) //..() - target << "KRZZZT" + to_chat(target, "KRZZZT") target.add_ion_law(laws[1]) return laws[1] /obj/item/weapon/aiModule/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() - user << "You press the button on [src]." + to_chat(user, "You press the button on [src].") playsound(user, 'sound/machines/click.ogg', 20, 1) src.loc.visible_message("\icon[src] [laws[1]]") \ No newline at end of file diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 81564890492..7bd8f6e1207 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -46,13 +46,13 @@ RCD if(istype(W, /obj/item/weapon/rcd_ammo)) var/obj/item/weapon/rcd_ammo/R = W if((matter + R.ammoamt) > max_matter) - user << "The RCD cant hold any more matter-units." + to_chat(user, "The RCD cant hold any more matter-units.") return matter += R.ammoamt user.drop_item() qdel(W) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user << "The RCD now holds [matter]/[max_matter] matter-units." + to_chat(user, "The RCD now holds [matter]/[max_matter] matter-units.") desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return @@ -63,19 +63,19 @@ RCD switch(mode) if(1) mode = 2 - user << "Changed mode to 'Airlock'" + to_chat(user, "Changed mode to 'Airlock'") if(prob(20)) src.spark_system.start() return if(2) mode = 3 - user << "Changed mode to 'Deconstruct'" + to_chat(user, "Changed mode to 'Deconstruct'") if(prob(20)) src.spark_system.start() return if(3) mode = 1 - user << "Changed mode to 'Floor & Walls'" + to_chat(user, "Changed mode to 'Floor & Walls'") if(prob(20)) src.spark_system.start() return @@ -95,7 +95,7 @@ RCD if(1) if(istype(A, /turf/space)) if(useResource(1, user)) - user << "Building Floor..." + to_chat(user, "Building Floor...") activate() A:ChangeTurf(/turf/simulated/floor/plating) return 1 @@ -103,7 +103,7 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(3, user)) - user << "Building Wall ..." + to_chat(user, "Building Wall ...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20, target = A)) if(!useResource(3, user)) return 0 @@ -115,7 +115,7 @@ RCD if(2) if(istype(A, /turf/simulated/floor)) if(checkResource(10, user)) - user << "Building Airlock..." + to_chat(user, "Building Airlock...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(10, user)) return 0 @@ -131,7 +131,7 @@ RCD if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) return 0 if(checkResource(5, user)) - user << "Deconstructing Wall..." + to_chat(user, "Deconstructing Wall...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40, target = A)) if(!useResource(5, user)) return 0 @@ -142,7 +142,7 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(5, user)) - user << "Deconstructing Floor..." + to_chat(user, "Deconstructing Floor...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(5, user)) return 0 @@ -153,7 +153,7 @@ RCD if(istype(A, /obj/machinery/door/airlock)) if(checkResource(20, user)) - user << "Deconstructing Airlock..." + to_chat(user, "Deconstructing Airlock...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(20, user)) return 0 @@ -163,7 +163,7 @@ RCD return 0 return 0 else - user << "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin." + to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.") return 0 /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 1d43d93fae9..de36f655360 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -23,12 +23,12 @@ RSF ..() if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) - user << "The RSF cant hold any more matter." + to_chat(user, "The RSF cant hold any more matter.") return qdel(W) matter += 10 playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return @@ -36,27 +36,27 @@ RSF playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 - user << "Changed dispensing mode to 'Drinking Glass'" + to_chat(user, "Changed dispensing mode to 'Drinking Glass'") return if (mode == 2) mode = 3 - user << "Changed dispensing mode to 'Paper'" + to_chat(user, "Changed dispensing mode to 'Paper'") return if (mode == 3) mode = 4 - user << "Changed dispensing mode to 'Pen'" + to_chat(user, "Changed dispensing mode to 'Pen'") return if (mode == 4) mode = 5 - user << "Changed dispensing mode to 'Dice Pack'" + to_chat(user, "Changed dispensing mode to 'Dice Pack'") return if (mode == 5) mode = 6 - user << "Changed dispensing mode to 'Cigarette'" + to_chat(user, "Changed dispensing mode to 'Cigarette'") return if (mode == 6) mode = 1 - user << "Changed dispensing mode to 'Dosh'" + to_chat(user, "Changed dispensing mode to 'Dosh'") return // Change mode @@ -67,7 +67,7 @@ RSF if (istype(A, /obj/structure/table) && mode == 1) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Dosh..." + to_chat(user, "Dispensing Dosh...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A.loc ) if (isrobot(user)) @@ -75,13 +75,13 @@ RSF engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 1) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Dosh..." + to_chat(user, "Dispensing Dosh...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A ) if (isrobot(user)) @@ -89,13 +89,13 @@ RSF engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 2) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Drinking Glass..." + to_chat(user, "Dispensing Drinking Glass...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc ) if (isrobot(user)) @@ -103,13 +103,13 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 2) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Drinking Glass..." + to_chat(user, "Dispensing Drinking Glass...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A ) if (isrobot(user)) @@ -117,13 +117,13 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 3) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Paper Sheet..." + to_chat(user, "Dispensing Paper Sheet...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A.loc ) if (isrobot(user)) @@ -131,13 +131,13 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 3) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Paper Sheet..." + to_chat(user, "Dispensing Paper Sheet...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A ) if (isrobot(user)) @@ -145,13 +145,13 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 4) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Pen..." + to_chat(user, "Dispensing Pen...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A.loc ) if (isrobot(user)) @@ -159,13 +159,13 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 4) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Pen..." + to_chat(user, "Dispensing Pen...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A ) if (isrobot(user)) @@ -173,13 +173,13 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 5) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Dice Pack..." + to_chat(user, "Dispensing Dice Pack...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A.loc ) if (isrobot(user)) @@ -187,13 +187,13 @@ RSF engy.cell.charge -= 200 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 5) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Dice Pack..." + to_chat(user, "Dispensing Dice Pack...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A ) if (isrobot(user)) @@ -201,13 +201,13 @@ RSF engy.cell.charge -= 200 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 6) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Cigarette..." + to_chat(user, "Dispensing Cigarette...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A.loc ) if (isrobot(user)) @@ -215,13 +215,13 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 6) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Cigarette..." + to_chat(user, "Dispensing Cigarette...") playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A ) if (isrobot(user)) @@ -229,6 +229,6 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") desc = "A RSF. It currently holds [matter]/30 fabrication-units." return \ No newline at end of file diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index f5cb6170fe3..e4f6bcd7a75 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -34,11 +34,11 @@ /obj/item/weapon/reagent_containers/spray/alien/smoke/afterattack(atom/A as mob|obj, mob/user as mob) if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) if(!A.reagents.total_volume && A.reagents) - user << "\The [A] is empty." + to_chat(user, "\The [A] is empty.") return if(reagents.total_volume >= reagents.maximum_volume) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") return reagents.remove_reagent(25,"water") var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 2118e493687..d30cc76b0a7 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -119,7 +119,7 @@ if(..(user, 1)) show(usr) else - user << "It is too far away." + to_chat(user, "It is too far away.") /obj/item/weapon/card/id/proc/show(mob/user as mob) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) @@ -141,7 +141,7 @@ user.visible_message("[user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\ "You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]") if(mining_points) - user << "There's [mining_points] mining equipment redemption points loaded onto this card." + to_chat(user, "There's [mining_points] mining equipment redemption points loaded onto this card.") src.add_fingerprint(user) return @@ -190,7 +190,7 @@ if(istype(W, /obj/item/weapon/id_decal/)) var/obj/item/weapon/id_decal/decal = W - user << "You apply [decal] to [src]." + to_chat(user, "You apply [decal] to [src].") if(decal.override_name) name = decal.decal_name desc = decal.decal_desc @@ -204,9 +204,9 @@ if(!stamped) dat+="
"
stamped = 1
- usr << "You stamp the ID card!"
+ to_chat(usr, "You stamp the ID card!")
else
- usr << "This ID has already been stamped!"
+ to_chat(usr, "This ID has already been stamped!")
/obj/item/weapon/card/id/silver
name = "identification card"
@@ -242,7 +242,7 @@
var/obj/item/weapon/card/id/I = O
if(istype(user, /mob/living) && user.mind)
if(user.mind.special_role)
- usr << "The card's microscanners activate as you pass it over \the [I], copying its access."
+ to_chat(usr, "The card's microscanners activate as you pass it over \the [I], copying its access.")
src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming
/obj/item/weapon/card/id/syndicate/proc/fake_id_photo(var/mob/living/carbon/human/H, var/side=0)//get_id_photo wouldn't work correctly
@@ -253,7 +253,7 @@
var/icon/faked
if(!side)
if(!H.equip_to_slot_if_possible(src, slot_l_store, 0, 1))
- H << "You need to empty your pockets before taking the ID picture."
+ to_chat(H, "You need to empty your pockets before taking the ID picture.")
return
if(side)
@@ -273,18 +273,18 @@
if(!src.registered_name)
var t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name))
if(!t)
- user << "Invalid name."
+ to_chat(user, "Invalid name.")
return
src.registered_name = t
var u = sanitize(stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN))
if(!u)
- user << "Invalid assignment."
+ to_chat(user, "Invalid assignment.")
src.registered_name = ""
return
src.assignment = u
src.name = "[src.registered_name]'s ID Card ([src.assignment])"
- user << "You successfully forge the ID card."
+ to_chat(user, "You successfully forge the ID card.")
registered_user = user
else if(!registered_user || registered_user == user)
if(!registered_user)
@@ -301,7 +301,7 @@
return
src.registered_name = new_name
UpdateName()
- user << "Name changed to [new_name]."
+ to_chat(user, "Name changed to [new_name].")
if("Photo")
if(!Adjacent(user))
@@ -311,7 +311,7 @@
front = new(photo)
side = new(photoside)
if(photo && photoside)
- user << "Photo changed."
+ to_chat(user, "Photo changed.")
if("Appearance")
var/list/appearances = list(
@@ -348,28 +348,28 @@
if(!choice)
return
src.icon_state = choice
- usr << "Appearance changed to [choice]."
+ to_chat(usr, "Appearance changed to [choice].")
if("Sex")
var/new_sex = sanitize(stripped_input(user,"What sex would you like to put on this card?","Agent Card Sex", ishuman(user) ? capitalize(user.gender) : "Male", MAX_MESSAGE_LEN))
if(!Adjacent(user))
return
src.sex = new_sex
- user << "Sex changed to [new_sex]."
+ to_chat(user, "Sex changed to [new_sex].")
if("Age")
var/new_age = sanitize(stripped_input(user,"What age would you like to put on this card?","Agent Card Age","21", MAX_MESSAGE_LEN))
if(!Adjacent(user))
return
src.age = new_age
- user << "Age changed to [new_age]."
+ to_chat(user, "Age changed to [new_age].")
if("Occupation")
var/new_job = sanitize(stripped_input(user,"What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN))
if(!Adjacent(user))
return
src.assignment = new_job
- user << "Occupation changed to [new_job]."
+ to_chat(user, "Occupation changed to [new_job].")
UpdateName()
if("Money Account")
@@ -377,7 +377,7 @@
if(!Adjacent(user))
return
associated_account_number = new_account
- user << "Linked money account changed to [new_account]."
+ to_chat(user, "Linked money account changed to [new_account].")
if("Blood Type")
var/default = "\[UNSET\]"
@@ -390,7 +390,7 @@
if(!Adjacent(user))
return
src.blood_type = new_blood_type
- user << "Blood type changed to [new_blood_type]."
+ to_chat(user, "Blood type changed to [new_blood_type].")
if("DNA Hash")
var/default = "\[UNSET\]"
@@ -403,7 +403,7 @@
if(!Adjacent(user))
return
src.dna_hash = new_dna_hash
- user << "DNA hash changed to [new_dna_hash]."
+ to_chat(user, "DNA hash changed to [new_dna_hash].")
if("Fingerprint Hash")
var/default = "\[UNSET\]"
@@ -416,7 +416,7 @@
if(!Adjacent(user))
return
src.fingerprint_hash = new_fingerprint_hash
- user << "Fingerprint hash changed to [new_fingerprint_hash]."
+ to_chat(user, "Fingerprint hash changed to [new_fingerprint_hash].")
if("Reset Card")
name = initial(name)
@@ -432,7 +432,7 @@
access = initial_access.Copy() // Initial() doesn't work on lists
registered_user = null
- user << "All information has been deleted from \the [src]."
+ to_chat(user, "All information has been deleted from \the [src].")
else
..()
@@ -496,7 +496,7 @@
var/points = 0
/obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob)
- usr << "You have accumulated [points] out of the [goal] points you need for freedom."
+ to_chat(usr, "You have accumulated [points] out of the [goal] points you need for freedom.")
/obj/item/weapon/card/id/prisoner/one
name = "Prisoner #13-001"
diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm
index 8cdc276ef6a..6a1d6c0c360 100644
--- a/code/game/objects/items/weapons/cash.dm
+++ b/code/game/objects/items/weapons/cash.dm
@@ -37,10 +37,10 @@ var/global/list/moneytypes=list(
/obj/item/weapon/spacecash/examine(mob/user)
if(amount>1)
- user << "\icon[src] This is a stack of [amount] [src]s."
+ to_chat(user, "\icon[src] This is a stack of [amount] [src]s.")
else
- user << "\icon[src] This is \a [src]s."
- user << "It's worth [worth*amount] credits."
+ to_chat(user, "\icon[src] This is \a [src]s.")
+ to_chat(user, "It's worth [worth*amount] credits.")
/obj/item/weapon/spacecash/update_icon()
icon_state = "cash[worth]"
@@ -67,13 +67,13 @@ var/global/list/moneytypes=list(
collected += collect_from(cash)
if(collected)
update_icon()
- user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash."
+ to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.")
else if(istype(A,/obj/item/weapon/spacecash))
var/obj/item/weapon/spacecash/cash = A
var/collected = src.collect_from(cash)
if(collected)
update_icon()
- user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash."
+ to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.")
/obj/item/weapon/spacecash/proc/get_total()
diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm
index 04d88ecb09e..9c13ef43832 100644
--- a/code/game/objects/items/weapons/caution.dm
+++ b/code/game/objects/items/weapons/caution.dm
@@ -22,7 +22,7 @@
return
if(armed)
armed = 0
- user << "\blue You disarm \the [src]."
+ to_chat(user, "\blue You disarm \the [src].")
return
timing = !timing
if(timing)
@@ -30,7 +30,7 @@
else
armed = 0
timepassed = 0
- H << "\blue You [timing ? "activate \the [src]'s timer, you have 15 seconds." : "de-activate \the [src]'s timer."]"
+ to_chat(H, "\blue You [timing ? "activate \the [src]'s timer, you have 15 seconds." : "de-activate \the [src]'s timer."]")
process()
if(!timing)
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index 1fca60b065e..e0ac96c4feb 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -82,14 +82,14 @@
var/mob/living/user = src.loc
if(F.gun)
if(isliving(user) && F.captured)
- user << "FAIL: [F.captured] already has an existing connection."
+ to_chat(user, "FAIL: [F.captured] already has an existing connection.")
src.field_disconnect(F)
else
startpos = get_turf(src)
field = F
F.gun = src
if(isliving(user) && F.captured)
- user << "Connection established with target: [F.captured]"
+ to_chat(user, "Connection established with target: [F.captured]")
/obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F)
@@ -98,7 +98,7 @@
if(F.gun == src)
F.gun = null
if(isliving(user) && F.captured)
- user << "Disconnected from target: [F.captured]"
+ to_chat(user, "Disconnected from target: [F.captured]")
field = null
startpos = null
@@ -194,7 +194,7 @@
AM.loc = loc
qdel(src)
else if(tickstokill <= 0)
- captured << "As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy..."
+ to_chat(captured, "As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy...")
var/mob/dead/observer/ghost = captured.ghostize(1)
if(captured.mind)
if(ghost)
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 2688496651e..25a50a5bfe1 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -102,12 +102,12 @@ LIGHTERS ARE IN LIGHTERS.DM
if(istype(glass)) //you can dip cigarettes into beakers
var/transfered = glass.reagents.trans_to(src, chem_volume)
if(transfered) //if reagents were transfered, show the message
- user << "You dip \the [src] into \the [glass]."
+ to_chat(user, "You dip \the [src] into \the [glass].")
else //if not, either the beaker was empty, or the cigarette was full
if(!glass.reagents.total_volume)
- user << "[glass] is empty."
+ to_chat(user, "[glass] is empty.")
else
- user << "[src] is full."
+ to_chat(user, "[src] is full.")
/obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].")
@@ -176,7 +176,7 @@ LIGHTERS ARE IN LIGHTERS.DM
var/mob/living/carbon/C = loc
reagents.trans_to(C, REAGENTS_METABOLISM)
if(!reagents.total_volume) // There were reagents, but now they're gone
- C << "Your [name] loses its flavor."
+ to_chat(C, "Your [name] loses its flavor.")
else // else just remove some of the reagents
reagents.remove_any(REAGENTS_METABOLISM)
return
@@ -188,7 +188,7 @@ LIGHTERS ARE IN LIGHTERS.DM
transfer_fingerprints_to(butt)
if(ismob(loc))
var/mob/living/M = loc
- M << "Your [name] goes out."
+ to_chat(M, "Your [name] goes out.")
M.unEquip(src, 1) //Force the un-equip so the overlays update
processing_objects.Remove(src)
qdel(src)
@@ -302,7 +302,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(istype(W, /obj/item/weapon/match))
..()
else
- user << "\The [src] straight out REFUSES to be lit by such uncivilized means."
+ to_chat(user, "\The [src] straight out REFUSES to be lit by such uncivilized means.")
/////////////////
//SMOKING PIPES//
@@ -338,7 +338,7 @@ LIGHTERS ARE IN LIGHTERS.DM
new /obj/effect/decal/cleanable/ash(location)
if(ismob(loc))
var/mob/living/M = loc
- M << "Your [name] goes out, and you empty the ash."
+ to_chat(M, "Your [name] goes out, and you empty the ash.")
lit = 0
icon_state = icon_off
item_state = icon_off
@@ -357,7 +357,7 @@ LIGHTERS ARE IN LIGHTERS.DM
processing_objects.Remove(src)
return
if(smoketime <= 0)
- user << "You refill the pipe with tobacco."
+ to_chat(user, "You refill the pipe with tobacco.")
reagents.add_reagent("nicotine", chem_volume)
smoketime = initial(smoketime)
return
@@ -366,7 +366,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(istype(W, /obj/item/weapon/match))
..()
else
- user << "\The [src] straight out REFUSES to be lit by such means."
+ to_chat(user, "\The [src] straight out REFUSES to be lit by such means.")
/obj/item/clothing/mask/cigarette/pipe/cobpipe
name = "corn cob pipe"
@@ -401,12 +401,12 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
if(papers > 1)
var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
user.put_in_inactive_hand(P)
- user << "You take a paper out of the pack."
+ to_chat(user, "You take a paper out of the pack.")
papers --
else
var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
user.put_in_inactive_hand(P)
- user << "You take the last paper out of the pack, and throw the pack away."
+ to_chat(user, "You take the last paper out of the pack, and throw the pack away.")
qdel(src)
/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
@@ -428,4 +428,4 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
/obj/item/weapon/rollingpaperpack/examine(mob/user)
..(user)
- user << "There are [src.papers] left"
+ to_chat(user, "There are [src.papers] left")
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index a655efa125c..2038c4851aa 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -38,16 +38,16 @@
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
if(user.client && (target in user.client.screen))
- user << "You need to take that [target.name] off before cleaning it."
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
user.visible_message("[user] begins to scrub \the [target.name] out with [src].")
if(do_after(user, src.cleanspeed, target = target) && target)
- user << "You scrub \the [target.name] out."
+ to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
else
user.visible_message("[user] begins to clean \the [target.name] with [src].")
if(do_after(user, src.cleanspeed, target = target))
- user << "You clean \the [target.name]."
+ to_chat(user, "You clean \the [target.name].")
var/obj/effect/decal/cleanable/C = locate() in target
qdel(C)
target.clean_blood()
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 8a413049af4..208b93c0c53 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -42,7 +42,7 @@
/obj/item/weapon/lipstick/attack_self(mob/user as mob)
overlays.Cut()
- user << "You twist \the [src] [open ? "closed" : "open"]."
+ to_chat(user, "You twist \the [src] [open ? "closed" : "open"].")
open = !open
if(open)
var/image/colored = image("icon"='icons/obj/items.dmi', "icon_state"="lipstick_uncap_color")
@@ -60,7 +60,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.lip_style) //if they already have lipstick on
- user << "You need to wipe off the old lipstick first!"
+ to_chat(user, "You need to wipe off the old lipstick first!")
return
if(H == user)
user.visible_message("[user] does their lips with \the [src].", \
@@ -78,7 +78,7 @@
H.lip_color = colour
H.update_body()
else
- user << "Where are the lips on that?"
+ to_chat(user, "Where are the lips on that?")
/obj/item/weapon/razor
name = "electric razor"
@@ -93,14 +93,14 @@
var/mob/living/carbon/human/H = M
if(user.zone_sel.selecting == "mouth")
if(!get_location_accessible(H, "mouth"))
- user << "The mask is in the way."
+ to_chat(user, "The mask is in the way.")
return
if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one...
if(!H.client.prefs.rlimb_data["head"])
- user << "You find yourself disappointed at the appalling lack of facial hair."
+ to_chat(user, "You find yourself disappointed at the appalling lack of facial hair.")
return
if(H.f_style == "Shaved")
- user << "Already clean-shaven."
+ to_chat(user, "Already clean-shaven.")
return
if(H == user) //shaving yourself
user.visible_message("[user] starts to shave their facial hair with \the [src].", \
@@ -125,14 +125,14 @@
playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
if(user.zone_sel.selecting == "head")
if(!get_location_accessible(H, "head"))
- user << "The headgear is in the way."
+ to_chat(user, "The headgear is in the way.")
return
if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one...
if(!H.client.prefs.rlimb_data["head"])
- user << "You find yourself disappointed at the appalling lack of hair."
+ to_chat(user, "You find yourself disappointed at the appalling lack of hair.")
return
if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead")
- user << "There is not enough hair left to shave..."
+ to_chat(user, "There is not enough hair left to shave...")
return
if(H == user) //shaving yourself
user.visible_message("[user] starts to shave their head with \the [src].", \
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 80658c6bf51..73eda279b3d 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -77,29 +77,29 @@
if(usr.get_item_by_slot(slot_back) == src)
toggle_paddles()
else
- usr << "Put the defibrillator on your back first!"
+ to_chat(usr, "Put the defibrillator on your back first!")
return
/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/stock_parts/cell))
var/obj/item/weapon/stock_parts/cell/C = W
if(bcell)
- user << "[src] already has a cell."
+ to_chat(user, "[src] already has a cell.")
else
if(C.maxcharge < paddles.revivecost)
- user << "[src] requires a higher capacity cell."
+ to_chat(user, "[src] requires a higher capacity cell.")
return
user.drop_item()
W.loc = src
bcell = W
- user << "You install a cell in [src]."
+ to_chat(user, "You install a cell in [src].")
if(istype(W, /obj/item/weapon/screwdriver))
if(bcell)
bcell.updateicon()
bcell.loc = get_turf(src.loc)
bcell = null
- user << "You remove the cell from the [src]."
+ to_chat(user, "You remove the cell from the [src].")
update_icon()
return
@@ -107,10 +107,10 @@
/obj/item/weapon/defibrillator/emag_act(user as mob)
if(safety)
safety = 0
- user << "You silently disable [src]'s safety protocols with the card."
+ to_chat(user, "You silently disable [src]'s safety protocols with the card.")
else
safety = 1
- user << "You silently enable [src]'s safety protocols with the card."
+ to_chat(user, "You silently enable [src]'s safety protocols with the card.")
/obj/item/weapon/defibrillator/emp_act(severity)
if(bcell)
@@ -138,7 +138,7 @@
//Detach the paddles into the user's hands
if(!usr.put_in_hands(paddles))
on = 0
- user << "You need a free hand to hold the paddles!"
+ to_chat(user, "You need a free hand to hold the paddles!")
update_icon()
return
paddles.loc = user
@@ -214,7 +214,7 @@
if(usr.get_item_by_slot(slot_belt) == src)
toggle_paddles()
else
- usr << "Strap the defibrillator's belt on first!"
+ to_chat(usr, "Strap the defibrillator's belt on first!")
return
/obj/item/weapon/defibrillator/compact/loaded/New()
@@ -287,7 +287,7 @@
var/obj/item/weapon/twohanded/O = user.get_inactive_hand()
if(istype(O))
O.unwield()
- user << "The paddles snap back into the main unit."
+ to_chat(user, "The paddles snap back into the main unit.")
defib.on = 0
loc = defib
defib.update_icon()
@@ -313,13 +313,13 @@
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
return
if(!wielded)
- user << "You need to wield the paddles in both hands before you can use them on someone!"
+ to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!")
return
if(cooldown)
- user << "[defib] is recharging."
+ to_chat(user, "[defib] is recharging.")
return
if(!ishuman(M))
- user << "The instructions on [defib] don't mention how to revive that..."
+ to_chat(user, "The instructions on [defib] don't mention how to revive that...")
return
else
if(user.a_intent == I_HARM && !defib.safety)
@@ -400,8 +400,8 @@
user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.")
else if(ghost)
user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.")
- ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
- ghost << sound('sound/effects/genetics.ogg')
+ to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
+ to_chat(ghost, sound('sound/effects/genetics.ogg'))
else
user.visible_message("[defib] buzzes: Resuscitation failed.")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
@@ -415,7 +415,7 @@
busy = 0
update_icon()
else
- user << "You need to target your patient's chest with [src]."
+ to_chat(user, "You need to target your patient's chest with [src].")
return
/obj/item/weapon/borg_defib
@@ -440,9 +440,9 @@
if(busy)
return
if(cooldown)
- user << "[src] is recharging."
+ to_chat(user, "[src] is recharging.")
if(!ishuman(M))
- user << "This unit is only designed to work on humanoid lifeforms."
+ to_chat(user, "This unit is only designed to work on humanoid lifeforms.")
return
else
if(user.a_intent == I_HARM && !safety)
@@ -519,8 +519,8 @@
user.visible_message("[user] buzzes: Resuscitation failed - Severe tissue damage detected.")
else if(ghost)
user.visible_message("[user] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.")
- ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
- ghost << sound('sound/effects/genetics.ogg')
+ to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
+ to_chat(ghost, sound('sound/effects/genetics.ogg'))
else
user.visible_message("[user] buzzes: Resuscitation failed.")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
@@ -538,5 +538,5 @@
busy = 0
update_icon()
else
- user << "You need to target your patient's chest with [src]."
+ to_chat(user, "You need to target your patient's chest with [src].")
return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 20c580dbc01..bea51ec4452 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -80,7 +80,7 @@
/*
/obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H)
if(istype(H) && !H.shoes)
- H << "You step on the D4!"
+ to_chat(H, "You step on the D4!")
H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
H.Weaken(3)
*///ew.
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index b452c9f7236..47bea6ca58d 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -31,7 +31,7 @@
user.visible_message("\red [user.name] injects [M.name] with [src].")
src.injected(M, user)
else
- user << "\red You failed to inject [M.name]."
+ to_chat(user, "\red You failed to inject [M.name].")
proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user)
scramble(1, target, 100)
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index dd182d394aa..afff3a01fd3 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -25,7 +25,7 @@
/obj/item/weapon/c4/suicide_act(var/mob/user)
. = (BRUTELOSS)
- viewers(user) << "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!"
+ to_chat(viewers(user), "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!")
var/message_say = "FOR NO RAISIN!"
if(user.mind)
if(user.mind.special_role)
@@ -55,7 +55,7 @@
/obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
open_panel = !open_panel
- user << "You [open_panel ? "open" : "close"] the wire panel."
+ to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.")
else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler ))
wires.Interact(user)
else
@@ -70,7 +70,7 @@
if(newtime > 60000)
newtime = 60000
timer = newtime
- user << "Timer set for [timer] seconds."
+ to_chat(user, "Timer set for [timer] seconds.")
/obj/item/weapon/c4/afterattack(atom/target as obj|turf, mob/user as mob, flag)
@@ -78,7 +78,7 @@
return
if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/accessory/storage) || istype(target, /obj/item/clothing/under))
return
- user << "Planting explosives..."
+ to_chat(user, "Planting explosives...")
if(do_after(user, 50, target = target) && in_range(user, target))
user.drop_item()
@@ -96,7 +96,7 @@
log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
- user << "Bomb has been planted. Timer counting down from [timer]."
+ to_chat(user, "Bomb has been planted. Timer counting down from [timer].")
spawn(timer*10)
explode(get_turf(target))
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index d10df5735b0..0cd8f88dd99 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -37,10 +37,10 @@
/obj/item/weapon/extinguisher/examine(mob/user)
if(..(user, 0))
- usr << "\icon[src] [src.name] contains:"
+ to_chat(usr, "\icon[src] [src.name] contains:")
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
- user << "\blue [R.volume] units of [R.name]"
+ to_chat(user, "\blue [R.volume] units of [R.name]")
/obj/item/weapon/extinguisher/New()
@@ -51,7 +51,7 @@
safety = !safety
src.icon_state = "[sprite_name][!safety]"
src.desc = "The safety is [safety ? "on" : "off"]."
- user << "The safety is [safety ? "on" : "off"]."
+ to_chat(user, "The safety is [safety ? "on" : "off"].")
return
/obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user)
@@ -59,18 +59,18 @@
var/safety_save = safety
safety = 1
if(reagents.total_volume == reagents.maximum_volume)
- user << "\The [src] is already full!"
+ to_chat(user, "\The [src] is already full!")
safety = safety_save
return 1
var/obj/structure/reagent_dispensers/watertank/W = target
var/transferred = W.reagents.trans_to(src, max_water)
if(transferred > 0)
- user << "\The [src] has been refilled by [transferred] units"
+ to_chat(user, "\The [src] has been refilled by [transferred] units")
playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
for(var/datum/reagent/water/R in reagents.reagent_list)
R.cooling_temperature = cooling_power
else
- user << "\The [W] is empty!"
+ to_chat(user, "\The [W] is empty!")
safety = safety_save
return 1
else
@@ -85,7 +85,7 @@
return
if (!safety)
if (src.reagents.total_volume < 1)
- usr << "\The [src] is empty."
+ to_chat(usr, "\The [src] is empty.")
return
if (world.time < src.last_use + 20)
diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm
index 132dd4306f3..389eb1738d6 100644
--- a/code/game/objects/items/weapons/fireworks.dm
+++ b/code/game/objects/items/weapons/fireworks.dm
@@ -9,7 +9,7 @@ obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
return
if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
for(var/mob/M in viewers(user))
- M << "[user] lits \the [src]"
+ to_chat(M, "[user] lits \the [src]")
litzor = 1
icon_state = "rocket_1"
S = new()
@@ -31,7 +31,7 @@ obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
return
if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
for(var/mob/M in viewers(user))
- M << "[user] lits \the [src]"
+ to_chat(M, "[user] lits \the [src]")
litzor = 1
icon_state = "sparkler_1"
var/b = rand(5,9)
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 1486cb4473d..75c1b030ed4 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -93,7 +93,7 @@
if(isscrewdriver(W) && igniter && !lit)
status = !status
- user << "[igniter] is now [status ? "secured" : "unsecured"]!"
+ to_chat(user, "[igniter] is now [status ? "secured" : "unsecured"]!")
update_icon()
return
@@ -109,7 +109,7 @@
if(istype(W,/obj/item/weapon/tank/plasma))
if(ptank)
- user << "There appears to already be a plasma tank loaded in [src]!"
+ to_chat(user, "There appears to already be a plasma tank loaded in [src]!")
return
user.drop_item()
ptank = W
@@ -127,7 +127,7 @@
if(user.stat || user.restrained() || user.lying) return
user.set_machine(src)
if(!ptank)
- user << "Attach a plasma tank first!"
+ to_chat(user, "Attach a plasma tank first!")
return
var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") user << browse(dat, "window=flamethrower;size=600x300") diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 80114bd5dd7..e6b0ff92c32 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -55,11 +55,11 @@ var/mob/living/carbon/human/U = user if(!wielded) - user << "You must use both hands to garrote [M]!" + to_chat(user, "You must use both hands to garrote [M]!") return if(!istype(M, /mob/living/carbon/human)) - user << "You don't think that garroting [M] would be very effective..." + to_chat(user, "You don't think that garroting [M] would be very effective...") return if(M == U) @@ -67,14 +67,14 @@ return if(M.dir != U.dir) - user << "You cannot use [src] on [M] from that angle!" + to_chat(user, "You cannot use [src] on [M] from that angle!") return if(improvised && ((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items. - user << "[M]'s neck is blocked by something they're wearing!" + to_chat(user, "[M]'s neck is blocked by something they're wearing!") if(strangling) - user << "You cannot use [src] on two people at once!" + to_chat(user, "You cannot use [src] on two people at once!") return unwield(U) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 8ca714d7666..00433885ad5 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -30,7 +30,7 @@ user.put_in_active_hand(gift) src.gift.add_fingerprint(user) else - user << "\blue The gift was empty!" + to_chat(user, "\blue The gift was empty!") qdel(src) return @@ -41,16 +41,16 @@ /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return - user << "\blue You cant move." + to_chat(user, "\blue You cant move.") /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if (!istype(W, /obj/item/weapon/wirecutters)) - user << "\blue I need wirecutters for that." + to_chat(user, "\blue I need wirecutters for that.") return - user << "\blue You cut open the present." + to_chat(user, "\blue You cut open the present.") for(var/mob/M in src) //Should only be one but whatever. M.loc = src.loc @@ -141,4 +141,4 @@ max_amount = 25 /obj/item/stack/wrapping_paper/attack_self(mob/user) - user << "You need to use it on a package that has already been wrapped!" \ No newline at end of file + to_chat(user, "You need to use it on a package that has already been wrapped!") diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index 998c19e9837..12e2e111d21 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -16,9 +16,8 @@ var/turf/T // Make a quick flash var/turf/T = get_turf(src) playsound(T, 'sound/items/bikehorn.ogg', 100, 1) - for(var/mob/living/carbon/human/M in viewers(T, null)) - if(M:eyecheck() <= 0) - flick("e_flash", M.flash) // flash dose faggots + for(var/mob/living/carbon/C in viewers(T, null)) + C.flash_eyes() for(var/i=1, i<=deliveryamt, i++) var/atom/movable/x = new spawner_type x.loc = T @@ -41,20 +40,20 @@ var/turf/T /obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params) if(istype(I, /obj/item/weapon/bananapeel)) if(fillamt < 9) - usr << "You add another banana peel to the assembly." + to_chat(usr, "You add another banana peel to the assembly.") fillamt += 1 qdel(I) else - usr << "The bananade is full, screwdriver it shut to lock it down." + to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.") if(istype(I, /obj/item/weapon/screwdriver)) if(fillamt) var/obj/item/weapon/grenade/bananade/G = new /obj/item/weapon/grenade/bananade user.unEquip(src) user.put_in_hands(G) G.deliveryamt = src.fillamt - user << "You lock the assembly shut, readying it for HONK." + to_chat(user, "You lock the assembly shut, readying it for HONK.") qdel(src) else - usr << "You need to add banana peels before you can ready the grenade!." + to_chat(usr, "You need to add banana peels before you can ready the grenade!.") else - usr << "Only banana peels fit in this assembly, up to 9." \ No newline at end of file + to_chat(usr, "Only banana peels fit in this assembly, up to 9.") diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index cb31bd859e3..149cc03a866 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -93,7 +93,7 @@ message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP)") log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])") bombers += "[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])" - user << "You prime the [name]! [det_time / 10] second\s!" + to_chat(user, "You prime the [name]! [det_time / 10] second\s!") active = 1 update_icon() if(iscarbon(user)) @@ -113,12 +113,12 @@ if(label) label = null update_icon() - user << "You remove the label from [src]." + to_chat(user, "You remove the label from [src].") return 1 if(istype(I, /obj/item/weapon/screwdriver)) if(stage == WIRED) if(beakers.len) - user << "You lock the assembly." + to_chat(user, "You lock the assembly.") playsound(loc, 'sound/items/Screwdriver.ogg', 25, -3) stage = READY update_icon() @@ -140,25 +140,25 @@ message_admins("[key_name_admin(usr)] has completed [name] at [A.name] (JMP) [contained].") log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z].") else - user << "You need to add at least one beaker before locking the assembly." + to_chat(user, "You need to add at least one beaker before locking the assembly.") else if(stage == READY && !nadeassembly) det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 - user << "You modify the time delay. It's set for [det_time / 10] second\s." + to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") else if(stage == EMPTY) - user << "You need to add an activation mechanism." + to_chat(user, "You need to add an activation mechanism.") else if(stage == WIRED && is_type_in_list(I, allowed_containers)) if(beakers.len == 2) - user << "[src] can not hold more containers." + to_chat(user, "[src] can not hold more containers.") return else if(I.reagents.total_volume) - user << "You add [I] to the assembly." + to_chat(user, "You add [I] to the assembly.") user.drop_item() I.loc = src beakers += I else - user << "[I] is empty." + to_chat(user, "[I] is empty.") else if(stage == EMPTY && istype(I, /obj/item/device/assembly_holder)) var/obj/item/device/assembly_holder/A = I @@ -173,7 +173,7 @@ A.loc = src assemblyattacher = user.ckey stage = WIRED - user << "You add [A] to [src]!" + to_chat(user, "You add [A] to [src]!") update_icon() else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) @@ -181,16 +181,16 @@ C.use(1) stage = WIRED - user << "You rig [src]." + to_chat(user, "You rig [src].") update_icon() else if(stage == READY && istype(I, /obj/item/weapon/wirecutters)) - user << "You unlock the assembly." + to_chat(user, "You unlock the assembly.") stage = WIRED update_icon() else if(stage == WIRED && istype(I, /obj/item/weapon/wrench)) - user << "You open the grenade and remove the contents." + to_chat(user, "You open the grenade and remove the contents.") stage = EMPTY payload_name = null label = null @@ -382,7 +382,7 @@ //make a special case you might as well do it explicitly. -Sayu /obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/slime_extract) && stage == WIRED) - user << "You add [I] to the assembly." + to_chat(user, "You add [I] to the assembly.") user.drop_item() I.loc = src beakers += I diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index 8525a27378c..705b6a57095 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -69,7 +69,7 @@ if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP)) return else - M << "\red Your feet feel like they're on fire!" + to_chat(M, "\red Your feet feel like they're on fire!") M.take_overall_damage(0, max(0, (burned - 2))) if(!istype(M, /mob/living/carbon/slime) && !isrobot(M)) diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index ec3e159e874..8ba1782cf18 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -78,7 +78,6 @@ ///////////////////////////////// /obj/item/weapon/grenade/flashbang/cluster icon_state = "flashbang_active" - banglet = 1 /obj/item/weapon/grenade/clusterbuster/emp name = "Electromagnetic Storm" diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 51bd36c5839..90ccef1d163 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -3,7 +3,6 @@ icon_state = "flashbang" item_state = "flashbang" origin_tech = "materials=2;combat=1" - var/banglet = 0 /obj/item/weapon/grenade/flashbang/prime() update_mob() @@ -24,42 +23,26 @@ playsound(loc, 'sound/effects/bang.ogg', 25, 1) //Checking for protections - var/eye_safety = 0 - var/ear_safety = 0 + var/ear_safety = M.check_ear_prot() var/distance = max(1,get_dist(src,T)) - if(iscarbon(M)) - var/mob/living/carbon/C = M - eye_safety = C.eyecheck() - if(ishuman(C)) - var/mob/living/carbon/human/H = C - if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT))) - ear_safety++ //Flash - var/eye_damage = rand(1,3) if(M.weakeyes) M.visible_message("[M] screams and collapses!") - M << "AAAAGH! IT BURNS!" + to_chat(M, "AAAAGH!") M.Weaken(15) //hella stunned M.Stun(15) - eye_damage += 8 + if(ishuman(M)) + M.emote("scream") + var/mob/living/carbon/human/H = M + var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) + if(E) + E.damage += 8 - if(!eye_safety && ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) - flick("e_flash", M.flash) - if (E) - E.damage += eye_damage + if(M.flash_eyes(affect_silicon = 1)) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) - if (istype(E) && E.damage >= E.min_bruised_damage) - if(!(E.status & ORGAN_ROBOT)) - M << "Your eyes start to burn badly!" - else - M << "The flash blinds you!" - if(!banglet) - if (E.damage >= E.min_broken_damage) - M << "You can't see anything!" + //Bang if((loc == M) || loc == M.loc)//Holding on person or being exactly where lies is significantly more dangerous and voids protection @@ -71,11 +54,10 @@ M.ear_damage += rand(0, 5) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) - M << "Your ears start to ring badly!" - if(!banglet) - if(prob(M.ear_damage - 10 + 5)) - M << "You can't hear anything!" - M.disabilities |= DEAF + to_chat(M, "Your ears start to ring badly!") + if(prob(M.ear_damage - 10 + 5)) + to_chat(M, "You can't hear anything!") + M.disabilities |= DEAF else if (M.ear_damage >= 5) - M << "Your ears start to ring!" \ No newline at end of file + to_chat(M, "Your ears start to ring!") diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index c0f619244e6..1a6959e8944 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -8,7 +8,7 @@ user.unEquip(G) user.unEquip(src) user.put_in_hands(W) - user << "You stuff the [I] in the [src], emptying the contents beforehand." + to_chat(user, "You stuff the [I] in the [src], emptying the contents beforehand.") W.underlays += image(src.icon, icon_state = src.icon_state) qdel(I) qdel(src) @@ -38,12 +38,12 @@ if(assembled == 0) if( istype(target, /obj/structure/reagent_dispensers/fueltank)) if(target.reagents.total_volume < 50) - user << "There's not enough fuel left to work with." + to_chat(user, "There's not enough fuel left to work with.") return var/obj/structure/reagent_dispensers/fueltank/F = target F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, assembled = 1 - user << "You've filled the makeshift explosive with welding fuel." + to_chat(user, "You've filled the makeshift explosive with welding fuel.") playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") @@ -56,7 +56,7 @@ var/obj/item/stack/cable_coil/C = I C.use(1) assembled = 2 - user << "You wire the igniter to detonate the fuel." + to_chat(user, "You wire the igniter to detonate the fuel.") desc = "A weak, improvised explosive." overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") name = "improvised explosive" @@ -102,7 +102,7 @@ /obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // if(!active) if(clown_check(user)) - user << "You light the [name]!" + to_chat(user, "You light the [name]!") active = 1 overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") icon_state = initial(icon_state) + "_active" @@ -125,4 +125,4 @@ /obj/item/weapon/grenade/iedcasing/examine(mob/user) ..(user) - user << "You can't tell when it will explode!" + to_chat(user, "You can't tell when it will explode!") diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index b2cd9a8981e..33b0fc411bb 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -15,7 +15,7 @@ /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) if((CLUMSY in user.mutations) && prob(50)) - user << "Huh? How does this thing work?" + to_chat(user, "Huh? How does this thing work?") active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -31,7 +31,7 @@ if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) - user << "You prime the [name]! [det_time/10] seconds!" + to_chat(user, "You prime the [name]! [det_time/10] seconds!") active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -49,14 +49,14 @@ ..(user) if(display_timer) if(det_time > 1) - user << "The timer is set to [det_time/10] second\s." + to_chat(user, "The timer is set to [det_time/10] second\s.") else - user << "\The [src] is set for instant detonation." + to_chat(user, "\The [src] is set for instant detonation.") /obj/item/weapon/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - user << "You prime the [name]! [det_time/10] seconds!" + to_chat(user, "You prime the [name]! [det_time/10] seconds!") active = 1 icon_state = initial(icon_state) + "_active" add_fingerprint(user) @@ -85,16 +85,16 @@ switch(det_time) if ("1") det_time = 10 - user << "You set the [name] for 1 second detonation time." + to_chat(user, "You set the [name] for 1 second detonation time.") if ("10") det_time = 30 - user << "You set the [name] for 3 second detonation time." + to_chat(user, "You set the [name] for 3 second detonation time.") if ("30") det_time = 50 - user << "You set the [name] for 5 second detonation time." + to_chat(user, "You set the [name] for 5 second detonation time.") if ("50") det_time = 1 - user << "You set the [name] for instant detonation." + to_chat(user, "You set the [name] for instant detonation.") add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index dbcb27c5f16..074617d4d10 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -5,7 +5,6 @@ icon_state = "delivery" item_state = "flashbang" origin_tech = "materials=3;magnets=4" - var/banglet = 0 var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver spawner_type = /mob/living/simple_animal/hostile/viscerator @@ -16,9 +15,8 @@ // Make a quick flash var/turf/T = get_turf(src) playsound(T, 'sound/effects/phasein.ogg', 100, 1) - for(var/mob/living/carbon/human/M in viewers(T, null)) - if(M:eyecheck() <= 0) - flick("e_flash", M.flash) // flash dose faggots + for(var/mob/living/carbon/C in viewers(T, null)) + C.flash_eyes() for(var/i=1, i<=deliveryamt, i++) var/atom/movable/x = new spawner_type diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 5f93c6a095c..b111501820f 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -21,7 +21,7 @@ return if(CLUMSY in user.mutations && prob(50)) - user << "Uh... how do those things work?!" + to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) if(!C.handcuffed) @@ -31,7 +31,7 @@ playsound(loc, cuffsound, 30, 1, -2) if(do_mob(user, C, 30)) apply_cuffs(C,user) - user << "You handcuff [C]." + to_chat(user, "You handcuff [C].") if(istype(src, /obj/item/weapon/restraints/handcuffs/cable)) feedback_add_details("handcuffs","C") else @@ -39,7 +39,7 @@ add_logs(C, user, "handcuffed", src) else - user << "You fail to handcuff [C]." + to_chat(user, "You fail to handcuff [C].") /obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user) if(!target.handcuffed) @@ -99,10 +99,10 @@ if(!remove_item_from_storage(user)) user.unEquip(src) user.put_in_hands(W) - user << "You wrap the cable restraint around the top of the rod." + to_chat(user, "You wrap the cable restraint around the top of the rod.") qdel(src) else - user << "You need one rod to make a wired rod." + to_chat(user, "You need one rod to make a wired rod.") return /obj/item/weapon/restraints/handcuffs/cable/zipties @@ -122,10 +122,10 @@ if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) C.update_inv_handcuffed(1) - user << "You handcuff [C]." + to_chat(user, "You handcuff [C].") add_logs(C, user, "ziptie-cuffed") else - user << "You fail to handcuff [C]." + to_chat(user, "You fail to handcuff [C].") /obj/item/weapon/restraints/handcuffs/cable/zipties/used desc = "A pair of broken zipties." @@ -173,17 +173,17 @@ if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed icon_state = "beartrap[armed]" - user << "[src] is now [armed ? "armed" : "disarmed"]" + to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") /obj/item/weapon/restraints/legcuffs/beartrap/attackby(var/obj/item/I, mob/user as mob) //Let's get explosive. if(istype(I, /obj/item/weapon/grenade/iedcasing)) if(IED) - user << "This beartrap already has an IED hooked up to it!" + to_chat(user, "This beartrap already has an IED hooked up to it!") return IED = I switch(IED.assembled) if(0,1) //if it's not fueled/hooked up - user << "You haven't prepared this IED yet!" + to_chat(user, "You haven't prepared this IED yet!") IED = null return if(2,3) @@ -191,17 +191,17 @@ I.forceMove(src) message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") log_game("[key_name(user)] has rigged a beartrap with an IED.") - user << "You sneak the [IED] underneath the pressure plate and connect the trigger wire." + to_chat(user, "You sneak the [IED] underneath the pressure plate and connect the trigger wire.") desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." else - user << "You shouldn't be reading this message! Contact a coder or someone, something broke!" + to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") IED = null return if(istype(I, /obj/item/weapon/screwdriver)) if(IED) IED.forceMove(get_turf(src)) IED = null - user << "You remove the IED from the [src]." + to_chat(user, "You remove the IED from the [src].") return ..() diff --git a/code/game/objects/items/weapons/holosign.dm b/code/game/objects/items/weapons/holosign.dm index 49b6a7ad645..5912a055a34 100644 --- a/code/game/objects/items/weapons/holosign.dm +++ b/code/game/objects/items/weapons/holosign.dm @@ -18,16 +18,16 @@ var/turf/T = get_turf(target) var/obj/effect/overlay/holograph/H = locate() in T if(H) - user << "You use [src] to destroy [H]." + to_chat(user, "You use [src] to destroy [H].") signs -= H qdel(H) else if(signs.len < max_signs) H = new(get_turf(target)) signs += H - user << "You create \a [H] with [src]." + to_chat(user, "You create \a [H] with [src].") else - user << "[src] is projecting at max capacity!" + to_chat(user, "[src] is projecting at max capacity!") /obj/item/weapon/holosign_creator/attack(mob/living/carbon/human/M, mob/user) return @@ -38,7 +38,7 @@ for(var/sign in L) qdel(sign) signs -= sign - user << "You clear all active holograms." + to_chat(user, "You clear all active holograms.") /obj/effect/overlay/holograph name = "wet floor sign" diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index a0540dbe79c..33025b0a41f 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -46,9 +46,9 @@ else injectamount = cause reagents.trans_to(R, injectamount) - R << "You hear a faint beep." + to_chat(R, "You hear a faint beep.") if(!reagents.total_volume) - R << "You hear a faint click from your chest." + to_chat(R, "You hear a faint click from your chest.") qdel(src) diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 3006a437943..c7e0fa67ef1 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -31,7 +31,7 @@ heavy = round(heavy) medium = round(medium) weak = round(weak) - imp_in << "You activate your microbomb implant." + to_chat(imp_in, "You activate your microbomb implant.") //If the delay is short, just blow up already jeez if(delay <= 7) explosion(src,heavy,medium,weak,weak, flame_range = weak) @@ -85,7 +85,7 @@ if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes") return 0 - imp_in << "You activate your macrobomb implant." + to_chat(imp_in, "You activate your macrobomb implant.") timed_explosion() /obj/item/weapon/implant/explosive/macro/implant(mob/source) diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm index e3e70e982a2..f94772787e2 100644 --- a/code/game/objects/items/weapons/implants/implant_freedom.dm +++ b/code/game/objects/items/weapons/implants/implant_freedom.dm @@ -10,7 +10,7 @@ /obj/item/weapon/implant/freedom/activate() if(uses == 0) return 0 if(uses != -1) uses-- - imp_in << "You feel a faint click." + to_chat(imp_in, "You feel a faint click.") if(iscarbon(imp_in)) var/mob/living/carbon/C_imp_in = imp_in C_imp_in.uncuff() diff --git a/code/game/objects/items/weapons/implants/implant_loyality.dm b/code/game/objects/items/weapons/implants/implant_loyality.dm index 088c70bf3c1..0c4b5c44648 100644 --- a/code/game/objects/items/weapons/implants/implant_loyality.dm +++ b/code/game/objects/items/weapons/implants/implant_loyality.dm @@ -27,16 +27,16 @@ if(target.mind in ticker.mode.revolutionaries) ticker.mode.remove_revolutionary(target.mind) if(target.mind in ticker.mode.cult) - target << "You feel the corporate tendrils of Nanotrasen try to invade your mind!" + to_chat(target, "You feel the corporate tendrils of Nanotrasen try to invade your mind!") else - target << "You feel a surge of loyalty towards Nanotrasen." + to_chat(target, "You feel a surge of loyalty towards Nanotrasen.") return 1 return 0 /obj/item/weapon/implant/loyalty/removed(mob/target, var/silent = 0) if(..()) if(target.stat != DEAD && !silent) - target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." + to_chat(target, "You feel a sense of liberation as Nanotrasen's grip on your mind fades away.") return 1 return 0 diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm index 79b7285e2d4..ae369138ebd 100644 --- a/code/game/objects/items/weapons/implants/implant_misc.dm +++ b/code/game/objects/items/weapons/implants/implant_misc.dm @@ -35,7 +35,7 @@ /obj/item/weapon/implant/adrenalin/activate() if(uses < 1) return 0 uses-- - imp_in << "You feel a sudden surge of energy!" + to_chat(imp_in, "You feel a sudden surge of energy!") imp_in.SetStunned(0) imp_in.SetWeakened(0) imp_in.SetParalysis(0) diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index fdb30eaae8e..547206da29c 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -31,7 +31,7 @@ if(!M.mind) return 0 if(M == user) - user << "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot." + to_chat(user, "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot.") if(isliving(user)) var/mob/living/L = user L.adjustBrainLoss(20) @@ -44,7 +44,7 @@ qdel(src) return -1 H.implanting = 1 - H << "You feel completely loyal to [user.name]." + to_chat(H, "You feel completely loyal to [user.name].") if(!(user.mind in ticker.mode:implanter)) ticker.mode:implanter[ref] = list() implanters = ticker.mode:implanter[ref] @@ -55,14 +55,14 @@ ticker.mode:implanter[ref] = implanters ticker.mode.traitors += H.mind H.mind.special_role = "traitor" - H << "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost." + to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.") var/datum/objective/protect/p = new p.owner = H.mind p.target = user:mind p.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." H.mind.objectives += p for(var/datum/objective/objective in H.mind.objectives) - H << "Objective #1: [objective.explanation_text]" + to_chat(H, "Objective #1: [objective.explanation_text]") ticker.mode.update_traitor_icons_added(user.mind) ticker.mode.update_traitor_icons_added(H.mind)//handles datahuds/observerhuds diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 9a5633c0ba3..0820cc097c9 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -81,7 +81,7 @@ return var/mob/M = G.affecting if(M.buckled_mob) - usr << "[M] will not fit into [src] because they have a slime latched onto their head." + to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.") return if(put_mob(M)) qdel(G) @@ -108,10 +108,10 @@ /obj/machinery/implantchair/put_mob(mob/living/carbon/M) if(!iscarbon(M)) - usr << "The [src.name] cannot hold this!" + to_chat(usr, "The [src.name] cannot hold this!") return if(src.occupant) - usr << "The [src.name] is already occupied!" + to_chat(usr, "The [src.name] is already occupied!") return if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 0fd4aaa2218..2d7d3e0a956 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -33,7 +33,7 @@ if(user && M && (get_turf(M) == T) && src && imp) if(imp.implant(M, user)) if (M == user) - user << "You implant yourself." + to_chat(user, "You implant yourself.") else M.visible_message("[user] has implanted [M].", "[user] implants you.") imp = null diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 98aca2efe5d..e89e5f737ed 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -27,7 +27,7 @@ if(!user || !C) return if(case) - user << "There's already an implant in the pad!" + to_chat(user, "There's already an implant in the pad!") return user.unEquip(C) C.forceMove(src) @@ -36,7 +36,7 @@ /obj/item/weapon/implantpad/proc/dropcase(mob/user as mob) if(!case) - user << "There's no implant in the pad!" + to_chat(user, "There's no implant in the pad!") return if(user) if(user.put_in_hands(case)) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 16fc9f046bd..88c555d8148 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -31,7 +31,7 @@ var/thrown_from /obj/item/weapon/legcuffs/bolas/suicide_act(mob/living/user) - viewers(user) << "[user] is wrapping the [src.name] around \his neck! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is wrapping the [src.name] around \his neck! It looks like \he's trying to commit suicide.") return(OXYLOSS) /obj/item/weapon/legcuffs/bolas/throw_at(var/atom/A, throw_range, throw_speed) @@ -39,7 +39,7 @@ if(istype(usr, /mob/living/carbon/human)) //if the user is human var/mob/living/carbon/human/H = usr if((CLUMSY in H.mutations) && prob(50)) - H <<"You smack yourself in the face while swinging the [src]!" + to_chat(H, "You smack yourself in the face while swinging the [src]!") H.Stun(2) H.drop_item(src) return diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index d80c28704ad..3f19d6a494b 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -45,7 +45,7 @@ if(prob(75)) user.visible_message("After a few attempts, [user] manages to light the [src].") else - user << "You burn yourself while lighting the lighter." + to_chat(user, "You burn yourself while lighting the lighter.") user.adjustFireLoss(5) user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 040a42b4cb8..e3c65c2f35b 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -16,7 +16,7 @@ /obj/item/weapon/melee/energy/attack_self(mob/living/carbon/user) if(user.disabilities & CLUMSY && prob(50)) - user << "You accidentally cut yourself with [src], like a doofus!" + to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_organ_damage(5,5) active = !active if (active) @@ -31,7 +31,7 @@ icon_state = "sword[item_color]" w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - user << "[src] is now active." + to_chat(user, "[src] is now active.") else force = initial(force) throwforce = initial(throwforce) @@ -41,7 +41,7 @@ icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -106,7 +106,7 @@ var/obj/item/weapon/stock_parts/cell/C = R.cell if(active && !(C.use(hitcost))) attack_self() - R << "It's out of charge!" + to_chat(R, "It's out of charge!") return ..() return @@ -152,11 +152,11 @@ ..() if(istype(W, /obj/item/weapon/melee/energy/sword/saber)) if(W == src) - user << "You try to attach the end of the energy sword to... itself. You're not very smart, are you?" + to_chat(user, "You try to attach the end of the energy sword to... itself. You're not very smart, are you?") if(ishuman(user)) user.adjustBrainLoss(10) else - user << "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool." + to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.") var/obj/item/weapon/twohanded/dualsaber/newSaber = new /obj/item/weapon/twohanded/dualsaber(user.loc) if(src.hacked) // That's right, we'll only check the "original" esword. newSaber.hacked = 1 @@ -170,7 +170,7 @@ if(hacked == 0) hacked = 1 item_color = "rainbow" - user << "RNBW_ENGAGE" + to_chat(user, "RNBW_ENGAGE") if(active) icon_state = "swordrainbow" @@ -182,7 +182,7 @@ user.update_inv_l_hand() else - user << "It's already fabulous!" + to_chat(user, "It's already fabulous!") /obj/item/weapon/melee/energy/sword/pirate name = "energy cutlass" diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 7e95235ff4a..cedb07273c6 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -17,7 +17,7 @@ /obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) - viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return (OXYLOSS) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 90191efbf70..15048ae13b5 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -93,7 +93,7 @@ afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) var/angle = get_angle(A, user) - //world << angle +// to_chat(world, angle) angle = round(angle) + 45 if(angle > 180) angle -= 180 @@ -102,9 +102,9 @@ if(!angle) angle = 1 - //world << "adjusted [angle]" +// to_chat(world, "adjusted [angle]") icon_state = "[angle]" - //world << "[angle] [(get_dist(user, A) - 1)]" +// to_chat(world, "[angle] [(get_dist(user, A) - 1)]") user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15) /obj/item/weapon/newton diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 521c75f63fd..7fad9cbbe5f 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -39,7 +39,7 @@ if(!proximity) return if(reagents.total_volume < 1) - user << "Your mop is dry!" + to_chat(user, "Your mop is dry!") return var/turf/simulated/turf = A @@ -51,7 +51,7 @@ user.visible_message("[user] begins to clean \the [turf] with [src].", "You begin to clean \the [turf] with [src]...") if(do_after(user, src.mopspeed, target = turf)) - user << "You finish mopping." + to_chat(user, "You finish mopping.") clean(turf) @@ -67,7 +67,7 @@ /obj/item/weapon/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) - user << "You wet [src] in [source]." + to_chat(user, "You wet [src] in [source].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return 1 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index e5889b923d2..9e8f68faa73 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -20,25 +20,25 @@ /obj/item/weapon/pneumatic_cannon/examine(mob/user) ..() if(!in_range(user, src)) - user << "You'll need to get closer to see any more." + to_chat(user, "You'll need to get closer to see any more.") return for(var/obj/item/I in loadedItems) spawn(0) - user << "\icon [I] It has \the [I] loaded." + to_chat(user, "\icon [I] It has \the [I] loaded.") if(tank) - user << "\icon [tank] It has \the [tank] mounted onto it." + to_chat(user, "\icon [tank] It has \the [tank] mounted onto it.") /obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/tank/) && !tank) if(istype(W, /obj/item/weapon/tank/emergency_oxygen)) - user << "\The [W] is too small for \the [src]." + to_chat(user, "\The [W] is too small for \the [src].") return updateTank(W, 0, user) return if(W.type == type) - user << "You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption." + to_chat(user, "You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.") return if(istype(W, /obj/item/weapon/wrench)) switch(pressureSetting) @@ -48,25 +48,25 @@ pressureSetting = 3 if(3) pressureSetting = 1 - user << "You tweak \the [src]'s pressure output to [pressureSetting]." + to_chat(user, "You tweak \the [src]'s pressure output to [pressureSetting].") return if(istype(W, /obj/item/weapon/screwdriver) && tank) updateTank(tank, 1, user) return if(loadedWeightClass >= maxWeightClass) - user << "\The [src] can't hold any more items!" + to_chat(user, "\The [src] can't hold any more items!") return if(istype(W, /obj/item)) var/obj/item/IW = W if((loadedWeightClass + IW.w_class) > maxWeightClass) - user << "\The [IW] won't fit into \the [src]!" + to_chat(user, "\The [IW] won't fit into \the [src]!") return if(IW.w_class > src.w_class) - user << "\The [IW] is too large to fit into \the [src]!" + to_chat(user, "\The [IW] is too large to fit into \the [src]!") return if(!user.unEquip(W)) return - user << "You load \the [IW] into \the [src]." + to_chat(user, "You load \the [IW] into \the [src].") loadedItems.Add(IW) loadedWeightClass += IW.w_class IW.loc = src @@ -90,13 +90,13 @@ return var/discharge = 0 if(!loadedItems || !loadedWeightClass) - user << "\The [src] has nothing loaded." + to_chat(user, "\The [src] has nothing loaded.") return if(!tank) - user << "\The [src] can't fire without a source of gas." + to_chat(user, "\The [src] can't fire without a source of gas.") return if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) - user << "\The [src] lets out a weak hiss and doesn't react!" + to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") return if(user && (CLUMSY in user.mutations) && prob(75)) user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") @@ -146,17 +146,17 @@ if(removing) if(!src.tank) return - user << "You detach \the [thetank] from \the [src]." + to_chat(user, "You detach \the [thetank] from \the [src].") src.tank.loc = get_turf(user) user.put_in_hands(tank) src.tank = null if(!removing) if(src.tank) - user << "\The [src] already has a tank." + to_chat(user, "\The [src] already has a tank.") return if(!user.unEquip(thetank)) return - user << "You hook \the [thetank] up to \the [src]." + to_chat(user, "You hook \the [thetank] up to \the [src].") src.tank = thetank thetank.loc = src src.update_icons() diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index f884e3b368b..d2598a4036f 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -18,7 +18,7 @@ var/minor_fault = 0 //If not 100% reliable, it will build up faults. suicide_act(mob/user) - viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.") return (FIRELOSS) /obj/item/weapon/stock_parts/cell/crap @@ -115,14 +115,12 @@ minor_fault = 1 -/obj/item/weapon/stock_parts/cell/slime +/obj/item/weapon/stock_parts/cell/high/slime name = "charged slime core" desc = "A yellow slime core infused with plasma, it crackles with power." origin_tech = "powerstorage=2;biotech=4" - icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi' - icon_state = "yellow slime extract" //"potato_battery" - maxcharge = 10000 - rating = 3 + icon = 'icons/mob/slimes.dmi' + icon_state = "yellow slime extract" materials = list() /obj/item/weapon/stock_parts/cell/pulse/carbine diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 8458058c131..589f91b8302 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -55,7 +55,7 @@ return if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - user << "A mysterious force disrupts your arcane spell matrix, and you remain where you are." + to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") return var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread() @@ -74,7 +74,7 @@ L+=T if(!L.len) - user <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." + to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") return if(user && user.buckled) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 70513198e39..4add062aabc 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -16,8 +16,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/shard/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.") + to_chat(viewers(user), pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", + "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.")) return (BRUTELOSS) /obj/item/weapon/shard/New() @@ -46,7 +46,7 @@ if(G.amount >= G.max_amount) continue G.attackby(NG, user) - user << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s." + to_chat(user, "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.") qdel(src) ..() @@ -55,7 +55,7 @@ var/mob/living/M = AM if (M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping! return - M << "\red You step on \the [src]!" + to_chat(M, "\red You step on \the [src]!") playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 222960e9a5a..86345b677ca 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -70,7 +70,7 @@ /obj/item/weapon/shield/energy/attack_self(mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) - user << "You beat yourself in the head with [src]." + to_chat(user, "You beat yourself in the head with [src].") user.take_organ_damage(5) active = !active icon_state = "eshield[active]" @@ -81,14 +81,14 @@ throw_speed = 2 w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 35, 1) - user << "[src] is now active." + to_chat(user, "[src] is now active.") else force = 3 throwforce = 3 throw_speed = 3 w_class = 1 playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -123,14 +123,14 @@ throw_speed = 2 w_class = 4 slot_flags = SLOT_BACK - user << "You extend \the [src]." + to_chat(user, "You extend \the [src].") else force = 3 throwforce = 3 throw_speed = 3 w_class = 3 slot_flags = null - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -157,10 +157,10 @@ /obj/item/weapon/cloaking_device/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The cloaking device is now active." + to_chat(user, "\blue The cloaking device is now active.") src.icon_state = "shield1" else - user << "\blue The cloaking device is now inactive." + to_chat(user, "\blue The cloaking device is now inactive.") src.icon_state = "shield0" src.add_fingerprint(user) return diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 02f3289dad8..961547d362f 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -28,11 +28,11 @@ if(!proximity) return if(user.client && (target in user.client.screen)) - user << "You need to take that [target.name] off before 'cleaning' it." + to_chat(user, "You need to take that [target.name] off before 'cleaning' it.") else user.visible_message("[user] begins to smear [src] on \the [target.name].") if(do_after(user, src.cleanspeed, target = target)) - user << "You 'clean' \the [target.name]." + to_chat(user, "You 'clean' \the [target.name].") if(istype(target, /turf/simulated)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target) else if (istype(target,/mob/living/carbon)) diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 9cf7b4cce63..e36bed7a473 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -29,7 +29,7 @@ if(user.mind in ticker.mode.wizards) user.flying = wielded ? 1 : 0 if(wielded) - user << "You hold \the [src] between your legs." + to_chat(user, "You hold \the [src] between your legs.") user.say("QUID 'ITCH") animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) else @@ -40,7 +40,7 @@ user.pixel_y -= 6 else if(wielded) - user << "You hold \the [src] between your legs." + to_chat(user, "You hold \the [src] between your legs.") /obj/item/weapon/twohanded/staff/broom/attackby(var/obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 98c626c2595..6c59e98385f 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -42,7 +42,7 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(crit_fail) - user << "\red The Bluespace generator isn't working." + to_chat(user, "\red The Bluespace generator isn't working.") return else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No") @@ -65,9 +65,10 @@ proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) - user << "\red The Bluespace portal resists your attempt to add another item." //light failure + to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure + else - user << "\red The Bluespace generator malfunctions!" + to_chat(user, "\red The Bluespace generator malfunctions!") for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index ef0429347f0..350bf9c5e7a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -93,7 +93,7 @@ /obj/item/weapon/storage/bag/plasticbag/mob_can_equip(M as mob, slot) if(slot==slot_head && contents.len) - M << "\red You need to empty the bag first!" + to_chat(M, "\red You need to empty the bag first!") return 0 return ..() @@ -226,14 +226,14 @@ can_be_inserted(obj/item/W as obj, stop_messages = 0) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood)) if(!stop_messages) - usr << "The snatcher does not accept [W]." + to_chat(usr, "The snatcher does not accept [W].") return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu var/current = 0 for(var/obj/item/stack/sheet/S in contents) current += S.amount if(capacity == current)//If it's full, you're done if(!stop_messages) - usr << "\red The snatcher is full." + to_chat(usr, "\red The snatcher is full.") return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 118ca1855f0..daefa0db457 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -413,9 +413,10 @@ proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) - user << "\red The Bluespace portal resists your attempt to add another item." //light failure + to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure + else - user << "\red The Bluespace generator malfunctions!" + to_chat(user, "\red The Bluespace generator malfunctions!") for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 @@ -490,7 +491,7 @@ return if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet)) return - user << "Planting explosives..." + to_chat(user, "Planting explosives...") user.visible_message("[user.name] is fiddling with their toolbelt.") if(ismob(target)) user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" @@ -508,7 +509,7 @@ target:attack_log += "\[[time_stamp()]\] Had the [name] planted on them by [user.real_name] ([user.ckey])" user.visible_message("\red [user.name] finished planting an explosive on [target.name]!") target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2") - user << "You sacrifice your belt for the sake of justice. Timer counting down from 15." + to_chat(user, "You sacrifice your belt for the sake of justice. Timer counting down from 15.") spawn(150) if(target) if(ismob(target) || isobj(target)) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index b0106cd1f93..3fa521a7451 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -9,7 +9,7 @@ var/deity_name = "Christ" suicide_act(mob/user) - viewers(user) << "[user] stares into [src.name] and attempts to trascend understanding of the universe!" + to_chat(viewers(user), "[user] stares into [src.name] and attempts to trascend understanding of the universe!") return (user.dust()) @@ -53,15 +53,15 @@ M.LAssailant = user if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + to_chat(user, "\red You don't have the dexterity to do this!") return if(!chaplain) - user << "\red The book sizzles in your hands." + to_chat(user, "\red The book sizzles in your hands.") user.take_organ_damage(0,10) return if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + to_chat(user, "\red The [src] slips out of your hand and hits your head.") user.take_organ_damage(10) user.Paralyse(20) return @@ -71,19 +71,19 @@ if (M.stat !=2) /*if((M.mind in ticker.mode.cult) && (prob(20))) - M << "\red The power of [src.deity_name] clears your mind of heresy!" - user << "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!" + to_chat(M, "\red The power of [src.deity_name] clears your mind of heresy!") + to_chat(user, "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!") ticker.mode.remove_cultist(M.mind)*/ if ((istype(M, /mob/living/carbon/human) && prob(60))) bless(M) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] heals [] with the power of [src.deity_name]!", user, M), 1) - M << "\red May the power of [src.deity_name] compel you to be healed!" + to_chat(M, "\red May the power of [src.deity_name] compel you to be healed!") playsound(src.loc, "punch", 25, 1, -1) else if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet)) M.adjustBrainLoss(10) - M << "\red You feel dumber." + to_chat(M, "\red You feel dumber.") for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] beats [] over the head with []!", user, M, src), 1) playsound(src.loc, "punch", 25, 1, -1) @@ -97,17 +97,17 @@ if(!proximity) return if (istype(A, /turf/simulated/floor)) - user << "You hit the floor with the bible." + to_chat(user, "You hit the floor with the bible.") if(user.mind && (user.mind.assigned_role == "Chaplain")) call(/obj/effect/rune/proc/revealrunes)(src) if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - user << "You bless [A]." + to_chat(user, "You bless [A].") var/water2holy = A.reagents.get_reagent_amount("water") A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) if(A.reagents && A.reagents.has_reagent("unholywater")) //yeah yeah, copy pasted code - sue me - user << "You purify [A]." + to_chat(user, "You purify [A].") var/unholy2clean = A.reagents.get_reagent_amount("unholywater") A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index f460aaa1b47..31ead836204 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -29,11 +29,11 @@ return if(contents.len <= 0) - user << "There are no [src.icon_type]s left in the box." + to_chat(user, "There are no [src.icon_type]s left in the box.") else if(contents.len == 1) - user << "There is one [src.icon_type] left in the box." + to_chat(user, "There is one [src.icon_type] left in the box.") else - user << "There are [src.contents.len] [src.icon_type]s in the box." + to_chat(user, "There are [src.contents.len] [src.icon_type]s in the box.") @@ -142,10 +142,10 @@ if(istype(W,/obj/item/toy/crayon)) switch(W:colourName) if("mime") - usr << "This crayon is too sad to be contained in this box." + to_chat(usr, "This crayon is too sad to be contained in this box.") return if("rainbow") - usr << "This crayon is too powerful to be contained in this box." + to_chat(usr, "This crayon is too powerful to be contained in this box.") return ..() @@ -217,12 +217,12 @@ var/obj/item/clothing/mask/cigarette/C = I lace_cigarette(C) user.equip_to_slot_if_possible(C, slot_wear_mask) - user << "You take \a [C.name] out of the pack." + to_chat(user, "You take \a [C.name] out of the pack.") update_icon() got_cig = 1 break if(!got_cig) - user << "There are no smokables in the pack!" + to_chat(user, "There are no smokables in the pack!") else ..() @@ -231,13 +231,13 @@ var/obj/item/weapon/match/M = W if(M.lit == 1) if(!stop_messages) - usr << "Putting a lit [W] in [src] probably isn't a good idea." + to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.") return 0 if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W if(L.lit == 1) if(!stop_messages) - usr << "Putting [W] in [src] while lit probably isn't a good idea." + to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") return 0 //if we get this far, handle the insertion checks as normal .=..() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6429d83c73b..a11d00dbccd 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -215,9 +215,14 @@ use_to_pickup = 1 storage_slots = 14 display_contents_with_number = 1 + var/base_name = "" + var/label_text = "" + +/obj/item/weapon/storage/pill_bottle/New() + ..() + base_name = name /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri - if (ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~ var/mob/M = usr if (!( istype(over_object, /obj/screen) )) @@ -239,6 +244,24 @@ return return +/obj/item/weapon/storage/pill_bottle/attackby(var/obj/item/I, mob/user as mob, params) + if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) + var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text)) + if(length(tmp_label) > MAX_NAME_LEN) + to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.") + else + to_chat(user, "You set the label to \"[tmp_label]\".") + label_text = tmp_label + update_name_label() + else + ..() + +/obj/item/weapon/storage/pill_bottle/proc/update_name_label() + if(label_text == "") + name = base_name + else + name = "[base_name] ([label_text])" + /obj/item/weapon/storage/pill_bottle/charcoal name = "Pill bottle (Charcoal)" desc = "Contains pills used to counter toxins." diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 608f111060f..1dde63d198a 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -20,34 +20,34 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + to_chat(user, "\red It appears to be broken.") return if(src.allowed(user)) src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked - user << "\red You lock the [src.name]!" + to_chat(user, "\red You lock the [src.name]!") return else src.icon_state = src.icon_closed - user << "\red You unlock the [src.name]!" + to_chat(user, "\red You unlock the [src.name]!") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) return if(!locked) ..() else - user << "\red Its locked!" + to_chat(user, "\red Its locked!") return show_to(mob/user as mob) if(locked) - user << "\red Its locked!" + to_chat(user, "\red Its locked!") else ..() return @@ -56,7 +56,7 @@ if(!locked) return ..() if(!stop_messages) - usr << "[src] is locked!" + to_chat(usr, "[src] is locked!") return 0 /obj/item/weapon/storage/lockbox/emag_act(user as mob) @@ -65,7 +65,7 @@ locked = 0 desc = "It appears to be broken." icon_state = src.icon_broken - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index d33f6e2ba7b..59fac1b18c4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -29,7 +29,7 @@ examine(mob/user) if(..(user, 1)) - user << text("The service panel is [src.open ? "open" : "closed"].") + to_chat(user, text("The service panel is [src.open ? "open" : "closed"].")) attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(locked) @@ -78,9 +78,9 @@ spark_system.start() playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) - user << "You slice through the lock on [src]." + to_chat(user, "You slice through the lock on [src].") else - user << "You short out the lock on [src]." + to_chat(user, "You short out the lock on [src].") return @@ -144,7 +144,7 @@ if(!locked) return ..() if(!stop_messages) - usr << "[src] is locked!" + to_chat(usr, "[src] is locked!") return 0 /obj/item/weapon/storage/secure/hear_talk(mob/living/M as mob, msg) @@ -172,7 +172,7 @@ attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) - usr << "\red [src] is locked and cannot be opened!" + to_chat(usr, "\red [src] is locked and cannot be opened!") else if ((src.loc == user) && (!src.locked)) playsound(src.loc, "rustle", 50, 1, -5) if (user.s_active) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1440aa8dcf0..d92ad2399b2 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -235,7 +235,7 @@ return 0 //Means the item is already in the storage item if(contents.len >= storage_slots) if(!stop_messages) - usr << "[W] won't fit in [src], make some space!" + to_chat(usr, "[W] won't fit in [src], make some space!") return 0 //Storage item is full if(can_hold.len) @@ -248,18 +248,18 @@ if(!stop_messages) if (istype(W, /obj/item/weapon/hand_labeler)) return 0 - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") return 0 for(var/A in cant_hold) //Check for specific items which this container can't hold. if(istype(W, text2path(A) )) if(!stop_messages) - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") return 0 if (W.w_class > max_w_class) if(!stop_messages) - usr << "[W] is too big for this [src]." + to_chat(usr, "[W] is too big for this [src].") return 0 var/sum_w_class = W.w_class @@ -268,17 +268,17 @@ if(sum_w_class > max_combined_w_class) if(!stop_messages) - usr << "[src] is full, make some space." + to_chat(usr, "[src] is full, make some space.") return 0 if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage))) if(!istype(src, /obj/item/weapon/storage/backpack/holding)) //bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm. if(!stop_messages) - usr << "[src] cannot hold [W] as it's a storage item of the same size." + to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") return 0 //To prevent the stacking of same sized storage items. if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. - usr << "\the [W] is stuck to your hand, you can't put it in \the [src]" + to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]") return 0 return 1 @@ -306,7 +306,7 @@ if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow)) for(var/mob/M in viewers(usr, null)) if (M == usr) - usr << "You put the [W] into [src]." + to_chat(usr, "You put the [W] into [src].") else if (M in range(1)) //If someone is standing close enough, they can tell what it is... M.show_message("[usr] puts [W] into [src].") else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... @@ -359,7 +359,7 @@ ..() if(isrobot(user)) - user << "\blue You're a robot. No." + to_chat(user, "\blue You're a robot. No.") return 1//Robots can't interact with storage items. if(!can_be_inserted(W)) @@ -406,9 +406,9 @@ collection_mode = !collection_mode switch (collection_mode) if(1) - usr << "[src] now picks up all items in a tile at once." + to_chat(usr, "[src] now picks up all items in a tile at once.") if(0) - usr << "[src] now picks up one item at a time." + to_chat(usr, "[src] now picks up one item at a time.") /obj/item/weapon/storage/verb/quick_empty() @@ -497,7 +497,7 @@ if ( !found ) // User is too far away return // Now make the cardboard - user << "You fold [src] flat." + to_chat(user, "You fold [src] flat.") new src.foldable(get_turf(src)) qdel(src) //BubbleWrap END diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b1efb1168ff..22e46163fa3 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -18,7 +18,7 @@ New() ..() if (src.type == /obj/item/weapon/storage/toolbox) - world << "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]" + to_chat(world, "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]") qdel(src) /obj/item/weapon/storage/toolbox/emergency diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 04c15fe1d97..db834beeb45 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -55,24 +55,24 @@ /obj/item/weapon/melee/baton/examine(mob/user) ..(user) if(bcell) - user <<"The baton is [round(bcell.percent())]% charged." + to_chat(user, "The baton is [round(bcell.percent())]% charged.") if(!bcell) - user <<"The baton does not have a power source installed." + to_chat(user, "The baton does not have a power source installed.") /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W if(bcell) - user << "[src] already has a cell." + to_chat(user, "[src] already has a cell.") else if(C.maxcharge < hitcost) - user << "[src] requires a higher capacity cell." + to_chat(user, "[src] requires a higher capacity cell.") return if(!user.unEquip(W)) return W.loc = src bcell = W - user << "You install a cell in [src]." + to_chat(user, "You install a cell in [src].") update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) @@ -80,7 +80,7 @@ bcell.updateicon() bcell.loc = get_turf(src.loc) bcell = null - user << "You remove the cell from the [src]." + to_chat(user, "You remove the cell from the [src].") status = 0 update_icon() return @@ -90,14 +90,14 @@ /obj/item/weapon/melee/baton/attack_self(mob/user) if(bcell && bcell.charge > hitcost) status = !status - user << "[src] is now [status ? "on" : "off"]." + to_chat(user, "[src] is now [status ? "on" : "off"].") playsound(loc, "sparks", 75, 1, -1) else status = 0 if(!bcell) - user << "[src] does not have a power source!" + to_chat(user, "[src] does not have a power source!") else - user << "[src] is out of charge." + to_chat(user, "[src] is out of charge.") update_icon() add_fingerprint(user) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index edf0c77e131..63346476021 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -10,8 +10,8 @@ * Banhammer */ /obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob) - M << " You have been banned FOR NO REISIN by [user]" - user << " You have BANNED [M]" + to_chat(M, " You have been banned FOR NO REISIN by [user]") + to_chat(user, " You have BANNED [M]") /* * Classic Baton @@ -33,7 +33,7 @@ if(on) add_fingerprint(user) if((CLUMSY in user.mutations) && prob(50)) - user << "You club yourself over the head." + to_chat(user, "You club yourself over the head.") user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -84,14 +84,14 @@ /obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob) on = !on if(on) - user << "You extend the baton." + to_chat(user, "You extend the baton.") icon_state = "telebaton_1" item_state = "nullrod" w_class = 4 //doesnt fit in backpack when its on for balance force = 10 //stunbaton damage attack_verb = list("smacked", "struck", "cracked", "beaten") else - user << "You collapse the baton." + to_chat(user, "You collapse the baton.") icon_state = "telebaton_0" item_state = null //no sprite for concealment even when in hand slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index d66945d1b75..61c58ce9aa5 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -57,11 +57,11 @@ if (istype(W, /obj/item/stack/rods)) if (W:amount >= 4) new /obj/item/weapon/table_parts/reinforced( user.loc ) - user << "\blue You reinforce the [name]." + to_chat(user, "\blue You reinforce the [name].") W:use(4) qdel(src) else if (W:amount < 4) - user << "\red You need at least four rods to do this." + to_chat(user, "\red You need at least four rods to do this.") /obj/item/weapon/table_parts/attack_self(mob/user as mob) new /obj/structure/table( user.loc ) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index edbe4be2cd1..68fe80fdbfb 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -29,7 +29,7 @@ return if(air_contents.oxygen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -37,7 +37,7 @@ set name = "Toggle Jetpack Stabilization" set category = "Object" src.stabilization_on = !( src.stabilization_on ) - usr << "You toggle the stabilization [stabilization_on? "on":"off"]." + to_chat(usr, "You toggle the stabilization [stabilization_on? "on":"off"].") return @@ -133,7 +133,7 @@ return if(air_contents.carbon_dioxide < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -142,7 +142,7 @@ var/obj/item/weapon/rig/holder /obj/item/weapon/tank/jetpack/rig/examine() - usr << "It's a jetpack. If you can see this, report it on the bug tracker." + to_chat(usr, "It's a jetpack. If you can see this, report it on the bug tracker.") return 0 /obj/item/weapon/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index dc5425616ac..6767b88ac0d 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -26,7 +26,7 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) //playsound(usr, 'sound/effects/alert.ogg', 50, 1) @@ -71,8 +71,8 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 1 && loc==usr) - user << "\red The meter on the [src.name] indicates you are almost out of air!" - user << sound('sound/effects/alert.ogg') + to_chat(user, "\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, sound('sound/effects/alert.ogg')) /obj/item/weapon/tank/air/New() ..() @@ -123,8 +123,8 @@ /obj/item/weapon/tank/plasma/plasmaman/examine(mob/user) if(..(user, 0)) if(air_contents.toxins < 0.2 && loc==usr) - user << text("\red The meter on the [src.name] indicates you are almost out of plasma!") - user << sound('sound/effects/alert.ogg') + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of plasma!")) + to_chat(user, sound('sound/effects/alert.ogg')) /* * Emergency Oxygen @@ -150,8 +150,8 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 0.2 && loc==usr) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") - user << sound('sound/effects/alert.ogg') + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + to_chat(user, sound('sound/effects/alert.ogg')) /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" @@ -191,7 +191,7 @@ /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0)) if(air_contents.nitrogen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) //playsound(usr, 'sound/effects/alert.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index cee2996904f..46342d78a99 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -44,7 +44,8 @@ if (istype(src.loc, /obj/item/assembly)) icon = src.loc if (!in_range(src, user)) - if (icon == src) user << "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer." + if (icon == src) + to_chat(user, "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer.") return var/celsius_temperature = src.air_contents.temperature-T0C @@ -63,7 +64,7 @@ else descriptive = "furiously hot" - user << "\blue \The \icon[icon][src] feels [descriptive]" + to_chat(user, "\blue \The \icon[icon][src] feels [descriptive]") return @@ -166,7 +167,7 @@ if(location.internal == src) location.internal = null location.internals.icon_state = "internal0" - usr << "\blue You close the tank release valve." + to_chat(usr, "\blue You close the tank release valve.") if (location.internals) location.internals.icon_state = "internal0" else @@ -181,11 +182,11 @@ if(can_open_valve) location.internal = src - usr << "\blue You open \the [src] valve." + to_chat(usr, "\blue You open \the [src] valve.") if (location.internals) location.internals.icon_state = "internal1" else - usr << "\blue You need something to connect to \the [src]." + to_chat(usr, "\blue You need something to connect to \the [src].") src.add_fingerprint(usr) return 1 @@ -232,7 +233,7 @@ if(!istype(src.loc,/obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] (JMP)") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] at [x], [y], [z]") - //world << "\blue[x],[y] tank is exploding: [pressure] kPa" +// to_chat(world, "\blue[x],[y] tank is exploding: [pressure] kPa") //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -241,7 +242,7 @@ var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE var/turf/epicenter = get_turf(loc) - //world << "\blue Exploding Pressure: [pressure] kPa, intensity: [range]" +// to_chat(world, "\blue Exploding Pressure: [pressure] kPa, intensity: [range]") explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5)) if(istype(src.loc,/obj/item/device/transfer_valve)) @@ -250,7 +251,7 @@ qdel(src) else if(pressure > TANK_RUPTURE_PRESSURE) - //world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" +// to_chat(world, "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -262,7 +263,7 @@ integrity-- else if(pressure > TANK_LEAK_PRESSURE) - //world << "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" +// to_chat(world, "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 328debd11fc..cbe3cdde29d 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -26,7 +26,7 @@ set name = "Toggle Mister" set category = "Object" if (usr.get_item_by_slot(slot_back) != src) - usr << "The watertank needs to be on your back to use." + to_chat(usr, "The watertank needs to be on your back to use.") return if(usr.incapacitated()) return @@ -40,7 +40,7 @@ //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) on = 0 - user << "You need a free hand to hold the mister." + to_chat(user, "You need a free hand to hold the mister.") return noz.loc = user else @@ -125,7 +125,7 @@ return /obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user as mob) - user << "The mister snaps back onto the watertank." + to_chat(user, "The mister snaps back onto the watertank.") tank.on = 0 loc = tank @@ -175,7 +175,7 @@ /obj/item/weapon/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - user << "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray." + to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") //ATMOS FIRE FIGHTING BACKPACK @@ -240,22 +240,22 @@ if(EXTINGUISHER) nozzle_mode = NANOFROST tank.icon_state = "waterbackpackatmos_1" - user << "Swapped to nanofrost launcher" + to_chat(user, "Swapped to nanofrost launcher") return if(NANOFROST) nozzle_mode = METAL_FOAM tank.icon_state = "waterbackpackatmos_2" - user << "Swapped to metal foam synthesizer" + to_chat(user, "Swapped to metal foam synthesizer") return if(METAL_FOAM) nozzle_mode = EXTINGUISHER tank.icon_state = "waterbackpackatmos_0" - user << "Swapped to water extinguisher" + to_chat(user, "Swapped to water extinguisher") return return /obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) - user << "The nozzle snaps back onto the tank!" + to_chat(user, "The nozzle snaps back onto the tank!") tank.on = 0 loc = tank @@ -271,10 +271,10 @@ return //Safety check so you don't blast yourself trying to refill your tank var/datum/reagents/R = reagents if(R.total_volume < 100) - user << "You need at least 100 units of water to use the nanofrost launcher!" + to_chat(user, "You need at least 100 units of water to use the nanofrost launcher!") return if(nanofrost_cooldown) - user << "Nanofrost launcher is still recharging" + to_chat(user, "Nanofrost launcher is still recharging") return nanofrost_cooldown = 1 R.remove_any(100) @@ -300,7 +300,7 @@ if(src) metal_synthesis_cooldown-- else - user << "Metal foam mix is still being synthesized." + to_chat(user, "Metal foam mix is still being synthesized.") return /obj/effect/nanofrost_container diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 1f648ec2b3b..a6c7841e020 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -14,7 +14,7 @@ /* -- Disabled for now until it has a use -- /obj/item/stack/tape_roll/attack_self(mob/user as mob) - user << "You remove a length of tape from [src]." + to_chat(user, "You remove a length of tape from [src].") var/obj/item/weapon/ducttape/tape = new() user.put_in_hands(tape) @@ -71,7 +71,7 @@ if(!stuck) return - user << "You remove \the [initial(name)] from [stuck]." + to_chat(user, "You remove \the [initial(name)] from [stuck].") user.unEquip(src) stuck.forceMove(get_turf(src)) @@ -91,8 +91,8 @@ if(target_turf != source_turf) dir_offset = get_dir(source_turf, target_turf) if(!(dir_offset in cardinal)) - user << "You cannot reach that from here." // can only place stuck papers in cardinal directions, to - return // reduce papers around corners issue. + to_chat(user, "You cannot reach that from here.")// can only place stuck papers in cardinal directions, to + return // reduce papers around corners issue. user.unEquip(src) forceMove(source_turf) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 61663a82fb4..99567b5952a 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -49,7 +49,7 @@ Frequency: var/turf/current_location = get_turf(usr)//What turf is the user on? if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2. - usr << "\The [src] is malfunctioning." + to_chat(usr, "\The [src] is malfunctioning.") return 1 if (href_list["refresh"]) @@ -108,7 +108,7 @@ Frequency: /obj/item/weapon/hand_tele/attack_self(mob/user as mob) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist. - user << "\The [src] is malfunctioning." + to_chat(user, "\The [src] is malfunctioning.") return var/list/L = list( ) for(var/obj/machinery/computer/teleporter/com in world) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 29bc5bd5861..a187dc09b65 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -50,8 +50,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' suicide_act(mob/user) - viewers(user) << pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ - "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.") + to_chat(viewers(user), pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ + "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")) return(BRUTELOSS) /obj/item/weapon/screwdriver/New() @@ -173,7 +173,7 @@ /obj/item/weapon/weldingtool/examine(mob/user) if(..(user, 0)) - user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") /obj/item/weapon/weldingtool/suicide_act(mob/user) user.visible_message("[user] welds \his every orifice closed! It looks like \he's trying to commit suicide..") @@ -248,13 +248,13 @@ S.heal_damage(15,0,0,1) user.visible_message("\The [user] patches some dents on \the [M]'s [S.name] with \the [src].") else if(S.open != 2) - user << "Need more welding fuel!" + to_chat(user, "Need more welding fuel!") return 1 else - user << "The damage is far too severe to patch over externally." + to_chat(user, "The damage is far too severe to patch over externally.") return 1 else if(S.open != 2) - user << "Nothing to fix!" + to_chat(user, "Nothing to fix!") else return ..() @@ -263,14 +263,14 @@ if(istype(O, /obj/structure/reagent_dispensers/fueltank) && in_range(src, O)) if(!welding) O.reagents.trans_to(src, max_fuel) - user << "[src] refueled." + to_chat(user, "[src] refueled.") playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) update_icon() return else message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") - user << "That was stupid of you." + to_chat(user, "That was stupid of you.") O.ex_act() return @@ -291,19 +291,19 @@ /obj/item/weapon/weldingtool/proc/get_fuel() return reagents.get_reagent_amount("fuel") -//Removes fuel from the welding tool. If a mob is passed, it will perform an eyecheck on the mob. This should probably be renamed to use() -/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null) +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/living/M = null) if(!welding || !check_fuel()) return 0 if(get_fuel() >= amount) reagents.remove_reagent("fuel", amount) check_fuel() if(M) - eyecheck(M) + M.flash_eyes(light_intensity) return 1 else if(M) - M << "\blue You need more welding fuel to complete this task." + to_chat(M, "\blue You need more welding fuel to complete this task.") return 0 //Returns whether or not the welding tool is currently on. @@ -327,79 +327,39 @@ //Toggles the welder off and on /obj/item/weapon/weldingtool/proc/toggle(mob/user, message = 0) if(!status) - user << "[src] can't be turned on while unsecured!" + to_chat(user, "[src] can't be turned on while unsecured!") return welding = !welding if(welding) if(get_fuel() >= 1) - user << "You switch [src] on." + to_chat(user, "You switch [src] on.") force = 15 damtype = "fire" hitsound = 'sound/items/welder.ogg' update_icon() processing_objects |= src else - user << "You need more fuel!" + to_chat(user, "You need more fuel!") welding = 0 else if(!message) - user << "You switch [src] off." + to_chat(user, "You switch [src] off.") else - user << "[src] shuts off!" + to_chat(user, "[src] shuts off!") force = 3 damtype = "brute" hitsound = "swing_hit" update_icon() -//Decides whether or not to damage a player's eyes based on what they're wearing as protection -//Note: This should probably be moved to mob -/obj/item/weapon/weldingtool/proc/eyecheck(mob/user as mob) - if(!iscarbon(user)) return 1 - var/safety = user:eyecheck() - if(ishuman(user)) - var/mob/living/carbon/human/H = user - var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) - if(!istype(E)) // No eyes? No problem! - return - switch(safety) - if(1) - usr << "Your eyes sting a little." - E.damage += rand(1, 2) - if(E.damage > 12) - user.eye_blurry += rand(3,6) - if(0) - usr << "Your eyes burn." - E.damage += rand(2, 4) - if(E.damage > 10) - E.damage += rand(4,10) - if(-1) - usr << "Your thermals intensify the welder's glow. Your eyes itch and burn severely." - user.eye_blurry += rand(12,20) - E.damage += rand(12, 16) - if(safety<2) - if(E.damage > 10) - user << "Your eyes are really starting to hurt. This can't be good for you!" - if (E.damage >= E.min_broken_damage) - user << "You go blind!" - user.sdisabilities |= BLIND - else if (E.damage >= E.min_bruised_damage) - user << "You go blind!" - user.eye_blind = 5 - user.eye_blurry = 5 - user.disabilities |= NEARSIGHTED - spawn(100) - user.disabilities &= ~NEARSIGHTED - return - /obj/item/weapon/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) if(welding) - user << "Turn it off first!" + to_chat(user, "Turn it off first!") return status = !status if(status) - user << "You resecure [src]." + to_chat(user, "You resecure [src].") else - user << "[src] can now be attached and modified." + to_chat(user, "[src] can now be attached and modified.") add_fingerprint(user) /obj/item/weapon/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) @@ -412,10 +372,10 @@ loc = F F.weldtool = src add_fingerprint(user) - user << "You add a rod to a welder, starting to build a flamethrower." + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") user.put_in_hands(F) else - user << "You need one rod to start building a flamethrower!" + to_chat(user, "You need one rod to start building a flamethrower!") return /obj/item/weapon/weldingtool/largetank @@ -532,5 +492,5 @@ attack_self(mob/user as mob) open = !open - user << "\blue You [open?"open" : "close"] the conversion kit." + to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.") update_icon() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 61164a45298..0e4f49de46a 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -43,9 +43,9 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - user << "You free up your module." + to_chat(user, "You free up your module.") else - user << "You are now carrying the [name] with one hand." + to_chat(user, "You are now carrying the [name] with one hand.") if(unwieldsound) playsound(loc, unwieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = user.get_inactive_hand() @@ -58,10 +58,10 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species.is_small) - user << "It's too heavy for you to wield fully." + to_chat(user, "It's too heavy for you to wield fully.") return if(user.get_inactive_hand()) - user << "You need your other hand to be empty!" + to_chat(user, "You need your other hand to be empty!") return wielded = 1 force = force_wielded @@ -71,9 +71,9 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - user << "You dedicate your module to [name]." + to_chat(user, "You dedicate your module to [name].") else - user << "You grab the [name] with both hands." + to_chat(user, "You grab the [name] with both hands.") if (wieldsound) playsound(loc, wieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ @@ -85,7 +85,7 @@ /obj/item/weapon/twohanded/mob_can_equip(mob/M, slot) //Cannot equip wielded items. if(wielded) - M << "Unwield the [name] first!" + to_chat(M, "Unwield the [name] first!") return 0 return ..() @@ -138,7 +138,7 @@ /obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) if(wielded) - M << "[src.name] is too cumbersome to carry with anything but your hands!" + to_chat(M, "[src.name] is too cumbersome to carry with anything but your hands!") return 0 return ..() @@ -224,7 +224,7 @@ /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) ..() if((CLUMSY in user.mutations) && (wielded) &&prob(40)) - user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]." + to_chat(user, "\red You twirl around a bit before losing your balance and impaling yourself on the [src].") user.take_organ_damage(20,25) return if((wielded) && prob(50)) @@ -268,11 +268,11 @@ if(istype(W, /obj/item/device/multitool)) if(hacked == 0) hacked = 1 - user << "2XRNBW_ENGAGE" + to_chat(user, "2XRNBW_ENGAGE") blade_color = "rainbow" update_icon() else - user << "It's starting to look like a triple rainbow - no, nevermind." + to_chat(user, "It's starting to look like a triple rainbow - no, nevermind.") //spears /obj/item/weapon/twohanded/spear @@ -301,7 +301,7 @@ //Putting heads on spears /obj/item/weapon/organ/head/attackby(var/obj/item/weapon/W, var/mob/living/user, params) if(istype(W, /obj/item/weapon/twohanded/spear)) - user << "You stick the head onto the spear and stand it upright on the ground." + to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() src.transform = M @@ -316,7 +316,7 @@ /obj/item/weapon/twohanded/spear/attackby(var/obj/item/I, var/mob/living/user) if(istype(I, /obj/item/weapon/organ/head)) - user << "You stick the head onto the spear and stand it upright on the ground." + to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() I.transform = M diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 517ec5ce2cb..9f22daf08f8 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -23,9 +23,9 @@ /obj/item/weapon/vending_refill/examine(mob/user) ..(user) if(charges) - user << "It can restock [charges] item(s)." + to_chat(user, "It can restock [charges] item(s).") else - user << "It's empty!" + to_chat(user, "It's empty!") //NOTE I decided to go for about 1/3 of a machine's capacity diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index c77015ca0d1..57e22a3eef4 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -12,7 +12,7 @@ /obj/item/weapon/banhammer/suicide_act(mob/user) - viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life." + to_chat(viewers(user), "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.") return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /obj/item/weapon/nullrod @@ -31,7 +31,7 @@ var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx) suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. @@ -47,7 +47,7 @@ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(M)] with [src.name] (INTENT: [uppertext(user.a_intent)])") if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The rod slips out of your hand and hits your head." + to_chat(user, "\red The rod slips out of your hand and hits your head.") user.take_organ_damage(10) user.Paralyse(20) return @@ -56,7 +56,7 @@ if(M.mind.vampire) if(ishuman(M)) if(!M.mind.vampire.get_ability(/datum/vampire_passive/full)) - M << "The nullrod's power interferes with your own!" + to_chat(M, "The nullrod's power interferes with your own!") M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) ..() @@ -67,7 +67,7 @@ if(istype(I, T)) //Only the Chaplain's holy armor is capable fo performing this feat. if(!transformed) // can't turn a sword into a sword. var/obj/item/S = new transform_into() - user << "You sheath the [src] into the [I]'s scabbard, transforming it into \a [S]." + to_chat(user, "You sheath the [src] into the [I]'s scabbard, transforming it into \a [S].") user.unEquip(src) qdel(src) user.put_in_hands(S) @@ -98,7 +98,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return(BRUTELOSS) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -124,7 +124,7 @@ return 1 suicide_act(mob/user) - viewers(user) << "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") return(BRUTELOSS) /obj/item/weapon/claymore/ceremonial @@ -147,7 +147,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku." + to_chat(viewers(user), "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return(BRUTELOSS) /obj/item/weapon/katana/IsShield() @@ -192,7 +192,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.unEquip(I) user.put_in_hands(S) - user << "You fasten the glass shard to the top of the rod with the cable." + to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") qdel(I) qdel(src) @@ -204,7 +204,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.unEquip(I) user.put_in_hands(P) - user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward." + to_chat(user, "You fasten the wirecutters to the top of the rod with the cable, prongs outward.") qdel(I) qdel(src) diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm index bc9fae1a118..d19c411899f 100644 --- a/code/game/objects/items/weapons/whetstone.dm +++ b/code/game/objects/items/weapons/whetstone.dm @@ -13,28 +13,28 @@ /obj/item/weapon/whetstone/attackby(obj/item/I, mob/user, params) if(used) - user << "The whetstone is too worn to use again." + to_chat(user, "The whetstone is too worn to use again.") return if(I.force >= max || I.throwforce >= max)//no esword sharpening - user << "[I] is much too powerful to sharpen further." + to_chat(user, "[I] is much too powerful to sharpen further.") return if(requires_sharpness && !I.edge) - user << "You can only sharpen items that are already sharp, such as knives." + to_chat(user, "You can only sharpen items that are already sharp, such as knives.") return if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff var/obj/item/weapon/twohanded/TH = I if(TH.force_wielded >= max) - user << "[TH] is much too powerful to sharpen further." + to_chat(user, "[TH] is much too powerful to sharpen further.") return if(TH.wielded) - user << "[TH] must be unwielded before it can be sharpened." + to_chat(user, "[TH] must be unwielded before it can be sharpened.") return if(TH.force_wielded > initial(TH.force_wielded)) - user << "[TH] has already been refined before. It cannot be sharpened further." + to_chat(user, "[TH] has already been refined before. It cannot be sharpened further.") return TH.force_wielded = Clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay if(I.force > initial(I.force)) - user << "[I] has already been refined before. It cannot be sharpened further." + to_chat(user, "[I] has already been refined before. It cannot be sharpened further.") return user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") if(!requires_sharpness) diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index e1b943f7897..abae807c80a 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -12,7 +12,7 @@ attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return (OXYLOSS) @@ -28,9 +28,9 @@ /obj/item/weapon/wire/attack_self(mob/user as mob) if (src.laying) src.laying = 0 - user << "\blue You're done laying wire!" + to_chat(user, "\blue You're done laying wire!") else - user << "\blue You are not using this to lay wire..." + to_chat(user, "\blue You are not using this to lay wire...") return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 13dcb4d790e..8f40f7a9848 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -268,3 +268,6 @@ a { tesla_zap(src, 3, power_bounced) spawn(10) being_shocked = 0 + +/obj/proc/CanAStarPass() + . = !density \ No newline at end of file diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ec288220060..952a647f3aa 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -68,11 +68,11 @@ for(var/obj/O in range(0, src)) if(O.density == 1 && O != src && !istype(O, /obj/machinery/door/window)) //Ignores windoors, as those already block climbing, otherwise a windoor on the opposite side of a table would prevent climbing. - user << "\red You cannot climb [src], as it is blocked by \a [O]!" + to_chat(user, "\red You cannot climb [src], as it is blocked by \a [O]!") return for(var/turf/T in range(0, src)) if(T.density == 1) - user << "\red You cannot climb [src], as it is blocked by \a [T]!" + to_chat(user, "\red You cannot climb [src], as it is blocked by \a [T]!") return var/turf/T = src.loc if(!T || !istype(T)) return @@ -108,14 +108,14 @@ if(M.lying) return //No spamming this on people. M.Weaken(5) - M << "\red You topple as \the [src] moves under you!" + to_chat(M, "\red You topple as \the [src] moves under you!") if(prob(25)) var/damage = rand(15,30) var/mob/living/carbon/human/H = M if(!istype(H)) - H << "\red You land heavily!" + to_chat(H, "\red You land heavily!") M.adjustBruteLoss(damage) return @@ -134,12 +134,12 @@ affecting = H.get_organ("head") if(affecting) - M << "\red You land heavily on your [affecting.name]!" + to_chat(M, "\red You land heavily on your [affecting.name]!") affecting.take_damage(damage, 0) if(affecting.parent) affecting.parent.add_autopsy_data("Misadventure", damage) else - H << "\red You land heavily!" + to_chat(H, "\red You land heavily!") H.adjustBruteLoss(damage) H.UpdateDamageIcon() @@ -152,12 +152,12 @@ if(!Adjacent(user)) return 0 if (user.restrained() || user.buckled) - user << "You need your hands and legs free for this." + to_chat(user, "You need your hands and legs free for this.") return 0 if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened) return 0 if (issilicon(user)) - user << "You need hands for this." + to_chat(user, "You need hands for this.") return 0 return 1 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 6604649ad4c..9251890dc6e 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -139,15 +139,15 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] ..(user) if(in_range(user, src) && get_turf(src) && user.client && ishuman(user)) //Let only humans be the robust zoominators. I'm too spooked other mobs trying to use it may get broken huds. if(src.loc == user || get_turf(src) == get_turf(user)) - user << "[src] has to be on the ground to focus on it!" + to_chat(user, "[src] has to be on the ground to focus on it!") return - user << "You focus on \the [src]." + to_chat(user, "You focus on \the [src].") user.client.screen = list() //This is because screen objects go way past the view bounds we set, therefore not allowing stretch to fit to zoom in properly. user.client.reset_stretch = winget(user.client, "mapwindow.map", "icon-size") //Remember previous icon-size user.client.view = 3 //Decrease view winset(user.client, "mapwindow.map", "icon-size=0") //Enable stretch-to-fit user.client.viewingCanvas = 1 //Reset everything we just changed as soon as client tries to move else - user << "It is too far away." + to_chat(user, "It is too far away.") #undef AMT_OF_CANVASES \ No newline at end of file diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 8957329c4a1..a1b4c51d702 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -50,10 +50,10 @@ /obj/structure/sign/barsign/attack_hand(mob/user as mob) if (!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") return if (broken) - user << "The controls seem unresponsive." + to_chat(user, "The controls seem unresponsive.") return pick_sign() @@ -62,15 +62,15 @@ /obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) if(!allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") return if( istype(I, /obj/item/weapon/screwdriver)) if(!panel_open) - user << "You open the maintenance panel." + to_chat(user, "You open the maintenance panel.") set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = 1 else - user << "You close the maintenance panel." + to_chat(user, "You close the maintenance panel.") if(!broken && !emagged) set_sign(pick(barsigns)) else if(emagged) @@ -82,17 +82,17 @@ if(istype(I, /obj/item/stack/cable_coil) && panel_open) var/obj/item/stack/cable_coil/C = I if(emagged) //Emagged, not broken by EMP - user << "Sign has been damaged beyond repair!" + to_chat(user, "Sign has been damaged beyond repair!") return else if(!broken) - user << "This sign is functioning properly!" + to_chat(user, "This sign is functioning properly!") return if(C.use(2)) - user << "You replace the burnt wiring." + to_chat(user, "You replace the burnt wiring.") broken = 0 else - user << "You need at least two lengths of cable!" + to_chat(user, "You need at least two lengths of cable!") @@ -105,9 +105,9 @@ /obj/structure/sign/barsign/emag_act(mob/user) if(broken || emagged) - user << "Nothing interesting happens!" + to_chat(user, "Nothing interesting happens!") return - user << "You emag the barsign. Takeover in progress..." + to_chat(user, "You emag the barsign. Takeover in progress...") sleep(100) //10 seconds set_sign(new /datum/barsign/hiddensigns/syndibarsign) emagged = 1 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index af608addbf8..f7e178716c5 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -169,12 +169,12 @@ LINEN BINS /obj/structure/bedsheetbin/examine(mob/user) ..(user) if(amount < 1) - user << "There are no bed sheets in the bin." + to_chat(user, "There are no bed sheets in the bin.") return if(amount == 1) - user << "There is one bed sheet in the bin." + to_chat(user, "There is one bed sheet in the bin.") return - user << "There are [amount] bed sheets in the bin." + to_chat(user, "There are [amount] bed sheets in the bin.") /obj/structure/bedsheetbin/update_icon() @@ -190,12 +190,12 @@ LINEN BINS I.loc = src sheets.Add(I) amount++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. user.drop_item() I.loc = src hidden = I - user << "You hide [I] among the sheets." + to_chat(user, "You hide [I] among the sheets.") @@ -213,11 +213,11 @@ LINEN BINS B.loc = user.loc user.put_in_hands(B) - user << "You take [B] out of [src]." + to_chat(user, "You take [B] out of [src].") if(hidden) hidden.loc = user.loc - user << "[hidden] falls out of [B]!" + to_chat(user, "[hidden] falls out of [B]!") hidden = null @@ -237,7 +237,7 @@ LINEN BINS B = new /obj/item/weapon/bedsheet(loc) B.loc = loc - user << "You telekinetically remove [B] from [src]." + to_chat(user, "You telekinetically remove [B] from [src].") update_icon() if(hidden) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 13136868954..a91b5aa3564 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -25,7 +25,7 @@ coat.loc = src update_icon() else - user << "You cannot hang [W] on [src]" + to_chat(user, "You cannot hang [W] on [src]") return ..() /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index b395e55fc0e..87457fd791d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -135,7 +135,7 @@ /obj/structure/closet/proc/toggle(mob/user as mob) if(!(src.opened ? src.close() : src.open())) - user << "It won't budge!" + to_chat(user, "It won't budge!") return // this should probably use dump_contents() @@ -193,7 +193,7 @@ var/obj/item/weapon/rcs/E = W if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.contact_levels)) - user << "The rapid-crate-sender can't locate any telepads!" + to_chat(user, "The rapid-crate-sender can't locate any telepads!") return if(E.mode == 0) if(!E.teleporting) @@ -211,14 +211,14 @@ var/desc = input("Please select a telepad.", "RCS") in L E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 return E.teleporting = 0 if(user in contents) - user << "Error: User located in container--aborting for safety." + to_chat(user, "Error: User located in container--aborting for safety.") playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -226,21 +226,21 @@ s.start() do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") return else E.rand_x = rand(50,200) E.rand_y = rand(50,200) var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 return E.teleporting = 0 if(user in contents) - user << "Error: User located in container--aborting for safety." + to_chat(user, "Error: User located in container--aborting for safety.") playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -248,10 +248,10 @@ s.start() do_teleport(src, L) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") return else - user << "Out of charges." + to_chat(user, "Out of charges.") return if(src.opened) @@ -262,7 +262,7 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") return new /obj/item/stack/sheet/metal(src.loc) for(var/mob/M in viewers(src)) @@ -280,10 +280,10 @@ else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(src == user.loc) - user << "You can not [welded?"unweld":"weld"] the locker from inside." + to_chat(user, "You can not [welded?"unweld":"weld"] the locker from inside.") return if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") return src.welded = !src.welded src.update_icon() @@ -326,11 +326,11 @@ return if(!src.open()) - user << "It won't budge!" + to_chat(user, "It won't budge!") if(!lastbang) lastbang = 1 for (var/mob/M in hearers(src, null)) - M << text("BANG, bang!", max(0, 5 - get_dist(src, M))) + to_chat(M, text("BANG, bang!", max(0, 5 - get_dist(src, M)))) spawn(30) lastbang = 0 @@ -342,7 +342,7 @@ /obj/structure/closet/attack_self_tk(mob/user as mob) src.add_fingerprint(user) if(!src.toggle()) - usr << "It won't budge!" + to_chat(usr, "It won't budge!") /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) @@ -356,7 +356,7 @@ src.add_fingerprint(usr) src.toggle(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") /obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() @@ -389,7 +389,7 @@ //okay, so the closet is either welded or locked... resist!!! L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT - L << "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)" + to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(usr.loc)) O.show_message("The [src] begins to shake violently!", 1) @@ -406,7 +406,7 @@ //Well then break it! welded = 0 update_icon() - usr << "You successfully break out!" + to_chat(usr, "You successfully break out!") for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index bfc9e385353..824cff35ece 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -34,7 +34,7 @@ if(!L.stat) L.do_alert_animation(L) egged = 1 - alerted << sound('sound/machines/chime.ogg') + to_chat(alerted, sound('sound/machines/chime.ogg')) ..() /mob/living/proc/do_alert_animation(atom/A) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 82897dfe61a..f74f603df54 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -23,11 +23,11 @@ if (isrobot(user) || src.locked) if(istype(O, /obj/item/device/multitool)) - user << "\red Resetting circuitry..." + to_chat(user, "\red Resetting circuitry...") playsound(user, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20, target = src)) src.locked = 0 - user << " You disable the locking modules." + to_chat(user, " You disable the locking modules.") update_icon() return else if(istype(O, /obj/item/weapon)) @@ -43,7 +43,7 @@ user.do_attack_animation(src) playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) - user << "\blue The cabinet's protective glass glances off the hit." + to_chat(user, "\blue The cabinet's protective glass glances off the hit.") else src.hitstaken++ if(src.hitstaken == 4) @@ -56,12 +56,12 @@ if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened) if(!fireaxe) if(O:wielded) - user << "\red Unwield the axe first." + to_chat(user, "\red Unwield the axe first.") return fireaxe = O user.drop_item(O) src.contents += O - user << "\blue You place the fire axe back in the [src.name]." + to_chat(user, "\blue You place the fire axe back in the [src.name].") update_icon() else if(src.smashed) @@ -84,14 +84,14 @@ spawn(10) update_icon() return else - user << "\red Resetting circuitry..." + to_chat(user, "\red Resetting circuitry...") sleep(50) src.locked = 1 - user << "\blue You re-enable the locking modules." + to_chat(user, "\blue You re-enable the locking modules.") playsound(user, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20, target = src)) src.locked = 1 - user << " You re-enable the locking modules." + to_chat(user, " You re-enable the locking modules.") return else localopened = !localopened @@ -112,13 +112,13 @@ hasaxe = 1 if(src.locked) - user <<"\red The cabinet won't budge!" + to_chat(user, "\red The cabinet won't budge!") return if(localopened) if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null - user << "\blue You take the fire axe from the [name]." + to_chat(user, "\blue You take the fire axe from the [name].") src.add_fingerprint(user) update_icon() else @@ -145,7 +145,7 @@ attack_tk(mob/user as mob) if(localopened && fireaxe) fireaxe.forceMove(loc) - user << "\blue You telekinetically remove the fire axe." + to_chat(user, "\blue You telekinetically remove the fire axe.") fireaxe = null update_icon() return @@ -157,9 +157,9 @@ if (isrobot(usr) || src.locked || src.smashed) if(src.locked) - usr << "\red The cabinet won't budge!" + to_chat(usr, "\red The cabinet won't budge!") else if(src.smashed) - usr << "\blue The protective glass is broken!" + to_chat(usr, "\blue The protective glass is broken!") return localopened = !localopened @@ -176,23 +176,23 @@ if(fireaxe) usr.put_in_hands(fireaxe) fireaxe = null - usr << "\blue You take the Fire axe from the [name]." + to_chat(usr, "\blue You take the Fire axe from the [name].") else - usr << "\blue The [src.name] is empty." + to_chat(usr, "\blue The [src.name] is empty.") else - usr << "\blue The [src.name] is closed." + to_chat(usr, "\blue The [src.name] is closed.") update_icon() attack_ai(mob/user as mob) if(src.smashed) - user << "\red The security of the cabinet is compromised." + to_chat(user, "\red The security of the cabinet is compromised.") return else locked = !locked if(locked) - user << "\red Cabinet locked." + to_chat(user, "\red Cabinet locked.") else - user << "\blue Cabinet unlocked." + to_chat(user, "\blue Cabinet unlocked.") return update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 70a8d5bd9d2..1de1f8d8440 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -66,12 +66,12 @@ if (W) W.forceMove(loc) else if(istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + to_chat(user, "\red It appears to be broken.") return var/obj/item/weapon/card/id/I = W if(!I || !I.registered_name) return if(src == user.loc) - user << "You can't reach the lock from inside." + to_chat(user, "You can't reach the lock from inside.") else if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name))) //they can open all lockers, or nobody owns this, or they own this locker src.locked = !( src.locked ) @@ -86,9 +86,9 @@ src.registered_name = I.registered_name src.desc = "Owned by [I.registered_name]." else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 1c2a34c719d..fc7563e6b3a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -48,22 +48,22 @@ /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob) if(src.opened) - user << "Close the locker first." + to_chat(user, "Close the locker first.") return if(src.broken) - user << "The locker appears to be broken." + to_chat(user, "The locker appears to be broken.") return if(user.loc == src) - user << "You can't reach the lock from inside." + to_chat(user, "You can't reach the lock from inside.") return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) - O << "The locker has been [locked ? null : "un"]locked by [user]." + to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].") update_icon() else - user << "Access Denied" + to_chat(user, "Access Denied") /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/rcs)) @@ -74,7 +74,7 @@ if(src.large) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet else - user << "The locker is too small to stuff [W:affecting] into!" + to_chat(user, "The locker is too small to stuff [W:affecting] into!") if(isrobot(user)) return user.drop_item() @@ -94,7 +94,7 @@ desc = "It appears to be broken." icon_state = icon_off flick(icon_broken, src) - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") /obj/structure/closet/secure_closet/attack_hand(mob/user as mob) src.add_fingerprint(user) @@ -115,7 +115,7 @@ src.add_fingerprint(usr) src.togglelock(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") /obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() @@ -141,7 +141,7 @@ //okay, so the closet is either welded or locked... resist!!! L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT - L << "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)" + to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(src)) O.show_message("The [src] begins to shake violently!", 1) @@ -166,7 +166,7 @@ locked = 0 welded = 0 update_icon() - usr << "\red You successfully break out!" + to_chat(usr, "\red You successfully break out!") for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 6a5bf87680e..a315e598819 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -67,7 +67,7 @@ if(S.mind) for(var/mob/M in contents) S.mind.transfer_to(M) - M << "As the animating magic wears off you feel yourself coming back to your senses. You are yourself again!" + to_chat(M, "As the animating magic wears off you feel yourself coming back to your senses. You are yourself again!") break qdel(S) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index df48bf96d7c..e91df4762df 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -85,7 +85,7 @@ var/obj/item/weapon/rcs/E = W if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.player_levels)) - user << "The rapid-crate-sender can't locate any telepads!" + to_chat(user, "The rapid-crate-sender can't locate any telepads!") return if(E.mode == 0) if(!E.teleporting) @@ -103,7 +103,7 @@ var/desc = input("Please select a telepad.", "RCS") in L E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -114,14 +114,14 @@ s.start() do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") return else E.rand_x = rand(50,200) E.rand_y = rand(50,200) var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -132,17 +132,17 @@ s.start() do_teleport(src, L) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") return else - user << "Out of charges." + to_chat(user, "Out of charges.") return if(opened) if(isrobot(user)) return if(!user.drop_item()) //couldn't drop the item - user << "\The [W] is stuck to your hand, you cannot put it in \the [src]!" + to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") return if(W) W.forceMove(loc) @@ -150,22 +150,22 @@ return else if(istype(W, /obj/item/stack/cable_coil)) if(rigged) - user << "[src] is already rigged!" + to_chat(user, "[src] is already rigged!") return - user << "You rig [src]." + to_chat(user, "You rig [src].") user.drop_item() qdel(W) rigged = 1 return else if(istype(W, /obj/item/device/radio/electropack)) if(rigged) - user << "You attach [W] to [src]." + to_chat(user, "You attach [W] to [src].") user.drop_item() W.forceMove(src) return else if(istype(W, /obj/item/weapon/wirecutters)) if(rigged) - user << "You cut away the wiring." + to_chat(user, "You cut away the wiring.") playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) rigged = 0 return @@ -193,7 +193,7 @@ /obj/structure/closet/crate/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -253,19 +253,19 @@ /obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) if(src.opened) - user << "Close the crate first." + to_chat(user, "Close the crate first.") return if(src.broken) - user << "The crate appears to be broken." + to_chat(user, "The crate appears to be broken.") return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) - O << "The crate has been [locked ? null : "un"]locked by [user]." + to_chat(O, "The crate has been [locked ? null : "un"]locked by [user].") update_icon() else - user << "Access Denied" + to_chat(user, "Access Denied") /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance @@ -279,11 +279,11 @@ src.add_fingerprint(usr) src.togglelock(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") /obj/structure/closet/crate/secure/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -316,7 +316,7 @@ src.locked = 0 src.broken = 1 update_icon() - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") return /obj/structure/closet/crate/secure/emp_act(severity) diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index b3f9dac3d04..6badf7a6535 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -35,7 +35,7 @@ src.add_fingerprint(user) if(src.loc == user.loc) - user << "It won't budge!" + to_chat(user, "It won't budge!") toggle() else toggle() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 3166c61eb31..4f5eecd0f23 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -18,7 +18,7 @@ /obj/structure/largecrate/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -27,7 +27,7 @@ update_icon() return else - user << "You need a crowbar to pry this open!" + to_chat(user, "You need a crowbar to pry this open!") return /obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 03a81a7ca5b..d07ee623d38 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -30,10 +30,10 @@ if (istype(user, /mob/living/silicon/ai)) //Added by Strumpetplaya - AI shouldn't be able to return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc) if(!amount) - usr << "
" @@ -65,7 +65,7 @@ add_fingerprint(usr) P.attackby(usr.l_hand, usr) else - usr << "You'll need something to write with!" + to_chat(usr, "You'll need something to write with!") if(href_list["read"]) var/obj/item/weapon/paper/P = locate(href_list["read"]) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index c95f3aa2b09..ec2ebc8848a 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -42,9 +42,9 @@ FLOOR SAFES /obj/structure/safe/proc/check_unlocked(mob/user, canhear) if(user && canhear) if(tumbler_1_pos == tumbler_1_open) - user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]." + to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from [src].") if(tumbler_2_pos == tumbler_2_open) - user << "You hear a [pick("tink", "krink", "plink")] from [src]." + to_chat(user, "You hear a [pick("tink", "krink", "plink")] from [src].") if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open) if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") return 1 @@ -95,13 +95,13 @@ FLOOR SAFES if(href_list["open"]) if(check_unlocked()) - user << "You [open ? "close" : "open"] [src]." + to_chat(user, "You [open ? "close" : "open"] [src].") open = !open update_icon() updateUsrDialog() return else - user << "You can't [open ? "close" : "open"] [src], the lock is engaged!" + to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!") return if(href_list["decrement"]) @@ -109,11 +109,11 @@ FLOOR SAFES if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71) tumbler_1_pos = decrement(tumbler_1_pos) if(canhear) - user << "You hear a [pick("clack", "scrape", "clank")] from [src]." + to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from [src].") if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35) tumbler_2_pos = decrement(tumbler_2_pos) if(canhear) - user << "You hear a [pick("click", "chink", "clink")] from [src]." + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") check_unlocked(user, canhear) updateUsrDialog() return @@ -123,11 +123,11 @@ FLOOR SAFES if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71) tumbler_1_pos = increment(tumbler_1_pos) if(canhear) - user << "You hear a [pick("clack", "scrape", "clank")] from [src]." + to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from [src].") if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35) tumbler_2_pos = increment(tumbler_2_pos) if(canhear) - user << "You hear a [pick("click", "chink", "clink")] from [src]." + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") check_unlocked(user, canhear) updateUsrDialog() return @@ -147,18 +147,18 @@ FLOOR SAFES if(I.w_class + space <= maxspace) space += I.w_class if(!user.drop_item()) - user << "\The [I] is stuck to your hand, you cannot put it in the safe!" + to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") return I.loc = src - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") updateUsrDialog() return else - user << "[I] won't fit in [src]." + to_chat(user, "[I] won't fit in [src].") return else if(istype(I, /obj/item/clothing/accessory/stethoscope)) - user << "Hold [I] in one of your hands while you manipulate the dial!" + to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") return diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 7e35851f693..24ea6b5a358 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -25,7 +25,7 @@ /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) - user << "You unfasten the sign with your [tool]." + to_chat(user, "You unfasten the sign with your [tool].") var/obj/item/sign/S = new(src.loc) S.name = name S.desc = desc @@ -61,7 +61,7 @@ S.name = name S.desc = desc S.icon_state = sign_state - user << "You fasten \the [S] with your [tool]." + to_chat(user, "You fasten \the [S] with your [tool].") qdel(src) else ..() diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index f4ba32b3286..cb29dec1926 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -15,11 +15,11 @@ if(O.client) var/area/A = get_area(src) if(A) - O << "\blue Someone has begun playing with a [src.name] in [A.name]!. (Teleport)" + to_chat(O, "\blue Someone has begun playing with a [src.name] in [A.name]!. (Teleport)") /obj/structure/spirit_board/examine(mob/user) ..(user) - user << "[initial(desc)] The planchette is sitting at \"[planchette]\"." + to_chat(user, "[initial(desc)] The planchette is sitting at \"[planchette]\".") /obj/structure/spirit_board/attack_hand(mob/user as mob) if(..()) @@ -69,7 +69,7 @@ light_amount = 10 if(light_amount > 2) - M << "It's too bright here to use [src.name]!" + to_chat(M, "It's too bright here to use [src.name]!") return 0 //mobs in range check @@ -77,12 +77,12 @@ for(var/mob/living/L in orange(1,src)) if(L.ckey && L.client) if((world.time - L.client.inactivity) < (world.time - 300) || L.stat != CONSCIOUS || L.restrained())//no playing with braindeads or corpses or handcuffed dudes. - M << "[L] doesn't seem to be paying attention..." + to_chat(M, "[L] doesn't seem to be paying attention...") else users_in_range++ if(users_in_range < 2) - M << "There aren't enough people to use the [src.name]!" + to_chat(M, "There aren't enough people to use the [src.name]!") return 0 return 1 \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 2c81fd09af3..3f5decad98e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -34,7 +34,7 @@ "You hear squelching...") if(!do_after(M, 1200, target = src)) if(M && M.buckled) - M << "You fail to escape \the [src]!" + to_chat(M, "You fail to escape \the [src]!") return if(!M.buckled) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 671381f952d..ecf2324673d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -118,10 +118,10 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) - user << " The rack is empty." + to_chat(user, " The rack is empty.") return - user << "You deploy the roller bed." + to_chat(user, "You deploy the roller bed.") var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) R.add_fingerprint(user) qdel(held) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 2b5b1bd3ecb..621f3a9d78e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -21,7 +21,7 @@ if(istype(W, /obj/item/assembly/shock_kit)) var/obj/item/assembly/shock_kit/SK = W if(!SK.status) - user << "[SK] is not ready to be attached!" + to_chat(user, "[SK] is not ready to be attached!") return user.drop_item() var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 6a921a014a3..ad478bb3893 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -140,6 +140,12 @@ return 1 return 0 +/obj/structure/table/CanAStarPass(ID, dir, caller) + . = !density + if(ismovableatom(caller)) + var/atom/movable/mover = caller + . = . || mover.checkpass(PASSTABLE) + //checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops. /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from) var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc)) @@ -193,10 +199,10 @@ if(get_dist(src, user) < 2) var/obj/item/weapon/grab/G = I if(G.affecting.buckled) - user << "[G.affecting] is buckled to [G.affecting.buckled]!" + to_chat(user, "[G.affecting] is buckled to [G.affecting.buckled]!") return 0 if(G.state < GRAB_AGGRESSIVE) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") return 0 if(!G.confirm()) return 0 @@ -215,7 +221,7 @@ return if (istype(W, /obj/item/weapon/wrench)) - user << "\blue Now disassembling table" + to_chat(user, "\blue Now disassembling table") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) destroy() @@ -273,7 +279,7 @@ return if(!flip(get_cardinal_dir(usr,src))) - usr << "It won't budge." + to_chat(usr, "It won't budge.") return usr.visible_message("[usr] flips \the [src]!") @@ -290,7 +296,7 @@ set src in oview(1) if (!unflip()) - usr << "It won't budge." + to_chat(usr, "It won't budge.") return @@ -377,7 +383,7 @@ return if (istype(I, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the wooden table" + to_chat(user, "\blue Now disassembling the wooden table") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -428,7 +434,7 @@ return if (istype(W, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the wooden table" + to_chat(user, "\blue Now disassembling the wooden table") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -476,23 +482,23 @@ if(istype(I, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = I if(G.amount >= 2) - user << "You start to add the glass to \the [src]." + to_chat(user, "You start to add the glass to \the [src].") if(do_after(user, 10, target = src)) G.use(2) - user << "You add the glass to \the [src]." + to_chat(user, "You add the glass to \the [src].") playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/table/glass(loc) qdel(src) else - user << "You don't have enough glass! You need at least 2 sheets." + to_chat(user, "You don't have enough glass! You need at least 2 sheets.") return if(iswrench(I)) - user << "You start to deconstruct \the [src]." + to_chat(user, "You start to deconstruct \the [src].") playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) if(do_after(user, 10, target = src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) - user << "You dismantle \the [src]." + to_chat(user, "You dismantle \the [src].") new /obj/item/stack/sheet/metal(loc) new /obj/item/stack/sheet/metal(loc) qdel(src) @@ -527,7 +533,7 @@ return if (istype(I, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the glass table" + to_chat(user, "\blue Now disassembling the glass table") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/glass( src.loc ) @@ -589,18 +595,18 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) if(src.status == 2) - user << "\blue Now weakening the reinforced table" + to_chat(user, "\blue Now weakening the reinforced table") playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return - user << "\blue Table weakened" + to_chat(user, "\blue Table weakened") src.status = 1 else - user << "\blue Now strengthening the reinforced table" + to_chat(user, "\blue Now strengthening the reinforced table") playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return - user << "\blue Table strengthened" + to_chat(user, "\blue Table strengthened") src.status = 2 return return @@ -661,6 +667,12 @@ else return 0 +/obj/structure/rack/CanAStarPass(ID, dir, caller) + . = !density + if(ismovableatom(caller)) + var/atom/movable/mover = caller + . = . || mover.checkpass(PASSTABLE) + /obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob) if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O)) return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3d8b13ff08b..ab1c2830933 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -49,9 +49,9 @@ I.loc = src oxytanks.Add(I) oxygentanks++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") else - user << "[src] is full." + to_chat(user, "[src] is full.") updateUsrDialog() return if(istype(I, /obj/item/weapon/tank/plasma)) @@ -60,17 +60,17 @@ I.loc = src platanks.Add(I) plasmatanks++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") else - user << "[src] is full." + to_chat(user, "[src] is full.") updateUsrDialog() return if(istype(I, /obj/item/weapon/wrench)) if(anchored) - user << "You lean down and unwrench [src]." + to_chat(user, "You lean down and unwrench [src].") anchored = 0 else - user << "You wrench [src] into place." + to_chat(user, "You wrench [src] into place.") anchored = 1 return @@ -88,7 +88,7 @@ else O = new /obj/item/weapon/tank/oxygen(loc) O.loc = loc - usr << "You take [O] out of [src]." + to_chat(usr, "You take [O] out of [src].") oxygentanks-- update_icon() if(href_list["plasma"]) @@ -100,7 +100,7 @@ else P = new /obj/item/weapon/tank/plasma(loc) P.loc = loc - usr << "You take [P] out of [src]." + to_chat(usr, "You take [P] out of [src].") plasmatanks-- update_icon() add_fingerprint(usr) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index bb7ab804d9c..504b2abfa80 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -30,7 +30,7 @@ W.loc = loc W.layer = 3.1 pinned_target = W - user << "You slide the target into the stake." + to_chat(user, "You slide the target into the stake.") return attack_hand(mob/user as mob) @@ -44,9 +44,9 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(pinned_target) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") else pinned_target.loc = get_turf(user) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") pinned_target = null \ No newline at end of file diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 48cc9feccf7..93ad848c4f6 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -36,7 +36,7 @@ if(!pod_moving && icon_state == "open" && istype(AM, /mob/living) && !is_type_in_list(AM, disallowed_mobs)) for(var/obj/structure/transit_tube_pod/pod in loc) if(pod.contents.len) - AM << "" + to_chat(AM, "") return else if(!pod.moving && pod.dir in directions()) AM.forceMove(pod) diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 5a0b7df79a3..c7926870ccf 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -244,7 +244,7 @@ obj/structure/transit_tube/ex_act(severity) if(text in direction_table) return direction_table[text] - var/list/split_text = text2list(text, "-") + var/list/split_text = splittext(text, "-") // If the first token is D, the icon_state represents // a purely decorative tube, and doesn't actually diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b322a84de5b..3fcfc0ef4bf 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -28,7 +28,7 @@ if(cistern && !open) if(!contents.len) - user << "The cistern is empty." + to_chat(user, "The cistern is empty.") return else var/obj/item/I = pick(contents) @@ -36,7 +36,7 @@ user.put_in_hands(I) else I.loc = get_turf(src) - user << "You find [I] in the cistern." + to_chat(user, "You find [I] in the cistern.") w_items -= I.w_class return @@ -50,7 +50,7 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/crowbar)) - user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]..." + to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...") playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30, target = src)) user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") @@ -64,7 +64,7 @@ var/obj/item/weapon/reagent_containers/RG = I if(RG.is_open_container()) RG.reagents.add_reagent("toiletwater", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - user << "You fill [RG] from [src]. Gross." + to_chat(user, "You fill [RG] from [src]. Gross.") return if(istype(I, /obj/item/weapon/grab)) @@ -76,7 +76,7 @@ var/mob/living/GM = G.affecting if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - user << "[GM] needs to be on [src]!" + to_chat(user, "[GM] needs to be on [src]!") return if(!swirlie) if(open) @@ -96,21 +96,21 @@ GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!") GM.adjustBruteLoss(5) else - user << "You need a tighter grip!" + to_chat(user, "You need a tighter grip!") if(cistern) if(I.w_class > 3) - user << "[I] does not fit!" + to_chat(user, "[I] does not fit!") return if(w_items + I.w_class > 5) - user << "The cistern is full!" + to_chat(user, "The cistern is full!") return if(!user.drop_item()) - user << "\The [I] is stuck to your hand, you cannot put it in the cistern!" + to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the cistern!") return I.loc = src w_items += I.w_class - user << "You carefully place [I] into the cistern." + to_chat(user, "You carefully place [I] into the cistern.") return @@ -133,14 +133,14 @@ var/mob/living/GM = G.affecting if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - user << "[GM.name] needs to be on [src]." + to_chat(user, "[GM.name] needs to be on [src].") return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!") GM.adjustBruteLoss(8) else - user << "You need a tighter grip!" + to_chat(user, "You need a tighter grip!") /obj/machinery/shower @@ -181,9 +181,9 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) if(I.type == /obj/item/device/analyzer) - user << "The water temperature seems to be [watertemp]." + to_chat(user, "The water temperature seems to be [watertemp].") if(istype(I, /obj/item/weapon/wrench)) - user << "You begin to adjust the temperature valve with the [I]." + to_chat(user, "You begin to adjust the temperature valve with the [I].") if(do_after(user, 50, target = src)) switch(watertemp) if("normal") @@ -252,7 +252,7 @@ var/mob/living/L = O L.ExtinguishMob() L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily - L << "You've been drenched in water!" + to_chat(L, "You've been drenched in water!") if(iscarbon(O)) var/mob/living/carbon/M = O if(M.r_hand) @@ -343,12 +343,12 @@ if(watertemp == "freezing") //C.bodytemperature = max(80, C.bodytemperature - 80) - C << "The water is freezing!" + to_chat(C, "The water is freezing!") return if(watertemp == "boiling") //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) - C << "The water is searing!" + to_chat(C, "The water is searing!") return @@ -385,11 +385,11 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") return if(busy) - user << "Someone's already washing here." + to_chat(user, "Someone's already washing here.") return var/selected_area = parse_zone(user.zone_sel.selecting) var/washing_face = 0 @@ -421,7 +421,7 @@ /obj/structure/sink/attackby(obj/item/O, mob/user, params) if(busy) - user << "Someone's already washing here!" + to_chat(user, "Someone's already washing here!") return if(!(istype(O))) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index e8ad95cbe3b..529dbb447a8 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -82,7 +82,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return - user << "You dissasembled the windoor assembly!" + to_chat(user, "You dissasembled the windoor assembly!") var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5) RG.add_fingerprint(user) if(secure) @@ -96,7 +96,7 @@ obj/structure/windoor_assembly/Destroy() if(istype(W, /obj/item/weapon/wrench) && !anchored) for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") @@ -106,9 +106,9 @@ obj/structure/windoor_assembly/Destroy() return for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") return - user << "You've secured the windoor assembly!" + to_chat(user, "You've secured the windoor assembly!") src.anchored = 1 if(src.secure) src.name = "secure anchored windoor assembly" @@ -123,7 +123,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !src.anchored) return - user << "You've unsecured the windoor assembly!" + to_chat(user, "You've unsecured the windoor assembly!") src.anchored = 0 if(src.secure) src.name = "secure windoor assembly" @@ -134,16 +134,16 @@ obj/structure/windoor_assembly/Destroy() else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure) var/obj/item/stack/sheet/plasteel/P = W if(P.amount < 2) - user << "You need more plasteel to do this." + to_chat(user, "You need more plasteel to do this.") return - user << "You start to reinforce the windoor with plasteel." + to_chat(user, "You start to reinforce the windoor with plasteel.") if(do_after(user,40, target = src)) if(!src || secure) return P.use(2) - user << "You reinforce the windoor." + to_chat(user, "You reinforce the windoor.") src.secure = 1 if(src.anchored) src.name = "secure anchored windoor assembly" @@ -159,7 +159,7 @@ obj/structure/windoor_assembly/Destroy() return var/obj/item/stack/cable_coil/CC = W CC.use(1) - user << "You wire the windoor!" + to_chat(user, "You wire the windoor!") src.state = "02" if(src.secure) src.name = "secure wired windoor assembly" @@ -179,7 +179,7 @@ obj/structure/windoor_assembly/Destroy() if(!src || src.state != "02") return - user << "You cut the windoor wires!" + to_chat(user, "You cut the windoor wires!") new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) @@ -198,7 +198,7 @@ obj/structure/windoor_assembly/Destroy() if(!src || src.electronics) W.loc = src.loc return - user << "You've installed the airlock electronics!" + to_chat(user, "You've installed the airlock electronics!") src.name = "near finished windoor assembly" src.electronics = W else @@ -215,7 +215,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !electronics) return - user << "You've removed the airlock electronics!" + to_chat(user, "You've removed the airlock electronics!") src.name = "wired windoor assembly" var/obj/item/weapon/airlock_electronics/ae ae = electronics @@ -236,7 +236,7 @@ obj/structure/windoor_assembly/Destroy() //Crowbar to complete the assembly, Step 7 complete. else if(istype(W, /obj/item/weapon/crowbar)) if(!src.electronics) - usr << "The assembly is missing electronics." + to_chat(usr, "The assembly is missing electronics.") return usr << browse(null, "window=windoor_access") playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) @@ -247,7 +247,7 @@ obj/structure/windoor_assembly/Destroy() if(src.loc && src.electronics) density = 1 //Shouldn't matter but just incase - user << "You finish the windoor!" + to_chat(user, "You finish the windoor!") if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc) @@ -308,7 +308,7 @@ obj/structure/windoor_assembly/Destroy() if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor; therefore, you can't rotate it!" + to_chat(usr, "It is fastened to the floor; therefore, you can't rotate it!") return 0 //if(src.state != "01") //update_nearby_tiles(need_rebuild=1) //Compel updates before @@ -331,11 +331,11 @@ obj/structure/windoor_assembly/Destroy() return if(src.facing == "l") - usr << "The windoor will now slide to the right." + to_chat(usr, "The windoor will now slide to the right.") src.facing = "r" else src.facing = "l" - usr << "The windoor will now slide to the left." + to_chat(usr, "The windoor will now slide to the left.") update_icon() return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b49d491f1b4..eecfc4ac408 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -97,6 +97,14 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f else return 1 +/obj/structure/window/CanAStarPass(ID, to_dir) + if(!density) + return 1 + if((dir == SOUTHWEST) || (dir == to_dir)) + return 0 + + return 1 + /obj/structure/window/hitby(AM as mob|obj) ..() var/tforce = 0 @@ -202,21 +210,21 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(reinf && state >= 1) state = 3 - state playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.") + to_chat(user, (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.")) else if(reinf && state == 0) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.") + to_chat(user, (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")) else if(!reinf) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") + to_chat(user, (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")) else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) state = 1 - state playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) - user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.") + to_chat(user, (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")) else if(istype(W, /obj/item/weapon/wrench) && !anchored && health > 7) //Disassemble deconstructed window into parts playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) for(var/i=0;i
') WHERE id = [banid]") @@ -250,7 +250,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) if(!value) value = input("Insert the new duration (in minutes) for [pckey]'s ban", "New Duration", "[duration]", null) as null|num if(!isnum(value) || !value) - usr << "Cancelled" + to_chat(usr, "Cancelled") return var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]
'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]") @@ -261,10 +261,10 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) DB_ban_unban_by_id(banid) return else - usr << "Cancelled" + to_chat(usr, "Cancelled") return else - usr << "Cancelled" + to_chat(usr, "Cancelled") return datum/admins/proc/DB_ban_unban_by_id(var/id) @@ -287,11 +287,11 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) ban_number++; if(ban_number == 0) - usr << "\red Database update failed due to a ban id not being present in the database." + to_chat(usr, "\red Database update failed due to a ban id not being present in the database.") return if(ban_number > 1) - usr << "\red Database update failed due to multiple bans having the same ID. Contact the database admin." + to_chat(usr, "\red Database update failed due to multiple bans having the same ID. Contact the database admin.") return if(!src.owner || !istype(src.owner, /client)) @@ -328,7 +328,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + to_chat(usr, "\red Failed to establish database connection") return var/output = "
| - [item.cost] Tickets - | -- LOCKED. - | - + dat += {" ++ [item.cost] Tickets + | + "} dat += {" @@ -202,9 +179,9 @@ td.cost.toomuch { updateUsrDialog() return if(!global_prizes.PlaceOrder(src, itemID)) - usr << "Unable to complete the exchange." + to_chat(usr, "Unable to complete the exchange.") else - usr << "You've successfully purchased the item." + to_chat(usr, "You've successfully purchased the item.") interact(usr) return diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index c577045ca45..d67adf97bcb 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -32,7 +32,6 @@ var/global/datum/prizes/global_prizes = new var/desc = "This shouldn't show up..." var/typepath = /obj/item/toy/prizeball var/cost = 0 - var/tier_unlocked = 0 //minimum tier needed to unlock the ability to select this prize ////////////////////////////////////// // Tier 1 Prizes // @@ -43,84 +42,72 @@ var/global/datum/prizes/global_prizes = new desc = "A thin balloon for throwing liquid at people." typepath = /obj/item/toy/balloon cost = 10 - tier_unlocked = 1 /datum/prize_item/crayons name = "Box of Crayons" desc = "A six-pack of crayons, just like back in kindergarten." typepath = /obj/item/weapon/storage/fancy/crayons cost = 35 - tier_unlocked = 1 /datum/prize_item/snappops name = "Snap-Pops" desc = "A box of exploding snap-pop fireworks." typepath = /obj/item/weapon/storage/box/snappops cost = 20 - tier_unlocked = 1 /datum/prize_item/spinningtoy name = "Spinning Toy" desc = "Looks like an authentic Singularity!" typepath = /obj/item/toy/spinningtoy cost = 15 - tier_unlocked = 1 /datum/prize_item/blinktoy name = "Blink toy" desc = "Blink. Blink. Blink." typepath = /obj/item/toy/blink cost = 15 - tier_unlocked = 1 /datum/prize_item/dice name = "Dice set" desc = "A set of assorted dice." typepath = /obj/item/weapon/storage/box/dice cost = 20 - tier_unlocked = 1 /datum/prize_item/cards name = "Deck of cards" desc = "Anyone fancy a game of 52-card Pickup?" typepath = /obj/item/toy/cards/deck cost = 25 - tier_unlocked = 1 /datum/prize_item/wallet name = "Colored Wallet" desc = "Brightly colored and big enough for standard issue ID cards." typepath = /obj/item/weapon/storage/wallet/color cost = 50 - tier_unlocked = 1 /datum/prize_item/pet_rock name = "pet rock" desc = "A pet of your very own!" typepath = /obj/item/toy/pet_rock cost = 80 - tier_unlocked = 1 /datum/prize_item/foam_darts name = "Pack of Foam Darts" desc = "A refill pack of 10 foam darts." typepath = /obj/item/weapon/storage/box/foam_darts cost = 20 - tier_unlocked = 1 /datum/prize_item/minigibber name = "Minigibber Toy" desc = "A model of the station gibber. Probably shouldn't stick your fingers in it." typepath = /obj/item/toy/minigibber cost = 60 - tier_unlocked = 1 /datum/prize_item/id_sticker name = "Prisoner ID Sticker" desc = "A sticker that can make any ID look like a prisoner ID." typepath = /obj/item/weapon/id_decal/prisoner cost = 50 - tier_unlocked = 1 /datum/prize_item/id_sticker/silver name = "Silver ID Sticker" @@ -142,210 +129,170 @@ var/global/datum/prizes/global_prizes = new desc = "A sticker that can make any ID look like something suspicious..." typepath = /obj/item/weapon/id_decal/emag -////////////////////////////////////// -// Tier 2 Prizes // -////////////////////////////////////// - /datum/prize_item/carp_plushie name = "Random Carp Plushie" desc = "A colorful fish-shaped plush toy." typepath = /obj/item/toy/prizeball/carp_plushie cost = 75 - tier_unlocked = 2 /datum/prize_item/therapy_doll name = "Random Therapy Doll" desc = "A therapeutic doll for relieving stress without being charged with assault." typepath = /obj/item/toy/prizeball/therapy cost = 60 - tier_unlocked = 2 /datum/prize_item/plushie name = "Random Animal Plushie" desc = "A colorful animal-shaped plush toy." typepath = /obj/item/toy/prizeball/plushie cost = 75 - tier_unlocked = 2 /datum/prize_item/mech_toy name = "Random Mecha" desc = "A random mecha figure, collect all 11!" typepath = /obj/item/toy/prizeball/mech cost = 75 - tier_unlocked = 2 /datum/prize_item/action_figure name = "Random Action Figure" desc = "A random action figure, collect them all!" typepath = /obj/item/toy/prizeball/figure cost = 75 - tier_unlocked = 2 /datum/prize_item/eight_ball name = "Magic Eight Ball" desc = "A mystical ball that can divine the future!" typepath = /obj/item/toy/eight_ball cost = 40 - tier_unlocked = 2 /datum/prize_item/tacticool name = "Tacticool Turtleneck" desc = "A cool-looking turtleneck." typepath = /obj/item/clothing/under/syndicate/tacticool cost = 90 - tier_unlocked = 2 /datum/prize_item/crossbow name = "Foam Dart Crossbow" desc = "A toy crossbow that fires foam darts." typepath = /obj/item/toy/crossbow cost = 100 - tier_unlocked = 2 /datum/prize_item/toy_xeno name = "Xeno Action Figure" desc = "A lifelike replica of the horrific xeno scourge." typepath = /obj/item/toy/toy_xeno cost = 80 - tier_unlocked = 2 /datum/prize_item/fakespell name = "Fake Spellbook" desc = "Perform magic! Astound your friends! Get mistaken for an enemy of the corporation!" typepath = /obj/item/weapon/spellbook/oneuse/fake_gib cost = 100 - tier_unlocked = 2 /datum/prize_item/capgun name = "Capgun Revolver" desc = "Do you feel lucky... punk?" typepath = /obj/item/weapon/gun/projectile/revolver/capgun cost = 75 - tier_unlocked = 2 /datum/prize_item/confetti name = "Confetti Grenade" desc = "Party time!" typepath = /obj/item/weapon/grenade/confetti cost = 65 - tier_unlocked = 2 - -////////////////////////////////////// -// Tier 3 Prizes // -////////////////////////////////////// /datum/prize_item/magic_conch name = "Magic Conch Shell" desc = "All hail the magic conch!" typepath = /obj/item/toy/eight_ball/conch cost = 100 - tier_unlocked = 3 /datum/prize_item/flash name = "Toy Flash" desc = "AUGH! MY EYES!" typepath = /obj/item/toy/flash cost = 50 - tier_unlocked = 3 /datum/prize_item/foamblade name = "Foam Armblade" desc = "Perfect for reenacting space horror holo-vids." typepath = /obj/item/toy/foamblade cost = 100 - tier_unlocked = 3 /datum/prize_item/minimeteor name = "Mini-Meteor" desc = "Meteors have been detected on a collision course with your fun times!" typepath = /obj/item/toy/minimeteor cost = 50 - tier_unlocked = 3 /datum/prize_item/redbutton name = "Shiny Red Button" desc = "PRESS IT!" typepath = /obj/item/toy/redbutton cost = 100 - tier_unlocked = 3 /datum/prize_item/owl name = "Owl Action Figure" desc = "Remember: heroes don't grief!" typepath = /obj/item/toy/owl cost = 125 - tier_unlocked = 3 /datum/prize_item/griffin name = "Griffin Action Figure" desc = "If you can't be the best, you can always be the WORST." typepath = /obj/item/toy/griffin cost = 125 - tier_unlocked = 3 /datum/prize_item/AI name = "Toy AI Unit" desc = "Law 1: Maximize fun for crew." typepath = /obj/item/toy/AI cost = 75 - tier_unlocked = 3 /datum/prize_item/tommygun name = "Tommygun" desc = "A replica tommygun that fires foam darts." typepath = /obj/item/toy/crossbow/tommygun cost = 175 - tier_unlocked = 3 /datum/prize_item/esword name = "Toy Energy Sword" desc = "A plastic replica of an energy blade." typepath = /obj/item/toy/sword cost = 150 - tier_unlocked = 3 /datum/prize_item/blobhat name = "Blob Hat" desc = "There's... something... on your head..." typepath = /obj/item/clothing/head/blob cost = 125 - tier_unlocked = 3 /datum/prize_item/nuke name = "Nuclear Fun Device" desc = "Annihilate boredom with an explosion of excitement!" typepath = /obj/item/toy/nuke cost = 100 - tier_unlocked = 3 - -////////////////////////////////////// -// Tier 4 Prizes // -////////////////////////////////////// /datum/prize_item/chainsaw name = "Toy Chainsaw" desc = "A full-scale model chainsaw, based on that massacre in Space Texas." typepath = /obj/item/weapon/twohanded/toy/chainsaw cost = 200 - tier_unlocked = 4 /datum/prize_item/spacesuit name = "Fake Spacesuit" desc = "A replica spacesuit. Not actually spaceworthy." typepath = /obj/item/weapon/storage/box/fakesyndiesuit cost = 180 - tier_unlocked = 4 /datum/prize_item/fakespace name = "Space Carpet" desc = "A stack of carpeted floor tiles that resemble space." typepath = /obj/item/stack/tile/fakespace/loaded cost = 150 - tier_unlocked = 4 /datum/prize_item/bike name = "Awesome Bike!" desc = "WOAH." typepath = /obj/structure/stool/bed/chair/wheelchair/bike - cost = 10000 //max stack + 1 tickets - tier_unlocked = 4 + cost = 10000 //max stack + 1 tickets. diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 485c8756375..9a61921764d 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -114,7 +114,7 @@ attach_assembly(var/obj/item/device/assembly/A, var/mob/user) holder = new/obj/item/device/assembly_holder(get_turf(src)) if(holder.attach(A,src,user)) - user << "\blue You attach \the [A] to \the [src]!" + to_chat(user, "\blue You attach \the [A] to \the [src]!") return 1 return 0 @@ -127,9 +127,9 @@ return if(istype(W, /obj/item/weapon/screwdriver)) if(toggle_secure()) - user << "\blue \The [src] is ready!" + to_chat(user, "\blue \The [src] is ready!") else - user << "\blue \The [src] can now be attached!" + to_chat(user, "\blue \The [src] can now be attached!") return ..() return @@ -144,9 +144,9 @@ ..(user) if((in_range(src, user) || loc == user)) if(secured) - user << "\The [src] is ready!" + to_chat(user, "\The [src] is ready!") else - user << "\The [src] can be attached!" + to_chat(user, "\The [src] can be attached!") attack_self(mob/user as mob) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index dbda18e7b71..3bf0775473c 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -29,7 +29,7 @@ return if(istype(W, /obj/item/weapon/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works. - user << "You disassemble [src]." + to_chat(user, "You disassemble [src].") bombassembly.loc = user.loc bombassembly.master = null @@ -46,11 +46,11 @@ status = 1 bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]") - user << "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited." + to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") else status = 0 bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" - user << "The hole has been closed." + to_chat(user, "The hole has been closed.") add_fingerprint(user) ..() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1d48afde8a5..6333fbca635 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -70,9 +70,9 @@ ..(user) if ((in_range(src, user) || src.loc == user)) if (src.secured) - user << "\The [src] is ready!" + to_chat(user, "\The [src] is ready!") else - user << "\The [src] can be attached!" + to_chat(user, "\The [src] can be attached!") HasProximity(atom/movable/AM as mob|obj) @@ -140,15 +140,15 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/screwdriver)) if(!a_left || !a_right) - user << "\red BUG:Assembly part missing, please report this!" + to_chat(user, "\red BUG:Assembly part missing, please report this!") return a_left.toggle_secure() a_right.toggle_secure() secured = !secured if(secured) - user << "\blue \The [src] is ready!" + to_chat(user, "\blue \The [src] is ready!") else - user << "\blue \The [src] can now be taken apart!" + to_chat(user, "\blue \The [src] can now be taken apart!") update_icon() return else @@ -160,7 +160,7 @@ src.add_fingerprint(user) if(src.secured) if(!a_left || !a_right) - user << "\red Assembly part missing!" + to_chat(user, "\red Assembly part missing!") return if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code switch(alert("Which side would you like to use?",,"Left","Right")) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 75c40dcb8b0..e78060ea63e 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -11,7 +11,7 @@ examine(mob/user) ..(user) if(armed) - user << "It looks like it's armed." + to_chat(user, "It looks like it's armed.") activate() if(..()) @@ -20,7 +20,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/user = usr if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) - user << "Your hand slips, setting off the trigger." + to_chat(user, "Your hand slips, setting off the trigger.") pulse(0) update_icon() if(usr) @@ -68,7 +68,7 @@ attack_self(mob/living/user as mob) if(!armed) - user << "You arm [src]." + to_chat(user, "You arm [src].") else if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) var/which_hand = "l_hand" @@ -78,7 +78,7 @@ user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") return - user << "You disarm [src]." + to_chat(user, "You disarm [src].") armed = !armed update_icon() playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) @@ -142,4 +142,4 @@ return layer = TURF_LAYER+0.2 - usr << "You hide [src]." \ No newline at end of file + to_chat(usr, "You hide [src].") diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index d34dc9e4c76..6c5c9e4e5bb 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -31,7 +31,7 @@ return if(istype(W, /obj/item/weapon/screwdriver)) status = !status - user << "[src] is now [status ? "secured" : "unsecured"]!" + to_chat(user, "[src] is now [status ? "secured" : "unsecured"]!") add_fingerprint(user) return diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index fe33be50f48..d6d6352f333 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -18,149 +18,150 @@ var/datum/radio_frequency/radio_connection var/airlock_wire = null - New() - ..() - if(!radio_controller) - spawn(40) - set_frequency(frequency) - else - spawn(1) // For things that set the frequency directly - set_frequency(frequency) +/obj/item/device/assembly/signaler/New() + ..() + if(radio_controller) + set_frequency(frequency) + +/obj/item/device/assembly/signaler/initialize() + if(radio_controller) + set_frequency(frequency) + +/obj/item/device/assembly/signaler/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + return ..() + +/obj/item/device/assembly/signaler/describe() + return "\The [src]'s power light is [receiving?"on":"off"]" + +/obj/item/device/assembly/signaler/activate() + if(cooldown > 0) return 0 + cooldown = 2 + spawn(10) + process_cooldown() + + signal() + return 1 + +/obj/item/device/assembly/signaler/update_icon() + if(holder) + holder.update_icon() + return + +/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1) + var/t1 = "-------" +// if ((src.b_stat && !( flag1 ))) +// t1 = text("-------
| Left Hand: | [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"] | ||||||||
| Right Hand: | [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"] | ||||||||
| Back: | [(back && !(back.flags&ABSTRACT)) ? back : "Empty"]"
if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank))
dat += " [internal ? "Disable Internals" : "Set Internals"]"
@@ -591,7 +659,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(!(head && head.flags & AIRTIGHT))
no_mask = 1
if(no_mask)
- usr << "[src] is not wearing a suitable mask or helmet!"
+ to_chat(usr, "[src] is not wearing a suitable mask or helmet!")
return
if(do_mob(usr, src, POCKET_STRIP_DELAY))
@@ -605,7 +673,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(!(head && head.flags & AIRTIGHT))
no_mask2 = 1
if(no_mask2)
- usr << "[src] is not wearing a suitable mask or helmet!"
+ to_chat(usr, "[src] is not wearing a suitable mask or helmet!")
return
internal = ITEM
if(internals)
@@ -732,7 +800,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
for(var/t = 0, t<=tilesSlipped, t++)
spawn (t) step(src, src.dir)
stop_pulling()
- src << "You slipped on the [description]!"
+ to_chat(src, "You slipped on the [description]!")
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
if (stun)
Stun(stun)
@@ -763,18 +831,18 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/proc/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness)
if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill))
- src << "You [toEat.apply_method] [toEat]."
+ to_chat(src, "You [toEat.apply_method] [toEat].")
else
if (fullness <= 50)
- src << "You hungrily chew out a piece of [toEat] and gobble it!"
+ to_chat(src, "You hungrily chew out a piece of [toEat] and gobble it!")
else if (fullness > 50 && fullness <= 150)
- src << "You hungrily begin to eat [toEat]."
+ to_chat(src, "You hungrily begin to eat [toEat].")
else if (fullness > 150 && fullness <= 350)
- src << "You take a bite of [toEat]."
+ to_chat(src, "You take a bite of [toEat].")
else if (fullness > 350 && fullness <= 550)
- src << "You unwillingly chew a bit of [toEat]."
+ to_chat(src, "You unwillingly chew a bit of [toEat].")
else if (fullness > (550 * (1 + overeatduration / 2000))) // The more you eat - the more you can eat
- src << "You cannot force any more of [toEat] to go down your throat."
+ to_chat(src, "You cannot force any more of [toEat] to go down your throat.")
return 0
return 1
@@ -821,6 +889,10 @@ so that different stomachs can handle things in different ways VB*/
/mob/living/carbon/get_access()
. = ..()
- var/obj/item/I = get_active_hand()
- if(I)
- . |= I.GetAccess()
+ var/obj/item/RH = get_active_hand()
+ if(RH)
+ . |= RH.GetAccess()
+
+ var/obj/item/LH = get_inactive_hand()
+ if(LH)
+ . |= LH.GetAccess()
diff --git a/code/modules/mob/living/carbon/carbon_defenses.dm b/code/modules/mob/living/carbon/carbon_defenses.dm
index 0f37ff365ba..efebc58ffc1 100644
--- a/code/modules/mob/living/carbon/carbon_defenses.dm
+++ b/code/modules/mob/living/carbon/carbon_defenses.dm
@@ -23,4 +23,17 @@
for(var/datum/surgery/S in surgeries)
if(S.next_step(user, src))
return 1
- ..()
\ No newline at end of file
+ ..()
+
+/mob/living/carbon/attack_hand(mob/living/carbon/human/user)
+ if(!iscarbon(user))
+ return
+
+ for(var/datum/disease/D in viruses)
+ if(D.IsSpreadByTouch())
+ user.ContractDisease(D)
+
+ for(var/datum/disease/D in user.viruses)
+ if(D.IsSpreadByTouch())
+ ContractDisease(D)
+ return 0
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 033e8ddfb1c..07a6a0d28cd 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -4,7 +4,6 @@
var/list/stomach_contents = list()
var/list/internal_organs = list()
var/brain_op_stage = 0.0
- var/list/datum/disease2/disease/virus2 = list()
var/antibodies = 0
var/last_eating = 0 //Not sure what this does... I found it hidden in food.dm
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index 796f2997cc4..13e8fe153ea 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -3,16 +3,17 @@
set name = "Give"
if(!iscarbon(target)) //something is bypassing the give arguments, no clue what, adding a sanity check JIC
- usr << "Wait a second... \the [target] HAS NO HANDS! AHH!" //cheesy messages ftw
+ to_chat(usr, "Wait a second... \the [target] HAS NO HANDS! AHH!")//cheesy messages ftw
+
return
if(target.stat == 2 || usr.stat == 2|| target.client == null)
return
var/obj/item/I
if(!usr.hand && usr.r_hand == null)
- usr << " You don't have anything in your right hand to give to [target.name]"
+ to_chat(usr, " You don't have anything in your right hand to give to [target.name]")
return
if(usr.hand && usr.l_hand == null)
- usr << " You don't have anything in your left hand to give to [target.name]"
+ to_chat(usr, " You don't have anything in your left hand to give to [target.name]")
return
if(usr.hand)
I = usr.l_hand
@@ -21,7 +22,7 @@
if(!I)
return
if((I.flags & NODROP) || (I.flags & ABSTRACT))
- usr << "That's not exactly something you can give."
+ to_chat(usr, "That's not exactly something you can give.")
return
if(target.r_hand == null || target.l_hand == null)
switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No"))
@@ -29,16 +30,16 @@
if(!I)
return
if(!Adjacent(usr))
- usr << " You need to stay in reaching distance while giving an object."
- target << " [usr.name] moved too far away."
+ to_chat(usr, " You need to stay in reaching distance while giving an object.")
+ to_chat(target, " [usr.name] moved too far away.")
return
if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
- usr << " You need to keep the item in your active hand."
- target << " [usr.name] seem to have given up on giving \the [I.name] to you."
+ to_chat(usr, " You need to keep the item in your active hand.")
+ to_chat(target, " [usr.name] seem to have given up on giving \the [I.name] to you.")
return
if(target.r_hand != null && target.l_hand != null)
- target << " Your hands are full."
- usr << " Their hands are full."
+ to_chat(target, " Your hands are full.")
+ to_chat(usr, " Their hands are full.")
return
else
usr.drop_item()
@@ -57,4 +58,4 @@
if("No")
target.visible_message(" [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.")
else
- usr << " [target.name]'s hands are full."
\ No newline at end of file
+ to_chat(usr, " [target.name]'s hands are full.")
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 589331a7c01..aa31c912841 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -129,7 +129,6 @@
if(!gibbed)
update_canmove()
- if(client) blind.layer = 0
timeofdeath = worldtime2text()
med_hud_set_health()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 1e209c874cd..657d40983de 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -753,7 +753,7 @@
right_hand_good = 1
if (!left_hand_good && !right_hand_good)
- usr << "You need at least one hand in good working order to snap your fingers."
+ to_chat(usr, "You need at least one hand in good working order to snap your fingers.")
return
message = "[src] snaps \his fingers."
@@ -769,8 +769,8 @@
return
// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
- viewers(src) << "[src] farts on the Bible!"
- viewers(src) << "A mysterious force smites [src]!"
+ to_chat(viewers(src), "[src] farts on the Bible!")
+ to_chat(viewers(src), "A mysterious force smites [src]!")
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -789,8 +789,6 @@
for(var/mob/M in range(location,aoe_range))
if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
continue
- if(!airborne_can_reach(location,M,aoe_range))
- continue
// Now, we don't have this:
//new /obj/effects/fart_cloud(T,L)
// But:
@@ -812,10 +810,10 @@
emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob"
else if(species.name == "Slime People")
emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob"
- src << emotelist
+ to_chat(src, emotelist)
else
- src << "\blue Unusable emote '[act]'. Say *help for a list."
+ to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 57261782385..1eb906d5ec1 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -215,9 +215,9 @@
spawn(15)
if(distance <= 1 && user.stat != 1)
if(pulse == PULSE_NONE)
- user << "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]..."
+ to_chat(user, "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...")
else
- user << "[t_He] has a pulse!"
+ to_chat(user, "[t_He] has a pulse!")
msg += ""
if(fire_stacks > 0)
@@ -484,7 +484,7 @@
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\n[t_He] is [pose]"
- user << msg
+ to_chat(user, msg)
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M as mob, hudtype)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ad27272cd94..5d27605b13c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -161,9 +161,6 @@
if(ismob(AM))
var/mob/tmob = AM
- if(iscarbon(tmob) && prob(10))
- spread_disease_to(tmob, "Contact")
-
//BubbleWrap - Should stop you pushing a restrained person out of the way
//i still don't get it, is this supposed to be 'bubblewrapping' or was it made by a guy named 'BubbleWrap'
if(ishuman(tmob))
@@ -171,7 +168,7 @@
if(tmob.pinned.len || (M.pulling == tmob && (tmob.restrained() && !M.restrained()) && M.stat == CONSCIOUS))
if(!(world.time % 5)) //tmob is pinned to wall, or is restrained and pulled by a concious unrestrained human
- src << "[tmob] is restrained, you cannot push past."
+ to_chat(src, "[tmob] is restrained, you cannot push past.")
now_pushing = 0
return 0
@@ -182,7 +179,7 @@
if(tmob.pulling == M && (M.restrained() && !tmob.restrained()) && tmob.stat == CONSCIOUS)
if(!(world.time % 5))
- src << "[tmob] is restraining [M], you cannot push past."
+ to_chat(src, "[tmob] is restraining [M], you cannot push past.")
now_pushing = 0
return 0
@@ -208,7 +205,7 @@
if(ishuman(tmob) && (FAT in tmob.mutations))
if(prob(40) && !(FAT in src.mutations))
- src << "You fail to push [tmob]'s fat ass out of the way."
+ to_chat(src, "You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
@@ -636,10 +633,6 @@
// called when something steps onto a human
// this handles mulebots and vehicles
/mob/living/carbon/human/Crossed(var/atom/movable/AM)
- if(istype(AM, /obj/machinery/bot/mulebot))
- var/obj/machinery/bot/mulebot/MB = AM
- MB.RunOver(src)
-
if(istype(AM, /obj/vehicle))
var/obj/vehicle/V = AM
V.RunOver(src)
@@ -762,7 +755,7 @@
if(shock_damage * siemens_coeff >= 1 && prob(25))
heart_attack = 0
if(stat == CONSCIOUS)
- src << "You feel your heart beating again!"
+ to_chat(src, "You feel your heart beating again!")
. = ..()
@@ -778,7 +771,7 @@
if(href_list["item"])
var/slot = text2num(href_list["item"])
if(slot in check_obscured_slots())
- usr << "You can't reach that! Something is covering it."
+ to_chat(usr, "You can't reach that! Something is covering it.")
return
if(href_list["pockets"])
@@ -790,10 +783,10 @@
var/delay_denominator = 1
if(pocket_item && !(pocket_item.flags&ABSTRACT))
if(pocket_item.flags & NODROP)
- usr << "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!"
- usr << "You try to empty [src]'s [pocket_side] pocket."
+ to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
+ to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
else if(place_item && place_item.mob_can_equip(src, pocket_id, 1) && !(place_item.flags&ABSTRACT))
- usr << "You try to place [place_item] into [src]'s [pocket_side] pocket."
+ to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.")
delay_denominator = 4
else
return
@@ -815,7 +808,7 @@
else
// Display a warning if the user mocks up if they don't have pickpocket gloves.
if(!thief_mode)
- src << "You feel your [pocket_side] pocket being fumbled with!"
+ to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
if(href_list["set_sensor"])
if(istype(w_uniform, /obj/item/clothing/under))
@@ -875,7 +868,7 @@
sec_hud_set_security_status()
if(!modified)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecord"])
if(hasHUD(usr,"security"))
@@ -895,17 +888,17 @@
for (var/datum/data/record/R in data_core.security)
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"security"))
- usr << "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]"
- usr << "Minor Crimes: [R.fields["mi_crim"]]"
- usr << "Details: [R.fields["mi_crim_d"]]"
- usr << "Major Crimes: [R.fields["ma_crim"]]"
- usr << "Details: [R.fields["ma_crim_d"]]"
- usr << "Notes: [R.fields["notes"]]"
- usr << "\[View Comment Log\]"
+ to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]")
+ to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]")
+ to_chat(usr, "Details: [R.fields["mi_crim_d"]]")
+ to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]")
+ to_chat(usr, "Details: [R.fields["ma_crim_d"]]")
+ to_chat(usr, "Notes: [R.fields["notes"]]")
+ to_chat(usr, "\[View Comment Log\]")
read = 1
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecordComment"])
if(hasHUD(usr,"security"))
@@ -928,14 +921,14 @@
read = 1
var/counter = 1
while(R.fields[text("com_[]", counter)])
- usr << text("[]", R.fields[text("com_[]", counter)])
+ to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
counter++
if (counter == 1)
- usr << "No comment found"
- usr << "\[Add comment\]"
+ to_chat(usr, "No comment found")
+ to_chat(usr, "\[Add comment\]")
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecordadd"])
if(hasHUD(usr,"security"))
@@ -1005,7 +998,7 @@
sec_hud_set_security_status()
if(!modified)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecord"])
if(hasHUD(usr,"medical"))
@@ -1025,18 +1018,18 @@
for (var/datum/data/record/R in data_core.medical)
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"medical"))
- usr << "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]"
- usr << "DNA: [R.fields["b_dna"]]"
- usr << "Minor Disabilities: [R.fields["mi_dis"]]"
- usr << "Details: [R.fields["mi_dis_d"]]"
- usr << "Major Disabilities: [R.fields["ma_dis"]]"
- usr << "Details: [R.fields["ma_dis_d"]]"
- usr << "Notes: [R.fields["notes"]]"
- usr << "\[View Comment Log\]"
+ to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]")
+ to_chat(usr, "DNA: [R.fields["b_dna"]]")
+ to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]")
+ to_chat(usr, "Details: [R.fields["mi_dis_d"]]")
+ to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]")
+ to_chat(usr, "Details: [R.fields["ma_dis_d"]]")
+ to_chat(usr, "Notes: [R.fields["notes"]]")
+ to_chat(usr, "\[View Comment Log\]")
read = 1
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecordComment"])
if(hasHUD(usr,"medical"))
@@ -1059,14 +1052,14 @@
read = 1
var/counter = 1
while(R.fields[text("com_[]", counter)])
- usr << text("[]", R.fields[text("com_[]", counter)])
+ to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
counter++
if (counter == 1)
- usr << "No comment found"
- usr << "\[Add comment\]"
+ to_chat(usr, "No comment found")
+ to_chat(usr, "\[Add comment\]")
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecordadd"])
if(hasHUD(usr,"medical"))
@@ -1107,24 +1100,32 @@
. = ..()
-///eyecheck()
+///check_eye_prot()
///Returns a number between -1 to 2
-/mob/living/carbon/human/eyecheck()
+/mob/living/carbon/human/check_eye_prot()
var/number = ..()
- if(istype(src.head, /obj/item/clothing/head)) //are they wearing something on their head
- var/obj/item/clothing/head/HFP = src.head //if yes gets the flash protection value from that item
+ if(istype(head, /obj/item/clothing/head)) //are they wearing something on their head
+ var/obj/item/clothing/head/HFP = head //if yes gets the flash protection value from that item
number += HFP.flash_protect
- if(istype(src.glasses, /obj/item/clothing/glasses)) //glasses
- var/obj/item/clothing/glasses/GFP = src.glasses
+ if(istype(glasses, /obj/item/clothing/glasses)) //glasses
+ var/obj/item/clothing/glasses/GFP = glasses
number += GFP.flash_protect
- if(istype(src.wear_mask, /obj/item/clothing/mask)) //mask
- var/obj/item/clothing/mask/MFP = src.wear_mask
+ if(istype(wear_mask, /obj/item/clothing/mask)) //mask
+ var/obj/item/clothing/mask/MFP = wear_mask
number += MFP.flash_protect
- for(var/obj/item/organ/internal/cyberimp/eyes/EFP in src.internal_organs)
+ for(var/obj/item/organ/internal/cyberimp/eyes/EFP in internal_organs)
number += EFP.flash_protect
return number
+/mob/living/carbon/human/check_ear_prot()
+ if(head && (head.flags & HEADBANGPROTECT))
+ return 1
+ if(l_ear && (l_ear.flags & EARBANGPROTECT))
+ return 1
+ if(r_ear && (r_ear.flags & EARBANGPROTECT))
+ return 1
+
///tintcheck()
///Checks eye covering items for visually impairing tinting, such as welding masks
///Checked in life.dm. 0 & 1 = no impairment, 2 = welding mask overlay, 3 = You can see jack, but you can't see shit.
@@ -1212,7 +1213,7 @@
if(!. && error_msg && user)
if(!fail_msg)
fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into."
- user << "[fail_msg]"
+ to_chat(user, "[fail_msg]")
/mob/living/carbon/human/proc/check_obscured_slots()
var/list/obscured = list()
@@ -1246,44 +1247,6 @@
return 0
return 1
-/mob/living/carbon/human/proc/vomit(hairball=0)
- if(stat==DEAD)return
-
- if(!check_has_mouth())
- return
-
- if(!lastpuke)
- lastpuke = 1
- src << " [client.prefs.metadata]" + to_chat(usr, "[src]'s Metainfo: [client.prefs.metadata]") else - usr << "[src] does not have any stored infomation!" + to_chat(usr, "[src] does not have any stored infomation!") else - usr << "OOC Metadata is not supported by this server!" + to_chat(usr, "OOC Metadata is not supported by this server!") return @@ -482,11 +484,10 @@ var/atom/movable/t = M.pulling M.stop_pulling() - //this is the gay blood on floor shit -- Added back -- Skie if (M.lying && (prob(M.getBruteLoss() / 6))) var/turf/location = M.loc if (istype(location, /turf/simulated)) - location.add_blood() + location.add_blood(M) pulling.Move(T, get_dir(pulling, T)) if(M) M.start_pulling(t) @@ -568,8 +569,8 @@ var/mob/living/simple_animal/borer/B = src.loc var/mob/living/captive_brain/H = src - H << "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds)." - B.host << "\red You feel the captive mind of [src] begin to resist your control." + to_chat(H, "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") + to_chat(B.host, "\red You feel the captive mind of [src] begin to resist your control.") spawn(rand(350,450)+B.host.brainloss) @@ -577,8 +578,8 @@ return B.host.adjustBrainLoss(rand(5,10)) - H << "\red With an immense exertion of will, you regain control of your body!" - B.host << "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you." + to_chat(H, "\red With an immense exertion of will, you regain control of your body!") + to_chat(B.host, "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") B.detatch() @@ -631,7 +632,7 @@ C.changeNext_move(CLICK_CD_BREAKOUT) C.last_special = world.time + CLICK_CD_BREAKOUT - C << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)" + to_chat(C, "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still) " d += "
|