Objective #[obj_count]: [explanation]" - world << text + to_chat(world, text) ..() return 1 @@ -277,4 +277,4 @@ text += "
" - world << text + to_chat(world, text) diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 2f5cd44f5b..3a70735e1e 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -24,22 +24,17 @@ return if(!ishuman(user)) user.say("O bidai nabora se[pick("'","`")]sma!") - else - user.whisper("O bidai nabora se[pick("'","`")]sma!") - sleep(10) - if(!user) - return - if(!ishuman(user)) user.say(html_decode(message)) else + user.whisper("O bidai nabora se[pick("'","`")]sma!") user.whisper(html_decode(message)) var/my_message = "[(ishuman(user) ? "Acolyte" : "Construct")] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]" for(var/mob/M in mob_list) if(iscultist(M)) - M << my_message + to_chat(M, my_message) else if(M in dead_mob_list) var/link = FOLLOW_LINK(M, user) - M << "[link] [my_message]" + to_chat(M, "[link] [my_message]") log_say("[user.real_name]/[user.key] : [message]") diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 04a0d618c1..6914ad760c 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -30,12 +30,12 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" + to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, "An overwhelming sense of nausea overpowers you!") user.Dizzy(120) else - user << "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"" - user << "A horrible force yanks at your arm!" + to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") + to_chat(user, "A horrible force yanks at your arm!") user.emote("scream") user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) user.dropItemToGround(src) @@ -177,14 +177,14 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" + to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, "An overwhelming sense of nausea overpowers you!") user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) else - user << "\"Trying to use things you don't own is bad, you know.\"" - user << "The armor squeezes at your body!" + to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") + to_chat(user, "The armor squeezes at your body!") user.emote("scream") user.adjustBruteLoss(25) user.dropItemToGround(src, TRUE) @@ -229,14 +229,14 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" + to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, "An overwhelming sense of nausea overpowers you!") user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) else - user << "\"Trying to use things you don't own is bad, you know.\"" - user << "The robes squeeze at your body!" + to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") + to_chat(user, "The robes squeeze at your body!") user.emote("scream") user.adjustBruteLoss(25) user.dropItemToGround(src, TRUE) @@ -252,7 +252,7 @@ /obj/item/clothing/glasses/night/cultblind/equipped(mob/user, slot) ..() if(!iscultist(user)) - user << "\"You want to be blind, do you?\"" + to_chat(user, "\"You want to be blind, do you?\"") user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) @@ -276,16 +276,16 @@ if(!iscultist(user)) user.dropItemToGround(src, TRUE) user.Weaken(5) - user << "A powerful force shoves you away from [src]!" + to_chat(user, "A powerful force shoves you away from [src]!") return if(curselimit > 1) - user << "We have exhausted our ability to curse the shuttle." + to_chat(user, "We have exhausted our ability to curse the shuttle.") return if(SSshuttle.emergency.mode == SHUTTLE_CALL) var/cursetime = 1800 var/timer = SSshuttle.emergency.timeLeft(1) + cursetime SSshuttle.emergency.setTimer(timer) - user << "You shatter the orb! A dark essence spirals into the air, then disappears." + to_chat(user, "You shatter the orb! A dark essence spirals into the air, then disappears.") playsound(user.loc, 'sound/effects/Glassbr1.ogg', 50, 1) qdel(src) sleep(20) @@ -311,9 +311,9 @@ /obj/item/device/cult_shift/examine(mob/user) ..() if(uses) - user << "It has [uses] uses remaining." + to_chat(user, "It has [uses] uses remaining.") else - user << "It seems drained." + to_chat(user, "It seems drained.") /obj/item/device/cult_shift/proc/handle_teleport_grab(turf/T, mob/user) var/mob/living/carbon/C = user @@ -324,12 +324,12 @@ /obj/item/device/cult_shift/attack_self(mob/user) if(!uses || !iscarbon(user)) - user << "\The [src] is dull and unmoving in your hands." + to_chat(user, "\The [src] is dull and unmoving in your hands.") return if(!iscultist(user)) user.dropItemToGround(src, TRUE) step(src, pick(alldirs)) - user << "\The [src] flickers out of your hands, your connection to this dimension is too strong!" + to_chat(user, "\The [src] flickers out of your hands, your connection to this dimension is too strong!") return var/mob/living/carbon/C = user @@ -353,7 +353,7 @@ playsound(destination, "sparks", 50, 1) else - C << "The veil cannot be torn here!" + to_chat(C, "The veil cannot be torn here!") /obj/item/device/flashlight/flare/culttorch name = "void torch" @@ -382,26 +382,26 @@ if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_receive) - user << "You require a destination!" + to_chat(user, "You require a destination!") log_game("Void torch failed - no target") return if(cultist_to_receive.stat == DEAD) - user << "[cultist_to_receive] has died!" + to_chat(user, "[cultist_to_receive] has died!") log_game("Void torch failed - target died") return if(!iscultist(cultist_to_receive)) - user << "[cultist_to_receive] is not a follower of the Geometer!" + to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") log_game("Void torch failed - target was deconverted") return - user << "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!" + to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!") cultist_to_receive.put_in_hands(A) charges-- - user << "\The [src] now has [charges] charge\s." + to_chat(user, "\The [src] now has [charges] charge\s.") if(charges == 0) qdel(src) else ..() - user << "\The [src] can only transport items!" + to_chat(user, "\The [src] can only transport items!") return diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 8d4a484d99..d88d0e9e05 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -8,9 +8,9 @@ /obj/structure/destructible/cult/examine(mob/user) ..() - user << "\The [src] is [anchored ? "":"not "]secured to the floor." + to_chat(user, "\The [src] is [anchored ? "":"not "]secured to the floor.") if((iscultist(user) || isobserver(user)) && cooldowntime > world.time) - user << "The magic in [src] is too weak, [p_they()] will be ready to use again in [getETA()]." + to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [getETA()].") /obj/structure/destructible/cult/examine_status(mob/user) if(iscultist(user) || isobserver(user)) @@ -28,14 +28,14 @@ M.visible_message("[M] repairs \the [src].", \ "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") else - M << "You cannot repair [src], as [p_they()] [p_are()] undamaged!" + to_chat(M, "You cannot repair [src], as [p_they()] [p_are()] undamaged!") else ..() /obj/structure/destructible/cult/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) anchored = !anchored - user << "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor." + to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") if(!anchored) icon_state = "[initial(icon_state)]_off" else @@ -66,13 +66,13 @@ /obj/structure/destructible/cult/talisman/attack_hand(mob/living/user) if(!iscultist(user)) - user << "You're pretty sure you know exactly what this is used for and you can't seem to touch it." + to_chat(user, "You're pretty sure you know exactly what this is used for and you can't seem to touch it.") return if(!anchored) - user << "You need to anchor [src] to the floor with a tome first." + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - user << "The magic in [src] is weak, it will be ready to use again in [getETA()]." + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") var/pickedtype @@ -86,25 +86,26 @@ if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) - user << "You kneel before the altar and your faith is rewarded with an [N]!" + to_chat(user, "You kneel before the altar and your faith is rewarded with an [N]!") /obj/structure/destructible/cult/forge name = "daemon forge" desc = "A forge used in crafting the unholy weapons used by the armies of Nar-Sie." icon_state = "forge" - luminosity = 3 + light_range = 3 + light_color = LIGHT_COLOR_LAVA break_message = "The force breaks apart into shards with a howling scream!" /obj/structure/destructible/cult/forge/attack_hand(mob/living/user) if(!iscultist(user)) - user << "The heat radiating from [src] pushes you back." + to_chat(user, "The heat radiating from [src] pushes you back.") return if(!anchored) - user << "You need to anchor [src] to the floor with a tome first." + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - user << "The magic in [src] is weak, it will be ready to use again in [getETA()]." + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit") var/pickedtype @@ -118,7 +119,7 @@ if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) - user << "You work the forge as dark knowledge guides your hands, creating [N]!" + to_chat(user, "You work the forge as dark knowledge guides your hands, creating [N]!") var/list/blacklisted_pylon_turfs = typecacheof(list( @@ -132,7 +133,8 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( name = "pylon" desc = "A floating crystal that slowly heals those faithful to Nar'Sie." icon_state = "pylon" - luminosity = 5 + light_range = 5 + light_color = LIGHT_COLOR_RED break_sound = 'sound/effects/Glassbr2.ogg' break_message = "The blood-red crystal falls to the floor and shatters!" var/heal_delay = 25 @@ -198,18 +200,19 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( name = "archives" desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl." icon_state = "tomealtar" - luminosity = 1 + light_range = 1.4 + light_color = LIGHT_COLOR_FIRE break_message = "The books and tomes of the archives burn into ash as the desk shatters!" /obj/structure/destructible/cult/tome/attack_hand(mob/living/user) if(!iscultist(user)) - user << "All of these books seem to be gibberish." + to_chat(user, "All of these books seem to be gibberish.") return if(!anchored) - user << "You need to anchor [src] to the floor with a tome first." + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - user << "The magic in [src] is weak, it will be ready to use again in [getETA()]." + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [getETA()].") return var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Walker Set") var/list/pickedtype = list() @@ -225,7 +228,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( cooldowntime = world.time + 2400 for(var/N in pickedtype) var/obj/item/D = new N(get_turf(src)) - user << "You summon [D] from the archives!" + to_chat(user, "You summon [D] from the archives!") /obj/effect/gateway name = "gateway" diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 69a252a48b..e933f951ec 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -24,10 +24,10 @@ This file contains the arcane tome files. /obj/item/weapon/tome/examine(mob/user) ..() if(iscultist(user) || isobserver(user)) - user << "The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar-Sie." - user << "Striking a cult structure will unanchor or reanchor it." - user << "Striking another cultist with it will purge holy water from them." - user << "Striking a noncultist, however, will sear their flesh." + to_chat(user, "The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar-Sie.") + to_chat(user, "Striking a cult structure will unanchor or reanchor it.") + to_chat(user, "Striking another cultist with it will purge holy water from them.") + to_chat(user, "Striking a noncultist, however, will sear their flesh.") /obj/item/weapon/tome/attack(mob/living/M, mob/living/user) if(!istype(M)) @@ -36,7 +36,7 @@ This file contains the arcane tome files. 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]." // fucking ow + 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) @@ -52,7 +52,7 @@ This file contains the arcane tome files. /obj/item/weapon/tome/attack_self(mob/user) if(!iscultist(user)) - user << "[src] seems full of unintelligible shapes, scribbles, and notes. Is this some sort of joke?" + to_chat(user, "[src] seems full of unintelligible shapes, scribbles, and notes. Is this some sort of joke?") return open_tome(user) @@ -199,20 +199,20 @@ This file contains the arcane tome files. if(ticker.mode.name == "cult") var/datum/game_mode/cult/cult_mode = ticker.mode if(!("eldergod" in cult_mode.cult_objectives)) - user << "Nar-Sie does not wish to be summoned!" + to_chat(user, "Nar-Sie does not wish to be summoned!") return if(cult_mode.sacrifice_target && !(cult_mode.sacrifice_target in sacrificed)) - user << "The sacrifice is not complete. The portal would lack the power to open if you tried!" + to_chat(user, "The sacrifice is not complete. The portal would lack the power to open if you tried!") return if(!cult_mode.eldergod) - user << "\"I am already here. There is no need to try to summon me now.\"" + to_chat(user, "\"I am already here. There is no need to try to summon me now.\"") return if((loc.z && loc.z != ZLEVEL_STATION) || !A.blob_allowed) - user << "The Geometer is not interested in lesser locations; the station is the prize!" + to_chat(user, "The Geometer is not interested in lesser locations; the station is the prize!") return var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No") if(confirm_final == "No") - user << "You decide to prepare further before scribing the rune." + to_chat(user, "You decide to prepare further before scribing the rune.") return Turf = get_turf(user) A = get_area(src) @@ -223,7 +223,7 @@ This file contains the arcane tome files. var/obj/structure/emergency_shield/sanguine/N = new(B) shields += N else - user << "Nar-Sie does not wish to be summoned!" + to_chat(user, "Nar-Sie does not wish to be summoned!") return user.visible_message("[user] [user.blood_volume ? "cuts open their arm and begins writing in their own blood":"begins sketching out a strange design"]!", \ "You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.") @@ -244,26 +244,26 @@ This file contains the arcane tome files. if(S && !QDELETED(S)) qdel(S) var/obj/effect/rune/R = new rune_to_scribe(Turf, chosen_keyword) - user << "The [lowertext(R.cultist_name)] rune [R.cultist_desc]" + to_chat(user, "The [lowertext(R.cultist_name)] rune [R.cultist_desc]") feedback_add_details("cult_runes_scribed", R.cultist_name) /obj/item/weapon/tome/proc/check_rune_turf(turf/T, mob/user) var/area/A = get_area(T) if(isspaceturf(T)) - user << "You cannot scribe runes in space!" + to_chat(user, "You cannot scribe runes in space!") return FALSE if(locate(/obj/effect/rune) in T) - user << "There is already a rune here." + to_chat(user, "There is already a rune here.") return FALSE if(T.z != ZLEVEL_STATION && T.z != ZLEVEL_MINING) - user << "The veil is not weak enough here." + to_chat(user, "The veil is not weak enough here.") return FALSE if(istype(A, /area/shuttle)) - user << "Interference from hyperspace engines disrupts the Geometer's power on shuttles." + to_chat(user, "Interference from hyperspace engines disrupts the Geometer's power on shuttles.") return FALSE return TRUE diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 4c064873b8..c612f10a5c 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -48,27 +48,27 @@ To draw a rune, use an arcane tome. /obj/effect/rune/examine(mob/user) ..() if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects - user << "Name: [cultist_name]" - user << "Effects: [capitalize(cultist_desc)]" - user << "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]" + to_chat(user, "Name: [cultist_name]") + to_chat(user, "Effects: [capitalize(cultist_desc)]") + to_chat(user, "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]") if(req_keyword && keyword) - user << "Keyword: [keyword]" + to_chat(user, "Keyword: [keyword]") /obj/effect/rune/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) - user << "You carefully erase the [lowertext(cultist_name)] rune." + to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.") qdel(src) return else if(istype(I, /obj/item/weapon/nullrod)) user.say("BEGONE FOUL MAGIKS!!") - user << "You disrupt the magic of [src] with [I]." + to_chat(user, "You disrupt the magic of [src] with [I].") qdel(src) return return /obj/effect/rune/attack_hand(mob/living/user) if(!iscultist(user)) - user << "You aren't able to understand the words of [src]." + to_chat(user, "You aren't able to understand the words of [src].") return var/list/invokers = can_invoke(user) if(invokers.len >= req_cultists) @@ -81,7 +81,7 @@ To draw a rune, use an arcane tome. if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message attack_hand(M) else - M << "You are unable to invoke the rune!" + to_chat(M, "You are unable to invoke the rune!") /obj/effect/rune/proc/talismanhide() //for talisman of revealing/hiding visible_message("[src] fades away.") @@ -173,7 +173,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() for(var/M in invokers) var/mob/living/L = M - L << "You feel your life force draining. The Geometer is displeased." + to_chat(L, "You feel your life force draining. The Geometer is displeased.") L.apply_damage(30, BRUTE) qdel(src) @@ -204,12 +204,12 @@ structure_check() searches for nearby cultist structures required for the invoca var/obj/item/weapon/paper/talisman/talisman_type var/list/possible_talismans = list() if(!papers_on_rune.len) - user << "There must be a blank paper on top of [src]!" + to_chat(user, "There must be a blank paper on top of [src]!") fail_invoke() log_game("Talisman Creation rune failed - no blank papers on rune") return if(rune_in_use) - user << "[src] can only support one ritual at a time!" + to_chat(user, "[src] can only support one ritual at a time!") fail_invoke() log_game("Talisman Creation rune failed - already in use") return @@ -225,7 +225,7 @@ structure_check() searches for nearby cultist structures required for the invoca return papers_on_rune = checkpapers() if(!papers_on_rune.len) - user << "There must be a blank paper on top of [src]!" + to_chat(user, "There must be a blank paper on top of [src]!") fail_invoke() log_game("Talisman Creation rune failed - no blank papers on rune") return @@ -233,7 +233,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() visible_message("Dark power begins to channel into the paper!") rune_in_use = 1 - if(!do_after(user, 100, target = paper_to_imbue)) + if(!do_after(user, initial(talisman_type.creation_time), target = paper_to_imbue)) rune_in_use = 0 return new talisman_type(get_turf(src)) @@ -278,13 +278,13 @@ var/list/teleport_runes = list() potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T if(!potential_runes.len) - user << "There are no valid runes to teleport to!" + to_chat(user, "There are no valid runes to teleport to!") log_game("Teleport rune failed - no other teleport runes") fail_invoke() return if(user.z > ZLEVEL_SPACEMAX) - user << "You are not in the right dimension!" + to_chat(user, "You are not in the right dimension!") log_game("Teleport rune failed - user in away mission") fail_invoke() return @@ -298,7 +298,7 @@ var/list/teleport_runes = list() var/turf/T = get_turf(src) var/turf/target = get_turf(actual_selected_rune) if(is_blocked_turf(target, TRUE)) - user << "The target rune is blocked. Attempting to teleport to it would be massively unwise." + to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.") fail_invoke() return var/movedsomething = 0 @@ -314,7 +314,7 @@ var/list/teleport_runes = list() if(movedsomething) ..() visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!") - user << "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"]." + to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].") if(moveuserlater) user.forceMove(target) else @@ -376,12 +376,12 @@ var/list/teleport_runes = list() /obj/effect/rune/convert/proc/do_convert(mob/living/convertee, list/invokers) if(invokers.len < 2) for(var/M in invokers) - M << "You need more invokers to convert [convertee]!" + to_chat(M, "You need more invokers to convert [convertee]!") log_game("Offer rune failed - tried conversion with one invoker") return 0 if(convertee.null_rod_check()) for(var/M in invokers) - M << "Something is shielding [convertee]'s mind!" + to_chat(M, "Something is shielding [convertee]'s mind!") log_game("Offer rune failed - convertee had null rod") return 0 var/brutedamage = convertee.getBruteLoss() @@ -395,16 +395,16 @@ var/list/teleport_runes = list() ticker.mode.add_cultist(convertee.mind, 1) new /obj/item/weapon/tome(get_turf(src)) convertee.mind.special_role = "Cultist" - convertee << "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 something evil takes root." - convertee << "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\ - " + to_chat(convertee, "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 something evil takes root.") + to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\ + ") return 1 /obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers) if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || is_sacrifice_target(sacrificial.mind)) && invokers.len < 3) for(var/M in invokers) - M << "[sacrificial] is too greatly linked to the world! You need three acolytes!" + to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!") log_game("Offer rune failed - not enough acolytes and target is living or sac target") return FALSE var/sacrifice_fulfilled = FALSE @@ -419,12 +419,12 @@ var/list/teleport_runes = list() new /obj/effect/overlay/temp/cult/sac(get_turf(src)) for(var/M in invokers) if(sacrifice_fulfilled) - M << "\"Yes! This is the one I desire! You have done well.\"" + to_chat(M, "\"Yes! This is the one I desire! You have done well.\"") else if(ishuman(sacrificial) || iscyborg(sacrificial)) - M << "\"I accept this sacrifice.\"" + to_chat(M, "\"I accept this sacrifice.\"") else - M << "\"I accept this meager sacrifice.\"" + to_chat(M, "\"I accept this meager sacrifice.\"") var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src)) if(sacrificial.mind) @@ -481,14 +481,14 @@ var/list/teleport_runes = list() if(!cult_mode && !ignore_gamemode) for(var/M in invokers) - M << "Nar-Sie does not respond!" + to_chat(M, "Nar-Sie does not respond!") fail_invoke() log_game("Summon Nar-Sie rune failed - gametype is not cult") return if(locate(/obj/singularity/narsie) in poi_list) for(var/M in invokers) - M << "Nar-Sie is already on this plane!" + to_chat(M, "Nar-Sie is already on this plane!") log_game("Summon Nar-Sie rune failed - already summoned") return //BEGIN THE SUMMONING @@ -533,7 +533,7 @@ var/list/teleport_runes = list() var/revive_number = 0 if(sacrificed.len) revive_number = sacrificed.len - revives_used - user << "Revives Remaining: [revive_number]" + to_chat(user, "Revives Remaining: [revive_number]") /obj/effect/rune/raise_dead/invoke(var/list/invokers) var/turf/T = get_turf(src) @@ -546,12 +546,12 @@ var/list/teleport_runes = list() if(iscultist(M) && M.stat == DEAD) potential_revive_mobs |= M if(!potential_revive_mobs.len) - user << "There are no dead cultists on the rune!" + to_chat(user, "There are no dead cultists on the rune!") log_game("Raise Dead rune failed - no corpses to revive") fail_invoke() return if(!sacrificed.len || sacrificed.len <= revives_used) - user << "You have sacrificed too few people to revive a cultist!" + to_chat(user, "You have sacrificed too few people to revive a cultist!") fail_invoke() return if(potential_revive_mobs.len > 1) @@ -569,7 +569,7 @@ var/list/teleport_runes = list() revives_used++ mob_to_revive.revive(1, 1) //This does remove disabilities and such, but the rune might actually see some use because of it! mob_to_revive.grab_ghost() - mob_to_revive << "\"PASNAR SAVRAE YAM'TOTH. Arise.\"" + to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"") mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \ "You awaken suddenly from the void. You're alive!") rune_in_use = 0 @@ -584,18 +584,18 @@ var/list/teleport_runes = list() fail_invoke() return 0 if(!(target_mob in T.contents)) - user << "The cultist to revive has been moved!" + to_chat(user, "The cultist to revive has been moved!") fail_invoke() log_game("Raise Dead rune failed - revival target moved") return 0 var/mob/dead/observer/ghost = target_mob.get_ghost(TRUE) if(!ghost && (!target_mob.mind || !target_mob.mind.active)) - user << "The corpse to revive has no spirit!" + to_chat(user, "The corpse to revive has no spirit!") fail_invoke() log_game("Raise Dead rune failed - revival target has no ghost") return 0 if(!sacrificed.len || sacrificed.len <= revives_used) - user << "You have sacrificed too few people to revive a cultist!" + to_chat(user, "You have sacrificed too few people to revive a cultist!") fail_invoke() log_game("Raise Dead rune failed - too few sacrificed") return 0 @@ -625,16 +625,16 @@ var/list/teleport_runes = list() if(1 to 2) playsound(E, 'sound/items/Welder2.ogg', 25, 1) for(var/M in invokers) - M << "You feel a minute vibration pass through you..." + to_chat(M, "You feel a minute vibration pass through you...") if(3 to 6) playsound(E, 'sound/magic/Disable_Tech.ogg', 50, 1) for(var/M in invokers) - M << "Your hair stands on end as a shockwave eminates from the rune!" + to_chat(M, "Your hair stands on end as a shockwave eminates from the rune!") if(7 to INFINITY) playsound(E, 'sound/magic/Disable_Tech.ogg', 100, 1) for(var/M in invokers) var/mob/living/L = M - L << "You chant in unison and a colossal burst of energy knocks you backward!" + to_chat(L, "You chant in unison and a colossal burst of energy knocks you backward!") L.Weaken(2) qdel(src) //delete before pulsing because it's a delay reee empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters @@ -653,16 +653,16 @@ var/list/teleport_runes = list() /obj/effect/rune/astral/examine(mob/user) ..() if(affecting) - user << "A translucent field encases [user] above the rune!" + to_chat(user, "A translucent field encases [user] above the rune!") /obj/effect/rune/astral/can_invoke(mob/living/user) if(rune_in_use) - user << "[src] cannot support more than one body!" + to_chat(user, "[src] cannot support more than one body!") log_game("Astral Communion rune failed - more than one user") return list() var/turf/T = get_turf(src) if(!(user in T)) - user << "You must be standing on top of [src]!" + to_chat(user, "You must be standing on top of [src]!") log_game("Astral Communion rune failed - user not standing on rune") return list() return ..() @@ -699,13 +699,13 @@ var/list/teleport_runes = list() if(user.stat == UNCONSCIOUS) if(prob(1)) var/mob/dead/observer/G = user.get_ghost() - G << "You feel the link between you and your body weakening... you must hurry!" + to_chat(G, "You feel the link between you and your body weakening... you must hurry!") if(user.stat == DEAD) user.color = initial(user.color) rune_in_use = 0 affecting = null var/mob/dead/observer/G = user.get_ghost() - G << "You suddenly feel your physical form pass on. [src]'s exertion has killed you!" + to_chat(G, "You suddenly feel your physical form pass on. [src]'s exertion has killed you!") return sleep(1) rune_in_use = 0 @@ -730,7 +730,7 @@ var/list/wall_runes = list() /obj/effect/rune/wall/examine(mob/user) ..() if(density) - user << "There is a barely perceptible shimmering of the air above [src]." + to_chat(user, "There is a barely perceptible shimmering of the air above [src].") /obj/effect/rune/wall/Destroy() density = 0 @@ -813,22 +813,22 @@ var/list/wall_runes = list() if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) - user << "You require a summoning target!" + to_chat(user, "You require a summoning target!") fail_invoke() log_game("Summon Cultist rune failed - no target") return if(cultist_to_summon.stat == DEAD) - user << "[cultist_to_summon] has died!" + to_chat(user, "[cultist_to_summon] has died!") fail_invoke() log_game("Summon Cultist rune failed - target died") return if(!iscultist(cultist_to_summon)) - user << "[cultist_to_summon] is not a follower of the Geometer!" + to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!") fail_invoke() log_game("Summon Cultist rune failed - target was deconverted") return if(cultist_to_summon.z > ZLEVEL_SPACEMAX) - user << "[cultist_to_summon] is not in our dimension!" + to_chat(user, "[cultist_to_summon] is not in our dimension!") fail_invoke() log_game("Summon Cultist rune failed - target in away mission") return @@ -847,6 +847,7 @@ var/list/wall_runes = list() invocation = "Dedo ol'btoh!" icon_state = "4" color = "#C80000" + light_color = LIGHT_COLOR_LAVA req_cultists = 3 construct_invoke = 0 var/tick_damage = 25 @@ -862,21 +863,21 @@ var/list/wall_runes = list() rune_in_use = TRUE var/turf/T = get_turf(src) visible_message("[src] turns a bright, glowing orange!") - SetLuminosity(6) + set_light(6) color = "#FC9B54" for(var/M in invokers) var/mob/living/L = M L.apply_damage(10, BRUTE, pick("l_arm", "r_arm")) - L << "[src] saps your strength!" + to_chat(L, "[src] saps your strength!") for(var/mob/living/L in viewers(T)) if(!iscultist(L) && L.blood_volume) var/obj/item/weapon/nullrod/N = L.null_rod_check() if(N) - L << "\The [N] suddenly burns hotly before returning to normal!" + to_chat(L, "\The [N] suddenly burns hotly before returning to normal!") continue - L << "Your blood boils in your veins!" + to_chat(L, "Your blood boils in your veins!") if(is_servant_of_ratvar(L)) - L << "You feel an unholy darkness dimming the Justiciar's light!" + to_chat(L, "You feel an unholy darkness dimming the Justiciar's light!") animate(src, color = "#FCB56D", time = 4) sleep(4) if(!src) @@ -923,7 +924,7 @@ var/list/wall_runes = list() if(M.stat != DEAD) potential_targets += M if(!potential_targets.len) - user << "There must be at least one valid target on the rune!" + to_chat(user, "There must be at least one valid target on the rune!") log_game("Leeching rune failed - no valid targets") return list() return ..() @@ -938,7 +939,7 @@ var/list/wall_runes = list() var/drained_amount = rand(10,20) M.apply_damage(drained_amount, BRUTE, "chest") user.adjustBruteLoss(-drained_amount) - M << "You feel extremely weak." + to_chat(M, "You feel extremely weak.") user.Beam(T,icon_state="drainbeam",time=5) user.visible_message("Blood flows from the rune into [user]!", \ "Blood flows into you, healing your wounds and revitalizing your spirit.") @@ -959,7 +960,7 @@ var/list/wall_runes = list() /obj/effect/rune/manifest/can_invoke(mob/living/user) if(!(user in get_turf(src))) - user << "You must be standing on [src]!" + to_chat(user, "You must be standing on [src]!") fail_invoke() log_game("Manifest rune failed - user not standing on rune") return list() @@ -968,7 +969,7 @@ var/list/wall_runes = list() if(O.client && !jobban_isbanned(O, ROLE_CULTIST)) ghosts_on_rune |= O if(!ghosts_on_rune.len) - user << "There are no spirits near [src]!" + to_chat(user, "There are no spirits near [src]!") fail_invoke() log_game("Manifest rune failed - no nearby ghosts") return list() @@ -986,13 +987,13 @@ var/list/wall_runes = list() new_human.alpha = 150 //Makes them translucent ..() visible_message("A cloud of red mist forms above [src], and from within steps... a man.") - user << "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely..." + to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...") var/turf/T = get_turf(src) var/obj/structure/emergency_shield/invoker/N = new(T) new_human.key = ghost_to_spawn.key ticker.mode.add_cultist(new_human.mind, 0) - new_human << "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar-Sie, and you are to serve them at all costs." + to_chat(new_human, "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar-Sie, and you are to serve them at all costs.") while(user in T) if(user.stat) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 9a47e91561..d8722acb73 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -4,18 +4,19 @@ var/invocation = "Naise meam!" var/uses = 1 var/health_cost = 0 //The amount of health taken from the user when invoking the talisman + var/creation_time = 100 //how long it takes an imbue rune to make this type of talisman /obj/item/weapon/paper/talisman/examine(mob/user) if(iscultist(user) || user.stat == DEAD) - user << "Name: [cultist_name]" - user << "Effect: [cultist_desc]" - user << "Uses Remaining: [uses]" + to_chat(user, "Name: [cultist_name]") + to_chat(user, "Effect: [cultist_desc]") + to_chat(user, "Uses Remaining: [uses]") else - user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" + to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") /obj/item/weapon/paper/talisman/attack_self(mob/living/user) if(!iscultist(user)) - user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" + to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return if(invoke(user)) uses-- @@ -39,7 +40,7 @@ invocation = "Ra'sha yoka!" /obj/item/weapon/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) - user << "You feel a pain in your head. The Geometer is displeased." + to_chat(user, "You feel a pain in your head. The Geometer is displeased.") if(iscarbon(user)) var/mob/living/carbon/C = user C.apply_damage(10, BRUTE, "head") @@ -119,6 +120,7 @@ color = "#551A8B" // purple invocation = "Sas'so c'arta forbici!" health_cost = 5 + creation_time = 80 /obj/item/weapon/paper/talisman/teleport/invoke(mob/living/user, successfuluse = 1) var/list/potential_runes = list() @@ -128,12 +130,12 @@ potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T if(!potential_runes.len) - user << "There are no valid runes to teleport to!" + to_chat(user, "There are no valid runes to teleport to!") log_game("Teleport talisman failed - no other teleport runes") return ..(user, 0) if(user.z > ZLEVEL_SPACEMAX) - user << "You are not in the right dimension!" + to_chat(user, "You are not in the right dimension!") log_game("Teleport talisman failed - user in away mission") return ..(user, 0) @@ -143,7 +145,7 @@ return ..(user, 0) var/turf/target = get_turf(actual_selected_rune) if(is_blocked_turf(target, TRUE)) - user << "The target rune is blocked. Attempting to teleport to it would be massively unwise." + to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.") return ..(user, 0) user.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear in a flash of red light!", \ "You speak the words of the talisman and find yourself somewhere else!") @@ -157,6 +159,7 @@ color = "#512727" // red-black invocation = "N'ath reth sh'yro eth d'raggathnor!" health_cost = 1 + creation_time = 30 /obj/item/weapon/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) . = ..() @@ -172,6 +175,7 @@ color = "#9c9c9c" // grey invocation = "Kla'atu barada nikt'o!" health_cost = 1 + creation_time = 30 uses = 2 var/revealing = FALSE //if it reveals or not @@ -196,6 +200,7 @@ cultist_desc = "A talisman that will make nearby runes appear fake." color = "#ff80d5" // honk invocation = "By'o nar'nar!" + creation_time = 20 /obj/item/weapon/paper/talisman/make_runes_fake/invoke(mob/living/user, successfuluse = 1) . = ..() @@ -232,9 +237,9 @@ if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) - user << "To use this talisman, attack the target directly." + to_chat(user, "To use this talisman, attack the target directly.") else - user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" + to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return 0 /obj/item/weapon/paper/talisman/stun/attack(mob/living/target, mob/living/user, successfuluse = 1) @@ -273,6 +278,7 @@ cultist_desc = "A talisman that will equip the invoker with cultist equipment if there is a slot to equip it to." color = "#33cc33" // green invocation = "N'ath reth sh'yro eth draggathnor!" + creation_time = 80 /obj/item/weapon/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) . = ..() @@ -301,15 +307,16 @@ cultist_desc = "A talisman that will break the mind of the victim with nightmarish hallucinations." color = "#ffb366" // light orange invocation = "Lo'Nab Na'Dm!" + creation_time = 80 /obj/item/weapon/paper/talisman/horror/attack(mob/living/target, mob/living/user) if(iscultist(user)) - user << "You disturb [target] with visons of the end!" + to_chat(user, "You disturb [target] with visons of the end!") if(iscarbon(target)) var/mob/living/carbon/H = target H.reagents.add_reagent("mindbreaker", 25) if(is_servant_of_ratvar(target)) - target << "You see a brief but horrible vision of Ratvar, rusted and scrapped, being torn apart." + to_chat(target, "You see a brief but horrible vision of Ratvar, rusted and scrapped, being torn apart.") target.emote("scream") target.confused = max(0, target.confused + 3) target.flash_act() @@ -323,17 +330,18 @@ invocation = "Ethra p'ni dedol!" color = "#000000" // black uses = 25 + creation_time = 80 /obj/item/weapon/paper/talisman/construction/attack_self(mob/living/user) if(iscultist(user)) - user << "To use this talisman, place it upon a stack of metal sheets." + to_chat(user, "To use this talisman, place it upon a stack of metal sheets.") else - user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" + to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") /obj/item/weapon/paper/talisman/construction/attack(obj/M,mob/living/user) if(iscultist(user)) - user << "This talisman will only work on a stack of metal or plasteel sheets!" + to_chat(user, "This talisman will only work on a stack of metal or plasteel sheets!") log_game("Construct talisman failed - not a valid target") else ..() @@ -345,24 +353,24 @@ if(istype(target, /obj/item/stack/sheet/metal)) if(target.use(25)) new /obj/structure/constructshell(T) - user << "The talisman clings to the metal and twists it into a construct shell!" + to_chat(user, "The talisman clings to the metal and twists it into a construct shell!") user << sound('sound/effects/magic.ogg',0,1,25) invoke(user, 1) qdel(src) else - user << "You need more metal to produce a construct shell!" + to_chat(user, "You need more metal to produce a construct shell!") else if(istype(target, /obj/item/stack/sheet/plasteel)) var/quantity = min(target.amount, uses) uses -= quantity new /obj/item/stack/sheet/runed_metal(T,quantity) target.use(quantity) - user << "The talisman clings to the plasteel, transforming it into runed metal!" + to_chat(user, "The talisman clings to the plasteel, transforming it into runed metal!") user << sound('sound/effects/magic.ogg',0,1,25) invoke(user, 1) if(uses <= 0) qdel(src) else - user << "The talisman must be used on metal or plasteel!" + to_chat(user, "The talisman must be used on metal or plasteel!") //Talisman of Shackling: Applies special cuffs directly from the talisman @@ -377,9 +385,9 @@ if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) - user << "To use this talisman, attack the target directly." + to_chat(user, "To use this talisman, attack the target directly.") else - user << "There are indecipherable images scrawled on the paper in what looks to be... blood?" + to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return 0 /obj/item/weapon/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) @@ -401,15 +409,15 @@ if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/cult/used(C) C.update_handcuffed() - user << "You shackle [C]." + to_chat(user, "You shackle [C].") add_logs(user, C, "handcuffed") uses-- else - user << "[C] is already bound." + to_chat(user, "[C] is already bound.") else - user << "You fail to shackle [C]." + to_chat(user, "You fail to shackle [C].") else - user << "[C] is already bound." + to_chat(user, "[C] is already bound.") if(uses <= 0) user.drop_item() qdel(src) diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index c64653a986..70775dfe9d 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -51,7 +51,7 @@ /datum/game_mode/devil/post_setup() for(var/datum/mind/devil in devils) spawn(rand(10,100)) - finalize_devil(devil, objective_count) + finalize_devil(devil, TRUE) spawn(100) add_devil_objectives(devil, objective_count) //This has to be in a separate loop, as we need devil names to be generated before we give objectives in devil agent. devil.announceDevilLaws() diff --git a/code/game/gamemodes/devil/devilinfo.dm b/code/game/gamemodes/devil/devilinfo.dm index 68fbe4d790..82fead15ca 100644 --- a/code/game/gamemodes/devil/devilinfo.dm +++ b/code/game/gamemodes/devil/devilinfo.dm @@ -94,6 +94,7 @@ var/global/list/lawlorify = list ( /obj/effect/proc_holder/spell/targeted/summon_contract, /obj/effect/proc_holder/spell/targeted/conjure_item/violin, /obj/effect/proc_holder/spell/targeted/summon_dancefloor) + var/ascendable = FALSE /datum/devilinfo/New() @@ -156,11 +157,11 @@ var/global/list/lawlorify = list ( return soulsOwned += soul owner.current.nutrition = NUTRITION_LEVEL_FULL - owner.current << "You feel satiated as you received a new soul." + to_chat(owner.current, "You feel satiated as you received a new soul.") update_hud() switch(SOULVALUE) if(0) - owner.current << "Your hellish powers have been restored." + to_chat(owner.current, "Your hellish powers have been restored.") give_base_spells() if(BLOOD_THRESHOLD) increase_blood_lizard() @@ -172,7 +173,7 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/remove_soul(datum/mind/soul) if(soulsOwned.Remove(soul)) check_regression() - owner.current << "You feel as though a soul has slipped from your grasp." + to_chat(owner.current, "You feel as though a soul has slipped from your grasp.") update_hud() /datum/devilinfo/proc/check_regression() @@ -185,19 +186,10 @@ var/global/list/lawlorify = list ( regress_humanoid() if(SOULVALUE < 0) remove_spells() - owner.current << "As punishment for your failures, all of your powers except contract creation have been revoked." - -/datum/devilinfo/proc/increase_form() - switch(form) - if(BASIC_DEVIL) - increase_blood_lizard() - if(BLOOD_LIZARD) - increase_true_devil() - if(TRUE_DEVIL) - increase_arch_devil() + to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") /datum/devilinfo/proc/regress_humanoid() - owner.current << "Your powers weaken, have more contracts be signed to regain power." + to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/human, 1) @@ -209,7 +201,7 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/regress_blood_lizard() var/mob/living/carbon/true_devil/D = owner.current - D << "Your powers weaken, have more contracts be signed to regain power." + to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") D.oldform.loc = D.loc owner.transfer_to(D.oldform) give_lizard_spells() @@ -219,7 +211,7 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/increase_blood_lizard() - owner.current << "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard." + to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") sleep(50) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current @@ -237,7 +229,7 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/increase_true_devil() - owner.current << "You feel as though your current form is about to shed. You will soon turn into a true devil." + to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") sleep(50) var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc) A.faction |= "hell" @@ -251,8 +243,10 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/increase_arch_devil() + if(!ascendable) + return var/mob/living/carbon/true_devil/D = owner.current - D << "You feel as though your form is about to ascend." + to_chat(D, "You feel as though your form is about to ascend.") sleep(50) if(!D) return @@ -271,19 +265,19 @@ var/global/list/lawlorify = list ( sleep(40) if(!D) return - D << "Yes!" + to_chat(D, "Yes!") sleep(10) if(!D) return - D << "YES!!" + to_chat(D, "YES!!") sleep(10) if(!D) return - D << "YE--" + to_chat(D, "YE--") sleep(1) if(!D) return - world << "\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"" + to_chat(world, "\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"") world << 'sound/hallucinations/veryfar_noise.ogg' give_arch_spells() D.convert_to_archdevil() @@ -339,23 +333,23 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/beginResurrectionCheck(mob/living/body) if(SOULVALUE>0) - owner.current<< "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body." + to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.") sleep(DEVILRESURRECTTIME) if (!body || body.stat == DEAD) if(SOULVALUE>0) if(check_banishment(body)) - owner.current<< "Unfortunately, the mortals have finished a ritual that prevents your resurrection." + to_chat(owner.current, "Unfortunately, the mortals have finished a ritual that prevents your resurrection.") return -1 else - owner.current<< "WE LIVE AGAIN!" + to_chat(owner.current, "WE LIVE AGAIN!") return hellish_resurrection(body) else - owner.current<< "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect." + to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.") return -1 else - owner.current << " You seem to have resurrected without your hellish powers." + to_chat(owner.current, " You seem to have resurrected without your hellish powers.") else - owner.current << "Your hellish powers are too weak to resurrect yourself." + to_chat(owner.current, "Your hellish powers are too weak to resurrect yourself.") /datum/devilinfo/proc/check_banishment(mob/living/body) switch(banish) @@ -403,7 +397,7 @@ var/global/list/lawlorify = list ( /datum/devilinfo/proc/hellish_resurrection(mob/living/body) message_admins("[owner.name] (true name is: [truename]) is resurrecting using hellish energy.") - if(SOULVALUE <= ARCH_THRESHOLD) // once ascended, arch devils do not go down in power by any means. + if(SOULVALUE < ARCH_THRESHOLD && ascendable) // once ascended, arch devils do not go down in power by any means. reviveNumber += LOSS_PER_DEATH update_hud() if(body) @@ -414,41 +408,50 @@ var/global/list/lawlorify = list ( var/mob/living/carbon/true_devil/D = body if(D.oldform) D.oldform.revive(1,0) // Heal the old body too, so the devil doesn't resurrect, then immediately regress into a dead body. + if(body.stat == DEAD) + create_new_body() else - if(blobstart.len > 0) - var/turf/targetturf = get_turf(pick(blobstart)) - var/mob/currentMob = owner.current - if(!currentMob) - currentMob = owner.get_ghost() - if(!currentMob) - message_admins("[owner.name]'s devil resurrection failed due to client logoff. Aborting.") - return -1 // - if(currentMob.mind != owner) - message_admins("[owner.name]'s devil resurrection failed due to becoming a new mob. Aborting.") - return -1 - currentMob.change_mob_type( /mob/living/carbon/human , targetturf, null, 1) - var/mob/living/carbon/human/H = owner.current - give_summon_contract() - if(SOULVALUE >= BLOOD_THRESHOLD) - H.set_species(/datum/species/lizard, 1) - H.underwear = "Nude" - H.undershirt = "Nude" - H.socks = "Nude" - H.dna.features["mcolor"] = "511" - H.regenerate_icons() - if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough. - var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf) - A.faction |= "hell" - H.forceMove(A) - A.oldform = H - A.set_name() - owner.transfer_to(A) - if(SOULVALUE >= ARCH_THRESHOLD) - A.convert_to_archdevil() - else - throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection") + create_new_body() check_regression() +/datum/devilinfo/proc/create_new_body() + if(blobstart.len > 0) + var/turf/targetturf = get_turf(pick(blobstart)) + var/mob/currentMob = owner.current + if(!currentMob) + currentMob = owner.get_ghost() + if(!currentMob) + message_admins("[owner.name]'s devil resurrection failed due to client logoff. Aborting.") + return -1 + if(currentMob.mind != owner) + message_admins("[owner.name]'s devil resurrection failed due to becoming a new mob. Aborting.") + return -1 + currentMob.change_mob_type( /mob/living/carbon/human, targetturf, null, 1) + var/mob/living/carbon/human/H = owner.current + H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_hands) + H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_l_store) + if(SOULVALUE >= BLOOD_THRESHOLD) + H.set_species(/datum/species/lizard, 1) + H.underwear = "Nude" + H.undershirt = "Nude" + H.socks = "Nude" + H.dna.features["mcolor"] = "511" + H.regenerate_icons() + if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough. + var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf) + A.faction |= "hell" + H.forceMove(A) + A.oldform = H + A.set_name() + owner.transfer_to(A) + if(SOULVALUE >= ARCH_THRESHOLD && ascendable) + A.convert_to_archdevil() + else + throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection") + + /datum/devilinfo/proc/update_hud() if(istype(owner.current, /mob/living/carbon)) var/mob/living/C = owner.current diff --git a/code/game/gamemodes/devil/game_mode.dm b/code/game/gamemodes/devil/game_mode.dm index be5b22c206..a99e6abd83 100644 --- a/code/game/gamemodes/devil/game_mode.dm +++ b/code/game/gamemodes/devil/game_mode.dm @@ -14,7 +14,7 @@ text += printobjectives(sintouched_mind) text += "
" text += "
" - world << text + to_chat(world, text) /datum/game_mode/proc/auto_declare_completion_devils() /var/text = "" @@ -27,14 +27,15 @@ text += printobjectives(devil) text += "
" text += "
" - world << text + to_chat(world, text) -/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind) +/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind, ascendable = FALSE) var/trueName= randomDevilName() devil_mind.devilinfo = devilInfo(trueName, 1) + devil_mind.devilinfo.ascendable = ascendable devil_mind.store_memory("Your devilic true name is [devil_mind.devilinfo.truename]
[lawlorify[LAW][devil_mind.devilinfo.ban]]
You may not use violence to coerce someone into selling their soul.
You may not directly and knowingly physically harm a devil, other than yourself.
[lawlorify[LAW][devil_mind.devilinfo.bane]]
[lawlorify[LAW][devil_mind.devilinfo.obligation]]
[lawlorify[LAW][devil_mind.devilinfo.banish]]
") devil_mind.devilinfo.owner = devil_mind devil_mind.devilinfo.give_base_spells(1) @@ -42,7 +43,7 @@ devil_mind.devilinfo.update_hud() if(devil_mind.assigned_role == "Clown" && ishuman(devil_mind.current)) var/mob/living/carbon/human/S = devil_mind.current - S << "Your infernal nature has allowed you to overcome your clownishness." + to_chat(S, "Your infernal nature has allowed you to overcome your clownishness.") S.dna.remove_mutation(CLOWNMUT) if(issilicon(devil_mind.current)) add_law_sixsixsix(devil_mind.current) @@ -62,15 +63,15 @@ /datum/mind/proc/announceDevilLaws() if(!devilinfo) return - current << "You remember your link to the infernal. You are [src.devilinfo.truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp." - current << "However, your infernal form is not without weaknesses." - current << "You may not use violence to coerce someone into selling their soul." - current << "You may not directly and knowingly physically harm a devil, other than yourself." - current << lawlorify[LAW][src.devilinfo.bane] - current << lawlorify[LAW][src.devilinfo.ban] - current << lawlorify[LAW][src.devilinfo.obligation] - current << lawlorify[LAW][src.devilinfo.banish] - current << "
Remember, the crew can research your weaknesses if they find out your devil name.
" + to_chat(current, "You remember your link to the infernal. You are [src.devilinfo.truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.") + to_chat(current, "However, your infernal form is not without weaknesses.") + to_chat(current, "You may not use violence to coerce someone into selling their soul.") + to_chat(current, "You may not directly and knowingly physically harm a devil, other than yourself.") + to_chat(current, lawlorify[LAW][src.devilinfo.bane]) + to_chat(current, lawlorify[LAW][src.devilinfo.ban]) + to_chat(current, lawlorify[LAW][src.devilinfo.obligation]) + to_chat(current, lawlorify[LAW][src.devilinfo.banish]) + to_chat(current, "
Remember, the crew can research your weaknesses if they find out your devil name.
") /datum/game_mode/proc/printdevilinfo(datum/mind/ply) if(!ply.devilinfo) diff --git a/code/game/gamemodes/devil/imp/imp.dm b/code/game/gamemodes/devil/imp/imp.dm index 211a343b52..3698a391e1 100644 --- a/code/game/gamemodes/devil/imp/imp.dm +++ b/code/game/gamemodes/devil/imp/imp.dm @@ -38,7 +38,7 @@ Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." -/mob/living/simple_animal/imp/New() +/mob/living/simple_animal/imp/Initialize() ..() boost = world.time + 30 diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm index 1de71b46d3..c7af40414b 100644 --- a/code/game/gamemodes/devil/true_devil/_true_devil.dm +++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm @@ -27,7 +27,7 @@ -/mob/living/carbon/true_devil/New() +/mob/living/carbon/true_devil/Initialize() create_bodyparts() //initialize bodyparts create_internal_organs() @@ -87,7 +87,7 @@ else if(health < (maxHealth/2)) msg += "You can see hellfire inside its wounds.\n" msg += "*---------*" - user << msg + to_chat(user, msg) /mob/living/carbon/true_devil/IsAdvancedToolUser() @@ -151,8 +151,8 @@ var/datum/objective/newobjective = new newobjective.explanation_text = "Try to get a promotion to a higher devilic rank." S.mind.objectives += newobjective - S << S.playstyle_string - S << "Objective #[1]: [newobjective.explanation_text]" + to_chat(S, S.playstyle_string) + to_chat(S, "Objective #[1]: [newobjective.explanation_text]") return else return ..() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index bbe8709c56..65a5529f2a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -46,14 +46,14 @@ /datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description. - world << "The gamemode is: [name]!" - world << "[announce_text]" + to_chat(world, "The gamemode is: [name]!") + to_chat(world, "[announce_text]") ///Checks to see if the game can be setup and ran with the current number of players or whatnot. /datum/game_mode/proc/can_start() var/playerC = 0 - for(var/mob/new_player/player in player_list) + for(var/mob/dead/new_player/player in player_list) if((player.client)&&(player.ready)) playerC++ if(!Debug2) @@ -103,7 +103,7 @@ return -///Allows rounds to basically be "rerolled" should the initial premise fall through +///Allows rounds to basically be "rerolled" should the initial premise fall through. Also known as mulligan antags. /datum/game_mode/proc/convert_roundtype() var/list/living_crew = list() @@ -156,9 +156,9 @@ if(config.protect_assistant_from_antagonist) replacementmode.restricted_jobs += "Assistant" - message_admins("The roundtype will be converted. If you have other plans for the station or think the round should end stop the creation of antags or end the round now.") + message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") - spawn(rand(1200,3000)) //somewhere between 2 and 5 minutes from now + spawn(rand(600,1800)) //somewhere between 1 and 3 minutes from now if(!config.midround_antag[ticker.mode.config_tag]) round_converted = 0 return 1 @@ -289,7 +289,7 @@ G.on_report() intercepttext += G.get_report() - print_command_report(intercepttext, "Central Command Status Summary") + print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE) priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/AI/intercept.ogg') if(security_level < SEC_LEVEL_BLUE) set_security_level(SEC_LEVEL_BLUE) @@ -302,7 +302,7 @@ var/datum/mind/applicant = null // Ultimate randomizing code right here - for(var/mob/new_player/player in player_list) + for(var/mob/dead/new_player/player in player_list) if(player.client && player.ready) players += player @@ -310,7 +310,7 @@ // Goodbye antag dante players = shuffle(players) - for(var/mob/new_player/player in players) + for(var/mob/dead/new_player/player in players) if(player.client && player.ready) if(role in player.client.prefs.be_special) if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans @@ -324,7 +324,7 @@ candidates -= player if(candidates.len < recommended_enemies) - for(var/mob/new_player/player in players) + for(var/mob/dead/new_player/player in players) if(player.client && player.ready) if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans @@ -349,7 +349,7 @@ break /* if(candidates.len < recommended_enemies && override_jobbans) //If we still don't have enough people, we're going to start drafting banned people. - for(var/mob/new_player/player in players) + for(var/mob/dead/new_player/player in players) if (player.client && player.ready) if(jobban_isbanned(player, "Syndicate") || jobban_isbanned(player, roletext)) //Nodrak/Carn: Antag Job-bans drafted += player.mind @@ -377,7 +377,7 @@ // Less if there are not enough valid players in the game entirely to make recommended_enemies. /* -/datum/game_mode/proc/check_player_role_pref(var/role, var/mob/new_player/player) +/datum/game_mode/proc/check_player_role_pref(var/role, var/mob/dead/new_player/player) if(player.preferences.be_special & role) return 1 return 0 @@ -385,7 +385,7 @@ /datum/game_mode/proc/num_players() . = 0 - for(var/mob/new_player/P in player_list) + for(var/mob/dead/new_player/P in player_list) if(P.client && P.ready) . ++ @@ -479,7 +479,7 @@ for(var/mob/M in mob_list) if(M.client && M.client.holder) - M << msg + to_chat(M, msg) /datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck) var/text = "
[ply.key] was [ply.name] the [ply.assigned_role] and" @@ -531,7 +531,7 @@ var/mob/dead/observer/theghost = null if(candidates.len) theghost = pick(candidates) - M << "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!" + to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.") M.ghostize(0) M.key = theghost.key diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index fe46cb60a8..388404118f 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -21,7 +21,7 @@ /obj/machinery/dominator/New() ..() - SetLuminosity(2) + set_light(2) poi_list |= src spark_system = new spark_system.set_up(5, 1, src) @@ -36,12 +36,12 @@ if(gang && gang.is_dominating) time = gang.domination_time_remaining() if(time > 0) - user << "Hostile Takeover in progress. Estimated [time] seconds remain." + to_chat(user, "Hostile Takeover in progress. Estimated [time] seconds remain.") else - user << "Hostile Takeover of [station_name()] successful. Have a great day." + to_chat(user, "Hostile Takeover of [station_name()] successful. Have a great day.") else - user << "System on standby." - user << "System Integrity: [round((obj_integrity/max_integrity)*100,1)]%" + to_chat(user, "System on standby.") + to_chat(user, "System Integrity: [round((obj_integrity/max_integrity)*100,1)]%") /obj/machinery/dominator/process() ..() @@ -117,7 +117,7 @@ gang.message_gangtools("Hostile takeover cancelled: Dominator is no longer operational.[gang.dom_attempts ? " You have [gang.dom_attempts] attempt remaining." : " The station network will have likely blocked any more attempts by us."]",1,1) - SetLuminosity(0) + set_light(0) icon_state = "dominator-broken" cut_overlays() operating = 0 @@ -153,11 +153,11 @@ return if(tempgang.is_dominating) - user << "Error: Hostile Takeover is already in progress." + to_chat(user, "Error: Hostile Takeover is already in progress.") return if(!tempgang.dom_attempts) - user << "Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts." + to_chat(user, "Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.") return var/time = round(determine_domination_time(tempgang)/60,0.1) @@ -180,14 +180,10 @@ countdown.color = gang.color_hex countdown.start() - SetLuminosity(3) + set_light(3) START_PROCESSING(SSmachine, src) gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]") for(var/datum/gang/G in ticker.mode.gangs) if(G != gang) G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1) - - - - diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 8d6709b1e2..b6a5d64e7a 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -92,7 +92,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" /datum/game_mode/proc/greet_gang(datum/mind/boss_mind, you_are=1) if (you_are) - boss_mind.current << "You are the Boss of the [boss_mind.gang_datum.name] Gang!" + to_chat(boss_mind.current, "You are the Boss of the [boss_mind.gang_datum.name] Gang!") boss_mind.announce_objectives() /////////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" 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.dna.remove_mutation(CLOWNMUT) var/obj/item/device/gangtool/gangtool = new(mob) @@ -122,33 +122,33 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" var/where = mob.equip_in_one_of_slots(gangtool, slots) if (!where) - mob << "Your Syndicate benefactors were unfortunately unable to get you a Gangtool." + to_chat(mob, "Your Syndicate benefactors were unfortunately unable to get you a Gangtool.") . += 1 else gangtool.register_device(mob) - mob << "The Gangtool in your [where] will allow you to purchase weapons and equipment, send messages to your gang, and recall the emergency shuttle from anywhere on the station." - mob << "As the gang boss, you can also promote your gang members to lieutenant. Unlike regular gangsters, Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools." + to_chat(mob, "The Gangtool in your [where] will allow you to purchase weapons and equipment, send messages to your gang, and recall the emergency shuttle from anywhere on the station.") + to_chat(mob, "As the gang boss, you can also promote your gang members to lieutenant. Unlike regular gangsters, Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools.") var/where2 = mob.equip_in_one_of_slots(T, slots) if (!where2) - mob << "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start." + to_chat(mob, "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start.") . += 1 else - mob << "The recruitment pen in your [where2] will help you get your gang started. Stab unsuspecting crew members with it to recruit them." + to_chat(mob, "The recruitment pen in your [where2] will help you get your gang started. Stab unsuspecting crew members with it to recruit them.") var/where3 = mob.equip_in_one_of_slots(SC, slots) if (!where3) - mob << "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start." + to_chat(mob, "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start.") . += 1 else - mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. All gangsters can use these, so distribute them to grow your influence faster." + to_chat(mob, "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. All gangsters can use these, so distribute them to grow your influence faster.") var/where4 = mob.equip_in_one_of_slots(C, slots) if (!where4) - mob << "Your Syndicate benefactors were unfortunately unable to get you a chameleon security HUD." + to_chat(mob, "Your Syndicate benefactors were unfortunately unable to get you a chameleon security HUD.") . += 1 else - mob << "The chameleon security HUD in your [where4] will help you keep track of who is mindshield-implanted, and unable to be recruited." + to_chat(mob, "The chameleon security HUD in your [where4] will help you keep track of who is mindshield-implanted, and unable to be recruited.") return . @@ -169,12 +169,12 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" carbon_mob.flash_act(1, 1) gangster_mind.current.Stun(5) if(G.is_deconvertible) - gangster_mind.current << "You are now a member of the [G.name] Gang!" - gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." - gangster_mind.current << "Their ultimate objective is to take over the station with a Dominator machine." - gangster_mind.current << "You can identify your bosses by their large, bright [G.color] \[G\] icon." + to_chat(gangster_mind.current, "You are now a member of the [G.name] Gang!") + to_chat(gangster_mind.current, "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station.") + to_chat(gangster_mind.current, "Their ultimate objective is to take over the station with a Dominator machine.") + to_chat(gangster_mind.current, "You can identify your bosses by their large, bright [G.color] \[G\] icon.") gangster_mind.store_memory("You are a member of the [G.name] Gang!") - gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [G.name] Gang!" + gangster_mind.current.log_message("Has been converted to the [G.name] Gang!", INDIVIDUAL_ATTACK_LOG) gangster_mind.special_role = "[G.name] Gangster" G.add_gang_hud(gangster_mind) @@ -208,18 +208,18 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" gangster_mind.gang_datum = null if(silent < 2) - gangster_mind.current.attack_log += "\[[time_stamp()]\] Has reformed and defected from the [gang.name] Gang!" + gangster_mind.current.log_message("Has reformed and defected from the [gang.name] Gang!", INDIVIDUAL_ATTACK_LOG) if(beingborged) if(!silent) gangster_mind.current.visible_message("The frame beeps contentedly from the MMI before initalizing it.") - gangster_mind.current << "The frame's firmware detects and deletes your criminal behavior! You are no longer a gangster!" + to_chat(gangster_mind.current, "The frame's firmware detects and deletes your criminal behavior! You are no longer a gangster!") message_admins("[ADMIN_LOOKUPFLW(gangster_mind.current)] has been borged while being a member of the [gang.name] Gang. They are no longer a gangster.") else if(!silent) gangster_mind.current.Paralyse(5) gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") - gangster_mind.current << "You have been reformed! You are no longer a gangster!
You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters..." + to_chat(gangster_mind.current, "You have been reformed! You are no longer a gangster!
You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters...") gangster_mind.memory = "" gang.remove_gang_hud(gangster_mind) @@ -258,12 +258,12 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" if(!gangs.len) return if(!winner) - world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before a gang could claim it! The station wins!"]
" + to_chat(world, "The station was [station_was_nuked ? "destroyed!" : "evacuated before a gang could claim it! The station wins!"]
") feedback_set_details("round_end_result","loss - gangs failed takeover") ticker.news_report = GANG_LOSS else - world << "The [winner.name] Gang successfully performed a hostile takeover of the station!
" + to_chat(world, "The [winner.name] Gang successfully performed a hostile takeover of the station!
") feedback_set_details("round_end_result","win - gang domination complete") ticker.news_report = GANG_TAKEOVER @@ -277,7 +277,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" for(var/datum/mind/gangster in G.gangsters) text += printplayer(gangster, 1) text += "
" - world << text + to_chat(world, text) ////////////////////////////////////////////////////////// //Handles influence, territories, and the victory checks// diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 935b1820e2..78d75c957f 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -159,7 +159,7 @@ var/mob/living/mob = get(tool.loc,/mob/living) if(mob && mob.mind && mob.stat == CONSCIOUS) if(mob.mind.gang_datum == src) - mob << "\icon[tool] [message]" + to_chat(mob, "\icon[tool] [message]") return @@ -206,7 +206,7 @@ gang_outfit = outfit if(gang_outfit) - gangster << "The [src] Gang's influence grows as you wear [gang_outfit]." + to_chat(gangster, "The [src] Gang's influence grows as you wear [gang_outfit].") uniformed ++ //Calculate and report influence growth diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index ab1a91f4e3..a8732c1046 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/code/game/gamemodes/gang/gang_items.dm @@ -22,7 +22,7 @@ var/obj/item/O = new item_path(user.loc) user.put_in_hands(O) if(spawn_msg) - user << spawn_msg + to_chat(user, spawn_msg) /datum/gang_item/proc/can_buy(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool) return gang && (gang.points >= get_cost(user, gang, gangtool)) && can_see(user, gang, gangtool) @@ -92,7 +92,7 @@ /datum/gang_item/function/outfit/spawn_item(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool) if(gang && gang.gang_outfit(user, gangtool)) - user << "Gang Outfits can act as armor with moderate protection against ballistic and melee attacks. Every gangster wearing one will also help grow your gang's influence." + to_chat(user, "Gang Outfits can act as armor with moderate protection against ballistic and melee attacks. Every gangster wearing one will also help grow your gang's influence.") if(gangtool) gangtool.outfits -= 1 @@ -200,7 +200,7 @@ var/obj/item/O = new item_path(user.loc, gang) //we need to override this whole proc for this one argument user.put_in_hands(O) if(spawn_msg) - user << spawn_msg + to_chat(user, spawn_msg) /datum/gang_item/equipment/pen name = "Recruitment Pen" @@ -235,7 +235,7 @@ if(gang && isboss(user, gang)) item_type = /obj/item/device/gangtool/spare/lt if(gang.bosses.len < 3) - user << "Gangtools allow you to promote a gangster to be your Lieutenant, enabling them to recruit and purchase items like you. Simply have them register the gangtool. You may promote up to [3-gang.bosses.len] more Lieutenants" + to_chat(user, "Gangtools allow you to promote a gangster to be your Lieutenant, enabling them to recruit and purchase items like you. Simply have them register the gangtool. You may promote up to [3-gang.bosses.len] more Lieutenants") else item_type = /obj/item/device/gangtool/spare var/obj/item/device/gangtool/spare/tool = new item_type(user.loc) @@ -277,16 +277,16 @@ var/area/usrarea = get_area(user.loc) var/usrturf = get_turf(user.loc) if(initial(usrarea.name) == "Space" || isspaceturf(usrturf) || usr.z != 1) - user << "You can only use this on the station!" + to_chat(user, "You can only use this on the station!") return FALSE for(var/obj/obj in usrturf) if(obj.density) - user << "There's not enough room here!" + to_chat(user, "There's not enough room here!") return FALSE if(!(usrarea.type in gang.territory|gang.territory_new)) - user << "The dominator can be spawned only on territory controlled by your gang!" + to_chat(user, "The dominator can be spawned only on territory controlled by your gang!") return FALSE return ..() diff --git a/code/game/gamemodes/gang/gang_pen.dm b/code/game/gamemodes/gang/gang_pen.dm index 65209cc966..fb7dbf5258 100644 --- a/code/game/gamemodes/gang/gang_pen.dm +++ b/code/game/gamemodes/gang/gang_pen.dm @@ -18,7 +18,7 @@ if(user.mind && (user.mind in ticker.mode.get_gang_bosses())) if(..(M,user,1)) if(cooldown) - user << "[src] needs more time to recharge before it can be used." + to_chat(user, "[src] needs more time to recharge before it can be used.") return if(M.client) M.mind_initialize() //give them a mind datum if they don't have one. @@ -29,9 +29,9 @@ M.Paralyse(5) cooldown(G) if(1) - user << "This mind is resistant to recruitment!" + to_chat(user, "This mind is resistant to recruitment!") else - user << "This mind has already been recruited into a gang!" + to_chat(user, "This mind has already been recruited into a gang!") return ..() @@ -56,4 +56,4 @@ cooldown = 0 icon_state = "pen" var/mob/M = get(src, /mob) - M << "\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again." + to_chat(M, "\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.") diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 5e99870658..423380c809 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -108,7 +108,7 @@ if(!message || !can_use(user)) return if(user.z > 2) - user << "\icon[src]Error: Station out of range." + to_chat(user, "\icon[src]Error: Station out of range.") return var/list/members = list() members += gang.gangsters @@ -129,10 +129,10 @@ var/ping = "[gang.name] [gang_rank]: [message]" for(var/datum/mind/ganger in members) if(ganger.current && (ganger.current.z <= 2) && (ganger.current.stat == CONSCIOUS)) - ganger.current << ping + to_chat(ganger.current, ping) for(var/mob/M in dead_mob_list) var/link = FOLLOW_LINK(M, user) - M << "[link] [ping]" + to_chat(M, "[link] [ping]") log_game("[key_name(user)] Messaged [gang.name] Gang: [message].") @@ -152,53 +152,53 @@ log_game("[key_name(user)] has been promoted to Lieutenant in the [gang.name] Gang") free_pen = 1 gang.message_gangtools("[user] has been promoted to Lieutenant.") - user << "You have been promoted to Lieutenant!" + to_chat(user, "You have been promoted to Lieutenant!") ticker.mode.forge_gang_objectives(user.mind) ticker.mode.greet_gang(user.mind,0) - user << "The Gangtool you registered will allow you to purchase weapons and equipment, and send messages to your gang." - user << "Unlike regular gangsters, you may use recruitment pens to add recruits to your gang. Use them on unsuspecting crew members to recruit them. Don't forget to get your one free pen from the gangtool." + to_chat(user, "The Gangtool you registered will allow you to purchase weapons and equipment, and send messages to your gang.") + to_chat(user, "Unlike regular gangsters, you may use recruitment pens to add recruits to your gang. Use them on unsuspecting crew members to recruit them. Don't forget to get your one free pen from the gangtool.") else - usr << "ACCESS DENIED: Unauthorized user." + to_chat(usr, "ACCESS DENIED: Unauthorized user.") /obj/item/device/gangtool/proc/recall(mob/user) if(!can_use(user)) return 0 if(recalling) - usr << "Error: Recall already in progress." + to_chat(usr, "Error: Recall already in progress.") return 0 gang.message_gangtools("[usr] is attempting to recall the emergency shuttle.") recalling = 1 - loc << "\icon[src]Generating shuttle recall order with codes retrieved from last call signal..." + to_chat(loc, "\icon[src]Generating shuttle recall order with codes retrieved from last call signal...") sleep(rand(100,300)) if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station - user << "\icon[src]Emergency shuttle cannot be recalled at this time." + to_chat(user, "\icon[src]Emergency shuttle cannot be recalled at this time.") recalling = 0 return 0 - loc << "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays..." + to_chat(loc, "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays...") sleep(rand(100,300)) if(!gang.dom_attempts) - user << "\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts." + to_chat(user, "\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") recalling = 0 return 0 var/turf/userturf = get_turf(user) if(userturf.z != 1) //Shuttle can only be recalled while on station - user << "\icon[src]Error: Device out of range of station communication arrays." + to_chat(user, "\icon[src]Error: Device out of range of station communication arrays.") recalling = 0 return 0 var/datum/station_state/end_state = new /datum/station_state() end_state.count() if((100 * start_state.score(end_state)) < 80) //Shuttle cannot be recalled if the station is too damaged - user << "\icon[src]Error: Station communication systems compromised. Unable to establish connection." + to_chat(user, "\icon[src]Error: Station communication systems compromised. Unable to establish connection.") recalling = 0 return 0 - loc << "\icon[src]Comm arrays accessed. Broadcasting recall signal..." + to_chat(loc, "\icon[src]Comm arrays accessed. Broadcasting recall signal...") sleep(rand(100,300)) @@ -210,7 +210,7 @@ if(SSshuttle.cancelEvac(user)) return 1 - loc << "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time." + to_chat(loc, "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.") return 0 /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index dd505013ec..a63901a80e 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -31,10 +31,10 @@ var/turf/T = get_turf(src) if(!istype(T) || T.z != ZLEVEL_STATION) - src << "You cannot activate the doomsday device while off-station!" + to_chat(src, "You cannot activate the doomsday device while off-station!") return - src << "Doomsday device armed." + to_chat(src, "Doomsday device armed.") priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg') set_security_level("delta") nuking = 1 @@ -117,9 +117,9 @@ continue if(issilicon(L)) continue - L << "The blast wave from [src] tears you atom from atom!" + to_chat(L, "The blast wave from [src] tears you atom from atom!") L.dust() - world << "The AI cleansed the station of life with the doomsday device!" + to_chat(world, "The AI cleansed the station of life with the doomsday device!") ticker.force_ending = 1 /datum/AI_Module/large/upgrade_turrets @@ -144,7 +144,7 @@ turret.obj_integrity += 30 turret.lethal_projectile = /obj/item/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR. turret.lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' - src << "Turrets upgraded." + to_chat(src, "Turrets upgraded.") /datum/AI_Module/large/lockdown module_name = "Hostile Station Lockdown" @@ -174,7 +174,7 @@ verbs -= /mob/living/silicon/ai/proc/lockdown minor_announce("Hostile runtime detected in door controllers. Isolation Lockdown protocols are now in effect. Please remain calm.","Network Alert:", 1) - src << "Lockdown Initiated. Network reset in 90 seconds." + to_chat(src, "Lockdown Initiated. Network reset in 90 seconds.") addtimer(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Automatic system reboot complete. Have a secure day.", "Network reset:"), 900) @@ -201,7 +201,7 @@ var/obj/item/weapon/rcd/RCD = I RCD.detonate_pulse() - src << "RCD detonation pulse emitted." + to_chat(src, "RCD detonation pulse emitted.") malf_cooldown = 1 spawn(100) malf_cooldown = 0 @@ -223,7 +223,7 @@ if(stat) 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/large/break_fire_alarms @@ -247,7 +247,7 @@ if(F.z != ZLEVEL_STATION) continue F.emagged = 1 - src << "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized." + to_chat(src, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") src.verbs -= /mob/living/silicon/ai/proc/break_fire_alarms /datum/AI_Module/large/break_air_alarms @@ -271,7 +271,7 @@ if(AA.z != ZLEVEL_STATION) continue AA.emagged = 1 - src << "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode." + to_chat(src, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") src.verbs -= /mob/living/silicon/ai/proc/break_air_alarms /datum/AI_Module/small/overload_machine @@ -295,13 +295,13 @@ if(overload.uses > 0) overload.uses -- M.audible_message("You hear a loud electrical buzzing sound coming from [M]!") - src << "Overloading machine circuitry..." + to_chat(src, "Overloading machine circuitry...") spawn(50) if(M) explosion(get_turf(M), 0,2,3,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" @@ -322,17 +322,17 @@ if (istype(M, /obj/machinery)) if(!M.can_be_overridden()) - src << "Can't override this device." + to_chat(src, "Can't override this device.") for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- M.audible_message("You hear a loud electrical buzzing sound!") - src << "Reprogramming machine behaviour..." + to_chat(src, "Reprogramming machine behaviour...") spawn(50) if(M && !QDELETED(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)" @@ -363,7 +363,7 @@ 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) || !canUseTopic()) @@ -427,8 +427,8 @@ if(prob(30*apc.overload)) apc.overload_lighting() else apc.overload++ - src << "Overcurrent applied to the powernet." - else src << "Out of uses." + 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" @@ -462,10 +462,10 @@ 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 @@ -509,7 +509,7 @@ 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 @@ -604,5 +604,5 @@ if(eyeobj) eyeobj.relay_speech = TRUE - src << "OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online." + to_chat(src, "OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online.") verbs -= /mob/living/silicon/ai/proc/surveillance diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 9fd121a7ba..2e54b3c1e9 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -46,9 +46,9 @@ if(survivors) - world << "The following survived the meteor storm:[text]" + to_chat(world, "The following survived the meteor storm:[text]") else - world << "Nobody survived the meteor storm!" + to_chat(world, "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/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index c54eaf8e30..c1b0998a59 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -19,10 +19,10 @@ var/finished = 0 /datum/game_mode/abduction/announce() - world << "The current game mode is - Abduction!" - world << "There are alien abductors sent to [station_name()] to perform nefarious experiments!" - world << "Abductors - kidnap the crew and replace their organs with experimental ones." - world << "Crew - don't get abducted and stop the abductors." + to_chat(world, "The current game mode is - Abduction!") + to_chat(world, "There are alien abductors sent to [station_name()] to perform nefarious experiments!") + to_chat(world, "Abductors - kidnap the crew and replace their organs with experimental ones.") + to_chat(world, "Crew - don't get abducted and stop the abductors.") /datum/game_mode/abduction/pre_setup() abductor_teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff))) @@ -184,9 +184,9 @@ abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] - abductor.current << "You are an agent of [team_name]!" - abductor.current << "With the help of your teammate, kidnap and experiment on station crew members!" - abductor.current << "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve." + to_chat(abductor.current, "You are an agent of [team_name]!") + to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") + to_chat(abductor.current, "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.") abductor.announce_objectives() @@ -194,9 +194,9 @@ abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] - abductor.current << "You are a scientist of [team_name]!" - abductor.current << "With the help of your teammate, kidnap and experiment on station crew members!" - abductor.current << "Use your tool and ship consoles to support the agent and retrieve human specimens." + to_chat(abductor.current, "You are a scientist of [team_name]!") + to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") + to_chat(abductor.current, "Use your tool and ship consoles to support the agent and retrieve human specimens.") abductor.announce_objectives() @@ -269,9 +269,9 @@ var/datum/objective/objective = team_objectives[team_number] var/team_name = team_names[team_number] if(console.experiment.points >= objective.target_amount) - world << "[team_name] team fulfilled its mission!" + to_chat(world, "[team_name] team fulfilled its mission!") else - world << "[team_name] team failed its mission." + to_chat(world, "[team_name] team failed its mission.") ..() return 1 @@ -289,22 +289,13 @@ text += printplayer(abductee_mind) text += printobjectives(abductee_mind) text += "
" - world << text + to_chat(world, text) //Landmarks // TODO: Split into seperate landmarks for prettier ships /obj/effect/landmark/abductor var/team = 1 -/obj/effect/landmark/abductor/console/New() - var/obj/machinery/abductor/console/c = new /obj/machinery/abductor/console(src.loc) - c.team = team - - spawn(5) // I'd do this properly when i got some time, temporary hack for mappers - c.Setup() - qdel(src) - - /obj/effect/landmark/abductor/agent /obj/effect/landmark/abductor/scientist diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index e45c459448..b5f946b18c 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -56,7 +56,8 @@ M.name_override = disguise.name M.icon = disguise.icon M.icon_state = disguise.icon_state - M.copy_overlays(disguise, TRUE) + M.cut_overlays() + M.add_overlay(disguise.overlays) M.update_inv_hands() /obj/item/clothing/suit/armor/abductor/vest/proc/DeactivateStealth() @@ -91,7 +92,7 @@ /obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline() if(ishuman(loc)) if(combat_cooldown != initial(combat_cooldown)) - loc << "Combat injection is still recharging." + to_chat(loc, "Combat injection is still recharging.") return var/mob/living/carbon/human/M = loc M.adjustStaminaLoss(-75) @@ -109,7 +110,7 @@ /obj/item/device/abductor/proc/AbductorCheck(user) if(isabductor(user)) return TRUE - user << "You can't figure how this works!" + to_chat(user, "You can't figure how this works!") return FALSE /obj/item/device/abductor/proc/ScientistCheck(user) @@ -132,7 +133,7 @@ if(!AbductorCheck(user)) return if(!ScientistCheck(user)) - user << "You're not trained to use this!" + to_chat(user, "You're not trained to use this!") return if(mode == GIZMO_SCAN) mode = GIZMO_MARK @@ -140,13 +141,13 @@ else mode = GIZMO_SCAN icon_state = "gizmo_scan" - user << "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE" + to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") /obj/item/device/abductor/gizmo/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) return if(!ScientistCheck(user)) - user << "You're not trained to use this" + to_chat(user, "You're not trained to use this") return switch(mode) if(GIZMO_SCAN) @@ -161,7 +162,7 @@ if(!AbductorCheck(user)) return if(!ScientistCheck(user)) - user << "You're not trained to use this" + to_chat(user, "You're not trained to use this") return switch(mode) if(GIZMO_SCAN) @@ -173,16 +174,16 @@ if(ishuman(target)) if(console!=null) console.AddSnapshot(target) - user << "You scan [target] and add them to the database." + to_chat(user, "You scan [target] and add them to the database.") /obj/item/device/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) - user << "This specimen is already marked!" + to_chat(user, "This specimen is already marked!") return if(ishuman(target)) if(isabductor(target)) marked = target - user << "You mark [target] for future retrieval." + to_chat(user, "You mark [target] for future retrieval.") else prepare(target,user) else @@ -190,12 +191,12 @@ /obj/item/device/abductor/gizmo/proc/prepare(atom/target, mob/living/user) if(get_dist(target,user)>1) - user << "You need to be next to the specimen to prepare it for transport!" + to_chat(user, "You need to be next to the specimen to prepare it for transport!") return - user << "You begin preparing [target] for transport..." + to_chat(user, "You begin preparing [target] for transport...") if(do_after(user, 100, target = target)) marked = target - user << "You finish preparing [target] for transport." + to_chat(user, "You finish preparing [target] for transport.") /obj/item/device/abductor/silencer @@ -228,7 +229,7 @@ for(M in view(2,targloc)) if(M == user) continue - user << "You silence [M]'s radio devices." + to_chat(user, "You silence [M]'s radio devices.") radio_off_mob(M) /obj/item/device/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) @@ -322,7 +323,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) txt = "probing" - usr << "You switch the baton to [txt] mode." + to_chat(usr, "You switch the baton to [txt] mode.") update_icon() /obj/item/weapon/abductor_baton/update_icon() @@ -401,7 +402,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} add_logs(user, L, "put to sleep") else L.drowsyness += 1 - user << "Sleep inducement works fully only on stunned specimens! " + to_chat(user, "Sleep inducement works fully only on stunned specimens! ") L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ "You suddenly feel drowsy!") @@ -418,12 +419,12 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(C) C.update_handcuffed() - user << "You handcuff [C]." + to_chat(user, "You handcuff [C].") add_logs(user, C, "handcuffed") else - user << "You fail to handcuff [C]." + to_chat(user, "You fail to handcuff [C].") else - user << "[C] doesn't have two hands..." + to_chat(user, "[C] doesn't have two hands...") /obj/item/weapon/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) L.visible_message("[user] probes [L] with [src]!", \ @@ -443,8 +444,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} else helptext = "Subject suitable for experiments." - user << "Probing result:[species]" - user << "[helptext]" + to_chat(user, "Probing result:[species]") + to_chat(user, "[helptext]") /obj/item/weapon/restraints/handcuffs/energy name = "hard-light energy field" @@ -476,7 +477,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_CUFF) user <<"The baton is in restraining mode." if(BATON_PROBE) - user << "The baton is in probing mode." + to_chat(user, "The baton is in probing mode.") /obj/item/weapon/scalpel/alien @@ -550,7 +551,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/structure/table_frame/abductor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) - user << "You start disassembling [src]..." + to_chat(user, "You start disassembling [src]...") playsound(src.loc, I.usesound, 50, 1) if(do_after(user, 30*I.toolspeed, target = src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -561,9 +562,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(istype(I, /obj/item/stack/sheet/mineral/abductor)) var/obj/item/stack/sheet/P = I if(P.get_amount() < 1) - user << "You need one alien alloy sheet to do this!" + to_chat(user, "You need one alien alloy sheet to do this!") return - user << "You start adding [P] to [src]..." + to_chat(user, "You start adding [P] to [src]...") if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/abductor(src.loc) @@ -572,10 +573,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(istype(I, /obj/item/stack/sheet/mineral/silver)) var/obj/item/stack/sheet/P = I if(P.get_amount() < 1) - user << "You need one sheet of silver to do \ - this!" + to_chat(user, "You need one sheet of silver to do this!") return - user << "You start adding [P] to [src]..." + to_chat(user, "You start adding [P] to [src]...") if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/optable/abductor(src.loc) @@ -612,7 +612,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} . = ..() if(iscarbon(AM)) START_PROCESSING(SSobj, src) - AM << "You feel a series of tiny pricks!" + to_chat(AM, "You feel a series of tiny pricks!") /obj/structure/table/optable/abductor/process() . = PROCESS_KILL @@ -654,7 +654,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(do_after(user, 40*W.toolspeed, target = src)) if( !WT.isOn() ) return - user << "You disassemble the airlock assembly." + to_chat(user, "You disassemble the airlock assembly.") new /obj/item/stack/sheet/mineral/abductor(get_turf(src), 4) qdel(src) else diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm index e888e2884c..4ca4e47a5b 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm @@ -36,7 +36,7 @@ IC.Remove(target) return 1 else - user << "You don't find anything in [target]'s [target_zone]!" + to_chat(user, "You don't find anything in [target]'s [target_zone]!") return 1 /datum/surgery_step/gland_insert diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 925f071f46..0a5b471f1c 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -62,7 +62,7 @@ icon_state = "health" /obj/item/organ/heart/gland/heals/activate() - owner << "You feel curiously revitalized." + to_chat(owner, "You feel curiously revitalized.") owner.adjustBruteLoss(-20) owner.adjustOxyLoss(-20) owner.adjustFireLoss(-20) @@ -74,7 +74,7 @@ icon_state = "slime" /obj/item/organ/heart/gland/slime/activate() - owner << "You feel nauseous!" + to_chat(owner, "You feel nauseous!") owner.vomit(20) var/mob/living/simple_animal/slime/Slime @@ -90,13 +90,13 @@ icon_state = "mindshock" /obj/item/organ/heart/gland/mindshock/activate() - owner << "You get a headache." + to_chat(owner, "You get a headache.") var/turf/T = get_turf(owner) for(var/mob/living/carbon/H in orange(4,T)) if(H == owner) continue - H << "You hear a buzz in your head." + to_chat(H, "You hear a buzz in your head.") H.confused += 20 /obj/item/organ/heart/gland/pop @@ -107,7 +107,7 @@ icon_state = "species" /obj/item/organ/heart/gland/pop/activate() - owner << "You feel unlike yourself." + to_chat(owner, "You feel unlike yourself.") var/species = pick(list(/datum/species/lizard,/datum/species/jelly/slime,/datum/species/pod,/datum/species/fly,/datum/species/jelly)) owner.set_species(species) @@ -119,7 +119,7 @@ icon_state = "vent" /obj/item/organ/heart/gland/ventcrawling/activate() - owner << "You feel very stretchy." + to_chat(owner, "You feel very stretchy.") owner.ventcrawler = VENTCRAWLER_ALWAYS @@ -130,7 +130,7 @@ icon_state = "viral" /obj/item/organ/heart/gland/viral/activate() - owner << "You feel sick." + to_chat(owner, "You feel sick.") var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/magnitis) var/datum/disease/D = new virus_type() D.carrier = 1 @@ -148,7 +148,7 @@ icon_state = "emp" /obj/item/organ/heart/gland/emp/activate() - owner << "You feel a spike of pain in your head." + to_chat(owner, "You feel a spike of pain in your head.") empulse(get_turf(owner), 2, 5, 1) /obj/item/organ/heart/gland/spiderman @@ -158,7 +158,7 @@ icon_state = "spider" /obj/item/organ/heart/gland/spiderman/activate() - owner << "You feel something crawling in your skin." + to_chat(owner, "You feel something crawling in your skin.") owner.faction |= "spiders" new /obj/structure/spider/spiderling(owner.loc) @@ -169,7 +169,7 @@ icon_state = "egg" /obj/item/organ/heart/gland/egg/activate() - owner << "You lay an egg!" + to_chat(owner, "You lay an egg!") var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(owner.loc) egg.reagents.add_reagent("sacid",20) egg.desc += " It smells bad." @@ -197,7 +197,7 @@ uses = 1 /obj/item/organ/heart/gland/bodysnatch/activate() - owner << "You feel something moving around inside you..." + to_chat(owner, "You feel something moving around inside you...") //spawn cocoon with clone greytide snpc inside if(ishuman(owner)) var/obj/structure/spider/cocoon/abductor/C = new (get_turf(owner)) @@ -239,10 +239,10 @@ uses = -1 /obj/item/organ/heart/gland/plasma/activate() - owner << "You feel bloated." + to_chat(owner, "You feel bloated.") sleep(150) if(!owner) return - owner << "A massive stomachache overcomes you." + to_chat(owner, "A massive stomachache overcomes you.") sleep(50) if(!owner) return owner.visible_message("[owner] vomits a cloud of plasma!") diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index c4ee16d36f..8c4f390f77 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -4,18 +4,6 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/team = 0 -/obj/machinery/abductor/proc/IsAgent(mob/living/carbon/human/H) - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - return S.agent - return 0 - -/obj/machinery/abductor/proc/IsScientist(mob/living/carbon/human/H) - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - return S.scientist - return 0 - //Console /obj/machinery/abductor/console @@ -23,8 +11,8 @@ desc = "Ship command center." icon = 'icons/obj/abductor.dmi' icon_state = "console" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/obj/item/device/abductor/gizmo/gizmo var/obj/item/clothing/suit/armor/abductor/vest/vest var/obj/machinery/abductor/experiment/experiment @@ -36,7 +24,7 @@ if(..()) return if(!isabductor(user)) - user << "You start mashing alien buttons at random!" + to_chat(user, "You start mashing alien buttons at random!") if(do_after(user,100, target = src)) TeleporterSend() return @@ -86,7 +74,6 @@ dat += "NO AGENT VEST DETECTED" var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() /obj/machinery/abductor/console/Topic(href, href_list) @@ -116,7 +103,7 @@ Dispense(/obj/item/device/abductor/gizmo) if("vest") Dispense(/obj/item/clothing/suit/armor/abductor/vest) - src.updateUsrDialog() + updateUsrDialog() /obj/machinery/abductor/console/proc/TeleporterRetrieve() @@ -131,30 +118,29 @@ if(vest!=null) vest.flip_mode() -/obj/machinery/abductor/console/proc/SelectDisguise(remote=0) - var/list/entries = list() - var/tempname - var/datum/icon_snapshot/temp - for(var/i = 1; i <= disguises.len; i++) - temp = disguises[i] - tempname = temp.name - entries["[tempname]"] = disguises[i] - var/entry_name = input( "Choose Disguise", "Disguise") in entries - var/datum/icon_snapshot/chosen = entries[entry_name] +/obj/machinery/abductor/console/proc/SelectDisguise(remote = 0) + var/entry_name = input( "Choose Disguise", "Disguise") as null|anything in disguises + var/datum/icon_snapshot/chosen = disguises[entry_name] if(chosen && (remote || in_range(usr,src))) vest.SetDisguise(chosen) /obj/machinery/abductor/console/proc/SetDroppoint(turf/open/location,user) if(!istype(location)) - user << "That place is not safe for the specimen." + to_chat(user, "That place is not safe for the specimen.") return if(pad) pad.teleport_target = location - user << "Location marked as test subject release point." + to_chat(user, "Location marked as test subject release point.") -/obj/machinery/abductor/console/proc/Setup() +/obj/machinery/abductor/console/Initialize(mapload) + if(mapload) + return TRUE //wait for machines list + ..() + + if(!team) + return for(var/obj/machinery/abductor/pad/p in machines) if(p.team == team) @@ -177,22 +163,21 @@ entry.icon = target.icon entry.icon_state = target.icon_state entry.overlays = target.get_overlays_copy(list(HANDS_LAYER)) //ugh - for(var/i=1,i<=disguises.len,i++) - var/datum/icon_snapshot/temp = disguises[i] - if(temp.name == entry.name) - disguises[i] = entry - return - disguises.Add(entry) + //Update old disguise instead of adding new one + if(disguises[entry.name]) + disguises[entry.name] = entry + return + disguises[entry.name] = entry /obj/machinery/abductor/console/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/device/abductor/gizmo)) var/obj/item/device/abductor/gizmo/G = O - user << "You link the tool to the console." + to_chat(user, "You link the tool to the console.") gizmo = G G.console = src else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest)) var/obj/item/clothing/suit/armor/abductor/vest/V = O - user << "You link the vest to the console." + to_chat(user, "You link the vest to the console.") if(istype(vest)) if(vest.flags & NODROP) toggle_vest() @@ -208,7 +193,7 @@ flick("alien-pad", pad) new item(pad.loc) else - new item(src.loc) + new item(loc) else say("Insufficent data!") @@ -216,5 +201,4 @@ vest.flags ^= NODROP var/mob/M = vest.loc if(istype(M)) - M << "[src] is now \ - [vest.flags & NODROP ? "locked" : "unlocked"]." + to_chat(M, "[src] is now [vest.flags & NODROP ? "locked" : "unlocked"].") diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 5894c4d98b..d006ba0f68 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -55,7 +55,6 @@ var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) popup.add_head_content(box_css) popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() return @@ -77,7 +76,7 @@ if(href_list["dispense"]) Dispense(text2num(href_list["dispense"])) - src.updateUsrDialog() + updateUsrDialog() /obj/machinery/abductor/gland_dispenser/proc/Dispense(count) if(amounts[count]>0) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index c82a72631e..e4392b507d 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -46,7 +46,7 @@ var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)" + to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)") user.visible_message("You hear a metallic creaking from [src]!") if(do_after(user,(breakout_time), target = src)) @@ -54,7 +54,7 @@ return visible_message("[user] successfully broke out of [src]!") - user << "You successfully break out of [src]!" + to_chat(user, "You successfully break out of [src]!") open_machine() @@ -171,13 +171,13 @@ sleep(5) switch(text2num(type)) if(1) - H << "You feel violated." + to_chat(H, "You feel violated.") if(2) - H << "You feel yourself being sliced apart and put back together." + to_chat(H, "You feel yourself being sliced apart and put back together.") if(3) - H << "You feel intensely watched." + to_chat(H, "You feel intensely watched.") sleep(5) - H << "Your mind snaps!" + to_chat(H, "Your mind snaps!") var/objtype = pick(subtypesof(/datum/objective/abductee/)) var/datum/objective/abductee/O = new objtype() ticker.mode.abductees += H.mind diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm index 10d22d43c1..57301ee319 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm @@ -17,6 +17,8 @@ for(var/mob/living/target in loc) target.forceMove(teleport_target) new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir) + to_chat(target, "The instability of the warp leaves you disoriented!") + target.Stun(3) /obj/machinery/abductor/pad/proc/Retrieve(mob/living/target) flick("alien-pad", src) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 409ab597b9..a4dda8145f 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -6,7 +6,7 @@ if(client) if(client.prefs.muted & MUTE_IC) - src << "You cannot speak in IC (muted)." + to_chat(src, "You cannot speak in IC (muted).") return if(client.handle_spam_prevention(message,MUTE_IC)) return @@ -21,14 +21,14 @@ return say_dead(message) var/mob/living/simple_animal/borer/B = loc - src << "You whisper silently, \"[message]\"" - B.victim << "The captive mind of [src] whispers, \"[message]\"" + to_chat(src, "You whisper silently, \"[message]\"") + to_chat(B.victim, "The captive mind of [src] whispers, \"[message]\"") for (var/mob/M in player_list) if(isnewplayer(M)) continue else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS) - M << "Thought-speech, [src] -> [B.truename]: [message]" + to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") /mob/living/captive_brain/emote(var/message) return @@ -37,8 +37,8 @@ var/mob/living/simple_animal/borer/B = loc - src << "You begin doggedly resisting the parasite's control (this will take approximately 40 seconds)." - B.victim << "You feel the captive mind of [src] begin to resist your control." + to_chat(src, "You begin doggedly resisting the parasite's control (this will take approximately 40 seconds).") + to_chat(B.victim, "You feel the captive mind of [src] begin to resist your control.") var/delay = rand(150,250) + B.victim.brainloss addtimer(CALLBACK(src, .proc/return_control, src.loc), delay) @@ -48,8 +48,8 @@ return B.victim.adjustBrainLoss(rand(5,10)) - src << "With an immense exertion of will, you regain control of your body!" - B.victim << "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(src, "With an immense exertion of will, you regain control of your body!") + to_chat(B.victim, "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() var/list/mob/living/simple_animal/borer/borers = list() @@ -110,8 +110,8 @@ var/total_borer_hosts_needed = 10 var/datum/action/innate/borer/punish_victim/punish_victim_action = new var/datum/action/innate/borer/jumpstart_host/jumpstart_host_action = new -/mob/living/simple_animal/borer/New(atom/newloc, var/gen=1) - ..(newloc) +/mob/living/simple_animal/borer/Initialize(mapload, gen=1) + ..() generation = gen notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) real_name = "Cortical Borer [rand(1000,9999)]" @@ -128,8 +128,6 @@ var/total_borer_hosts_needed = 10 //borer_chems += /datum/borer_chem/creagent borer_chems += /datum/borer_chem/ethanol borer_chems += /datum/borer_chem/rezadone - borer_chems += /datum/borer_chem/aphrodisiac - borer_chems += /datum/borer_chem/anaphrodisiac borers += src @@ -169,11 +167,11 @@ var/total_borer_hosts_needed = 10 set desc = "Send a silent message to your host." if(!victim) - src << "You do not have a host to communicate with!" + to_chat(src, "You do not have a host to communicate with!") return if(stat) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", null) @@ -183,14 +181,14 @@ var/total_borer_hosts_needed = 10 if(src && !QDELETED(src) && !QDELETED(victim)) var/say_string = (docile) ? "slurs" :"states" if(victim) - victim << "[truename] [say_string]: [input]" + to_chat(victim, "[truename] [say_string]: [input]") log_say("Borer Communication: [key_name(src)] -> [key_name(victim)] : [input]") for(var/M in dead_mob_list) if(isobserver(M)) var/rendered = "Borer Communication from [truename] : [input]" var/link = FOLLOW_LINK(M, src) - M << "[link] [rendered]" - src << "[truename] [say_string]: [input]" + to_chat(M, "[link] [rendered]") + to_chat(src, "[truename] [say_string]: [input]") victim.verbs += /mob/living/proc/borer_comm talk_to_borer_action.Grant(victim) @@ -208,15 +206,15 @@ var/total_borer_hosts_needed = 10 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(isobserver(M)) var/rendered = "Borer Communication from [src] : [input]" var/link = FOLLOW_LINK(M, src) - M << "[link] [rendered]" - src << "[src] says: [input]" + to_chat(M, "[link] [rendered]") + to_chat(src, "[src] says: [input]") /mob/living/proc/trapped_mind_comm() set name = "Converse with Trapped Mind" @@ -232,15 +230,15 @@ var/total_borer_hosts_needed = 10 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(isobserver(M)) var/rendered = "Borer Communication from [B] : [input]" var/link = FOLLOW_LINK(M, src) - M << "[link] [rendered]" - src << "[B.truename] says: [input]" + to_chat(M, "[link] [rendered]") + to_chat(src, "[B.truename] says: [input]") /mob/living/simple_animal/borer/Life() @@ -260,9 +258,9 @@ var/total_borer_hosts_needed = 10 if(victim.reagents.has_reagent("sugar")) if(!docile || waketimerid) if(controlling) - victim << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(victim, "You feel the soporific flow of sugar in your host's blood, lulling you into docility.") else - src << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(src, "You feel the soporific flow of sugar in your host's blood, lulling you into docility.") if(waketimerid) deltimer(waketimerid) waketimerid = null @@ -270,15 +268,15 @@ var/total_borer_hosts_needed = 10 else if(docile && !waketimerid) if(controlling) - victim << "You start shaking off your lethargy as the sugar leaves your host's blood. This will take about 10 seconds..." + to_chat(victim, "You start shaking off your lethargy as the sugar leaves your host's blood. This will take about 10 seconds...") else - src << "You start shaking off your lethargy as the sugar leaves your host's blood. This will take about 10 seconds..." + to_chat(src, "You start shaking off your lethargy as the sugar leaves your host's blood. This will take about 10 seconds...") waketimerid = addtimer(CALLBACK(src, "wakeup"), 10, TIMER_STOPPABLE) if(controlling) if(docile) - victim << "You are feeling far too docile to continue controlling your host..." + to_chat(victim, "You are feeling far too docile to continue controlling your host...") victim.release_control() return @@ -290,9 +288,9 @@ var/total_borer_hosts_needed = 10 /mob/living/simple_animal/borer/proc/wakeup() if(controlling) - victim << "You finish shaking off your lethargy." + to_chat(victim, "You finish shaking off your lethargy.") else - src << "You finish shaking off your lethargy." + to_chat(src, "You finish shaking off your lethargy.") docile = FALSE if(waketimerid) waketimerid = null @@ -301,12 +299,12 @@ var/total_borer_hosts_needed = 10 if(dd_hasprefix(message, ";")) message = copytext(message,2) for(var/borer in borers) - borer << "Cortical Link: [truename] sings, \"[message]\"" - for(var/mob/dead in dead_mob_list) - dead << "Cortical Link: [truename] sings, \"[message]\"" + to_chat(borer, "Cortical Link: [truename] sings, \"[message]\"") + for(var/mob/D in dead_mob_list) + to_chat(D, "Cortical Link: [truename] sings, \"[message]\"") return if(!victim) - src << "You cannot speak without a host!" + to_chat(src, "You cannot speak without a host!") return if(message == "") return @@ -328,7 +326,7 @@ var/total_borer_hosts_needed = 10 set desc = "Infest a suitable humanoid host." if(victim) - src << "You are already within a host." + to_chat(src, "You are already within a host.") if(stat == DEAD) return @@ -346,16 +344,16 @@ var/total_borer_hosts_needed = 10 return FALSE if(stat != CONSCIOUS) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return FALSE if(H.has_brain_worms()) - src << "[victim] is already infested!" + to_chat(src, "[victim] is already infested!") return - src << "You slither up [H] and begin probing at their ear canal..." + to_chat(src, "You slither up [H] and begin probing at their ear canal...") if(!do_mob(src, H, 30)) - src << "As [H] moves away, you are dislodged and fall to the ground." + to_chat(src, "As [H] moves away, you are dislodged and fall to the ground.") return if(!H || !src) @@ -369,15 +367,15 @@ var/total_borer_hosts_needed = 10 return if(C.has_brain_worms()) - src << "[C] is already infested!" + to_chat(src, "[C] is already infested!") return if(!C.key || !C.mind) - src << "[C]'s mind seems unresponsive. Try someone else!" + to_chat(src, "[C]'s mind seems unresponsive. Try someone else!") return if(C && C.dna && istype(C.dna.species, /datum/species/skeleton)) - src << "[C] does not possess the vital systems needed to support us." + to_chat(src, "[C] does not possess the vital systems needed to support us.") return victim = C @@ -394,14 +392,14 @@ var/total_borer_hosts_needed = 10 set desc = "Push some chemicals into your host's bloodstream." if(!victim) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat != CONSCIOUS) - src << "You cannot secrete chemicals in your current state." + to_chat(src, "You cannot secrete chemicals in your current state.") if(docile) - src << "You are feeling far too docile to do that." + to_chat(src, "You are feeling far too docile to do that.") return var content = "" @@ -429,7 +427,7 @@ var/total_borer_hosts_needed = 10 set desc = "Become invisible to the common eye." if(victim) - src << "You cannot do this while you're inside a host." + to_chat(src, "You cannot do this while you're inside a host.") if(stat != CONSCIOUS) return @@ -451,15 +449,15 @@ var/total_borer_hosts_needed = 10 set desc = "Freeze the limbs of a potential host with supernatural fear." if(world.time - used_dominate < 150) - src << "You cannot use that ability again so soon." + to_chat(src, "You cannot use that ability again so soon.") return if(victim) - src << "You cannot do that from within a host body." + to_chat(src, "You cannot do that from within a host body.") return if(stat != CONSCIOUS) - 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() @@ -476,13 +474,13 @@ var/total_borer_hosts_needed = 10 return if(M.has_brain_worms()) - src << "You cannot paralyze someone who is already infested!" + to_chat(src, "You cannot paralyze someone who is already infested!") return layer = MOB_LAYER - src << "You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread." - M << "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing." + to_chat(src, "You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.") + to_chat(M, "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.") M.Stun(3) used_dominate = world.time @@ -493,21 +491,21 @@ var/total_borer_hosts_needed = 10 set desc = "Slither out of your host." if(!victim) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat != CONSCIOUS) - src << "You cannot leave your host in your current state." + to_chat(src, "You cannot leave your host in your current state.") if(leaving) leaving = FALSE - src << "You decide against leaving your host." + to_chat(src, "You decide against leaving your host.") return - src << "You begin disconnecting from [victim]'s synapses and prodding at their internal ear canal." + to_chat(src, "You begin disconnecting from [victim]'s synapses and prodding at their internal ear canal.") if(victim.stat != DEAD) - victim << "An odd, uncomfortable pressure begins to build inside your skull, behind your ear..." + to_chat(victim, "An odd, uncomfortable pressure begins to build inside your skull, behind your ear...") leaving = TRUE @@ -522,13 +520,13 @@ var/total_borer_hosts_needed = 10 return if(stat != CONSCIOUS) - src << "You cannot release your host in your current state." + to_chat(src, "You cannot release your host in your current state.") return - src << "You wiggle out of [victim]'s ear and plop to the ground." + to_chat(src, "You wiggle out of [victim]'s ear and plop to the ground.") if(victim.mind) - victim << "Something slimy wiggles out of your ear and plops to the ground!" - victim << "As though waking from a dream, you shake off the insidious mind control of the brain worm. Your thoughts are your own again." + to_chat(victim, "Something slimy wiggles out of your ear and plops to the ground!") + to_chat(victim, "As though waking from a dream, you shake off the insidious mind control of the brain worm. Your thoughts are your own again.") leaving = FALSE @@ -564,19 +562,19 @@ var/total_borer_hosts_needed = 10 set desc = "Bring your host back to life." if(!victim) - src << "You need a host to be able to use this." + to_chat(src, "You need a host to be able to use this.") return if(docile) - src << "You are feeling too docile to use this!" + to_chat(src, "You are feeling too docile to use this!") return if(victim.stat != DEAD) - src << "Your host is already alive!" + to_chat(src, "Your host is already alive!") return if(chemicals < 250) - src << "You need 250 chemicals to use this!" + to_chat(src, "You need 250 chemicals to use this!") return if(victim.stat == DEAD) @@ -597,7 +595,7 @@ var/total_borer_hosts_needed = 10 victim.revive() log_game("[src]/([src.ckey]) has revived [victim]/([victim.ckey]") chemicals -= 250 - src << "You send a jolt of energy to your host, reviving them!" + to_chat(src, "You send a jolt of energy to your host, reviving them!") victim.grab_ghost(force = TRUE) //brings the host back, no eggscape victim <<"You bolt upright, gasping for breath!" @@ -607,27 +605,27 @@ var/total_borer_hosts_needed = 10 set desc = "Fully connect to the brain of your host." if(!victim) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat != CONSCIOUS) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return if(docile) - src << "You are feeling far too docile to do that." + to_chat(src, "You are feeling far too docile to do that.") return if(victim.stat == DEAD) - src << "This host lacks enough brain function to control." + to_chat(src, "This host lacks enough brain function to control.") return if(bonding) bonding = FALSE - src << "You stop attempting to take control of your host." + to_chat(src, "You stop attempting to take control of your host.") 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...") if(QDELETED(src) || QDELETED(victim)) return @@ -646,14 +644,14 @@ var/total_borer_hosts_needed = 10 src <<"You are feeling far too docile to do that." return if(is_servant_of_ratvar(victim) || iscultist(victim) || victim.isloyal()) - src << "[victim]'s mind seems to be blocked by some unknown force!" + to_chat(src, "[victim]'s mind seems to be blocked by some unknown force!") return else log_game("[src]/([src.ckey]) assumed control of [victim]/([victim.ckey] with borer powers.") - src << "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." - victim << "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." + to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.") + to_chat(victim, "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") // host -> brain var/h2b_id = victim.computer_id @@ -677,7 +675,7 @@ var/total_borer_hosts_needed = 10 if(!host_brain.lastKnownIP) host_brain.lastKnownIP = h2b_ip - host_brain << "You are trapped in your own mind. You feel that there must be a way to resist!" + to_chat(host_brain, "You are trapped in your own mind. You feel that there must be a way to resist!") // self -> host var/s2h_id = src.computer_id @@ -712,19 +710,19 @@ var/total_borer_hosts_needed = 10 set desc = "Punish your victim." if(!victim) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") return if(stat != CONSCIOUS) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") return if(docile) - src << "You are feeling far too docile to do that." + to_chat(src, "You are feeling far too docile to do that.") return if(chemicals < 75) - src << "You need 75 chems to punish your host." + to_chat(src, "You need 75 chems to punish your host.") return var/punishment = input("Select a punishment:.", "Punish") as null|anything in list("Blindness","Deafness","Stun") @@ -733,7 +731,7 @@ var/total_borer_hosts_needed = 10 return if(chemicals < 75) - src << "You need 75 chems to punish your host." + to_chat(src, "You need 75 chems to punish your host.") return switch(punishment) //Hardcoding this stuff. @@ -757,7 +755,7 @@ var/total_borer_hosts_needed = 10 var/mob/living/simple_animal/borer/B = has_brain_worms() if(B && B.host_brain) - src << "You withdraw your probosci, releasing control of [B.host_brain]" + to_chat(src, "You withdraw your probosci, releasing control of [B.host_brain]") B.detatch() @@ -778,7 +776,7 @@ var/total_borer_hosts_needed = 10 var/mob/living/simple_animal/borer/B = has_brain_worms() if(isbrain(src)) - src << "You need a mouth to be able to do this." + to_chat(src, "You need a mouth to be able to do this.") return if(!B) return @@ -792,7 +790,7 @@ var/total_borer_hosts_needed = 10 new /mob/living/simple_animal/borer(get_turf(src), B.generation + 1) log_game("[src]/([src.ckey]) has spawned a new borer via reproducing.") else - src << "You need 200 chemicals stored to reproduce." + to_chat(src, "You need 200 chemicals stored to reproduce.") return @@ -810,11 +808,11 @@ var/total_borer_hosts_needed = 10 if(mind) mind.store_memory("You must escape with at least [total_borer_hosts_needed] borers with hosts on the shuttle.") - src << "You are a cortical borer!" - src << "You are a brain slug that worms its way into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, your host and your eventual spawn safe and warm." - src << "Sugar nullifies your abilities, avoid it at all costs!" - src << "You can speak to your fellow borers by prefixing your messages with ';'. Check out your Borer tab to see your abilities." - src << "You must escape with at least [total_borer_hosts_needed] borers with hosts on the shuttle. To reproduce you must have 100 chemicals and be controlling a host." + to_chat(src, "You are a cortical borer!") + to_chat(src, "You are a brain slug that worms its way into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, your host and your eventual spawn safe and warm.") + to_chat(src, "Sugar nullifies your abilities, avoid it at all costs!") + to_chat(src, "You can speak to your fellow borers by prefixing your messages with ';'. Check out your Borer tab to see your abilities.") + to_chat(src, "You must escape with at least [total_borer_hosts_needed] borers with hosts on the shuttle. To reproduce you must have 100 chemicals and be controlling a host.") /mob/living/simple_animal/borer/proc/detatch() if(!victim || !controlling) diff --git a/code/game/gamemodes/miniantags/borer/borer_chemicals.dm b/code/game/gamemodes/miniantags/borer/borer_chemicals.dm index 7525873888..c45de46524 100644 --- a/code/game/gamemodes/miniantags/borer/borer_chemicals.dm +++ b/code/game/gamemodes/miniantags/borer/borer_chemicals.dm @@ -4,14 +4,6 @@ var/chemuse = 30 var/quantity = 10 -/datum/borer_chem/aphrodisiac - chemname = "aphro" - chem_desc = "Increases arousal in host, if they're not in the mood yet." - -/datum/borer_chem/anaphrodisiac - chemname = "anaphro" - chem_desc = "Decreases arousal in host, if they're getting a bit too frisky." - /datum/borer_chem/epinephrine chemname = "epinephrine" chem_desc = "Stabilizes critical condition and slowly restores oxygen damage. If overdosed, it will deal toxin and oxyloss damage." diff --git a/code/game/gamemodes/miniantags/borer/borer_topic.dm b/code/game/gamemodes/miniantags/borer/borer_topic.dm index c9c3c055a7..b373a1c025 100644 --- a/code/game/gamemodes/miniantags/borer/borer_topic.dm +++ b/code/game/gamemodes/miniantags/borer/borer_topic.dm @@ -24,10 +24,10 @@ return if(chemicals < C.chemuse) - src << "You need [C.chemuse] chemicals stored to use this chemical!" + to_chat(src, "You need [C.chemuse] chemicals stored to use this chemical!") return - src << "You squirt a measure of [C.chemname] from your reservoirs into [victim]'s bloodstream." + to_chat(src, "You squirt a measure of [C.chemname] from your reservoirs into [victim]'s bloodstream.") victim.reagents.add_reagent(C.chemname, C.quantity) chemicals -= C.chemuse log_game("[src]/([src.ckey]) has injected [C.chemname] into their host [victim]/([victim.ckey])") diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 2a86b4766f..36c9fe01ea 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -8,7 +8,7 @@ materials = list(MAT_METAL=10000, MAT_GLASS=4000) -/obj/item/device/unactivated_swarmer/New() +/obj/item/device/unactivated_swarmer/Initialize() if(!crit_fail) notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) ..() @@ -31,17 +31,17 @@ /obj/item/device/unactivated_swarmer/attack_ghost(mob/user) if(crit_fail) - user << "This swarmer shell is completely depowered. You cannot activate it." + to_chat(user, "This swarmer shell is completely depowered. You cannot activate it.") return var/be_swarmer = alert("Become a swarmer? (Warning, You can no longer be cloned!)",,"Yes","No") if(be_swarmer == "No") return if(crit_fail) - user << "Swarmer has been depowered." + to_chat(user, "Swarmer has been depowered.") 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 @@ -88,7 +88,7 @@ attacktext = "shocks" attack_sound = 'sound/effects/EMPulse.ogg' friendly = "pinches" - speed = 0 + speed = 1 faction = list("swarmer") AIStatus = AI_OFF pass_flags = PASSTABLE @@ -101,6 +101,7 @@ loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/weapon/ore/bluespace_crystal) del_on_death = 1 deathmessage = "explodes with a sharp pop!" + light_color = LIGHT_COLOR_CYAN var/resources = 0 //Resource points, generated by consuming metal/glass var/max_resources = 100 var/login_text_dump = {" @@ -115,9 +116,9 @@ /mob/living/simple_animal/hostile/swarmer/Login() ..() - src << login_text_dump + to_chat(src, login_text_dump) -/mob/living/simple_animal/hostile/swarmer/New() +/mob/living/simple_animal/hostile/swarmer/Initialize() ..() verbs -= /mob/living/verb/pulled var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] @@ -268,7 +269,7 @@ var/isonshuttle = istype(get_area(src), /area/shuttle) for(var/turf/T in range(1, src)) if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) - 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.") S.target = null return FALSE S.DisIntegrate(src) @@ -300,62 +301,62 @@ return TRUE /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.") return FALSE /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.") return FALSE /obj/machinery/dominator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This device is attempting to corrupt our entire network; attempting to interact with it is too risky. Aborting." + to_chat(S, "This device is attempting to corrupt our entire network; attempting to interact with it is too risky. Aborting.") return FALSE /obj/effect/decal/cleanable/crayon/gang/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.") return FALSE /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.") return FALSE /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.") return FALSE /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.") return FALSE /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.") return FALSE /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.") return FALSE /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.") return FALSE /obj/machinery/deepfryer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting." + to_chat(S, "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.") return FALSE /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.") return FALSE /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.") return FALSE /turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(loc, /area/shuttle) for(var/turf/T in range(1, src)) if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) - 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.") S.target = null return TRUE return ..() @@ -364,17 +365,17 @@ var/isonshuttle = istype(get_area(src), /area/shuttle) for(var/turf/T in range(1, src)) if(isspaceturf(T) || (!isonshuttle && (istype(T.loc, /area/shuttle) || istype(T.loc, /area/space))) || (isonshuttle && !istype(T.loc, /area/shuttle))) - 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.") S.target = null return TRUE 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.") return FALSE /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.") return FALSE /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -382,15 +383,15 @@ return TRUE /mob/living/simple_animal/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.") return FALSE /obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This object is receiving unactivated swarmer shells to help us. Aborting." + to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.") return FALSE /obj/structure/destructible/clockwork/massive/celestial_gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This object is multiplying existing resources. Aborting." + to_chat(S, "This object is multiplying existing resources. Aborting.") return FALSE /obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -399,7 +400,7 @@ for(var/A in here.contents) var/obj/structure/cable/C = A if(istype(C)) - 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.") return FALSE @@ -411,25 +412,25 @@ return 50 /obj/machinery/hydroponics/soil/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.") return FALSE ////END CTRL CLICK FOR SWARMERS//// /mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,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 return new fabrication_object(loc) /mob/living/simple_animal/hostile/swarmer/proc/Integrate(obj/item/target) var/resource_gain = target.IntegrateAmount() if(resources + resource_gain > max_resources) - src << "We cannot hold more materials!" + to_chat(src, "We cannot hold more materials!") return TRUE if(resource_gain) resources += resource_gain @@ -447,7 +448,7 @@ qdel(target) return TRUE else - src << "\the [target] is incompatible with our internal matter recycler." + to_chat(src, "\the [target] is incompatible with our internal matter recycler.") return FALSE @@ -463,13 +464,10 @@ return if(z != ZLEVEL_STATION && z != ZLEVEL_LAVALAND) - 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 - src << "Attempting to remove this being from \ - our presence." + to_chat(src, "Attempting to remove this being from our presence.") if(!do_mob(src, target, 30)) return @@ -499,13 +497,13 @@ /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(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/overlay/temp/swarmer/dismantle/D = new /obj/effect/overlay/temp/swarmer/dismantle(get_turf(target)) D.pixel_x = target.pixel_x D.pixel_y = target.pixel_y D.pixel_z = target.pixel_z if(do_mob(src, target, 100)) - 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 for(var/obj/item/I in target.component_parts) @@ -550,11 +548,16 @@ icon_state = "ui_light" layer = MOB_LAYER resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF - luminosity = 1 + var/lon_range = 1 + light_color = LIGHT_COLOR_CYAN obj_integrity = 30 max_integrity = 30 anchored = 1 +/obj/structure/swarmer/Initialize(mapload) + ..() + set_light(lon_range) + /obj/structure/swarmer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) @@ -589,7 +592,7 @@ set category = "Swarmer" set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources" if(locate(/obj/structure/swarmer/trap) in loc) - src << "There is already a trap here. Aborting." + to_chat(src, "There is already a trap here. Aborting.") return Fabricate(/obj/structure/swarmer/trap, 5) @@ -599,10 +602,10 @@ set category = "Swarmer" set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through." if(locate(/obj/structure/swarmer/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/structure/swarmer/blockade, 5) @@ -612,7 +615,7 @@ name = "swarmer blockade" desc = "A quickly assembled energy blockade. Will not retain its form if damaged enough, but disabler beams and swarmers pass right through." icon_state = "barricade" - luminosity = 1 + light_range = 1 obj_integrity = 50 max_integrity = 50 @@ -626,12 +629,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)) var/createtype = SwarmerTypeToCreate() @@ -649,25 +652,25 @@ 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)) adjustHealth(-100) - src << "We successfully repaired ourselves." + to_chat(src, "We successfully repaired ourselves.") /mob/living/simple_animal/hostile/swarmer/proc/ToggleLight() - if(!luminosity) - SetLuminosity(3) + if(!light_range) + set_light(3) else - SetLuminosity(0) + set_light(0) /mob/living/simple_animal/hostile/swarmer/proc/swarmer_chat(msg) var/rendered = "Swarm communication - [src] [say_quote(msg, get_spans())]" for(var/mob/M in mob_list) if(isswarmer(M)) - M << rendered + to_chat(M, rendered) if(isobserver(M)) var/link = FOLLOW_LINK(M, src) - M << "[link] [rendered]" + to_chat(M, "[link] [rendered]") /mob/living/simple_animal/hostile/swarmer/proc/ContactSwarmers() var/message = input(src, "Announce to other swarmers", "Swarmer contact") diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm index 364a74aeb0..fbf0e1676b 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm @@ -18,10 +18,8 @@ new /obj/item/device/unactivated_swarmer(get_turf(the_gateway)) if(prob(25)) //25% chance to announce it to the crew var/swarmer_report = "[command_name()] High-Priority Update" - swarmer_report += "
Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come \ - through." - print_command_report(swarmer_report,"Classified [command_name()] Update") - priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg') + swarmer_report += "
Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through." + print_command_report(swarmer_report, announce=TRUE) /datum/round_event/spawn_swarmer/proc/find_swarmer() diff --git a/code/game/gamemodes/miniantags/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index 4ef4d2950a..a9c75fa76b 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -40,17 +40,17 @@ /datum/game_mode/monkey/announce() - world << "The current game mode is - Monkey!" - world << "One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to Centcom. \ - Monkeys: Ensure that your kind lives on! Rise up against your captors!" + to_chat(world, "The current game mode is - Monkey!") + to_chat(world, "One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to Centcom. \ + Monkeys: Ensure that your kind lives on! Rise up against your captors!") /datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) - carrier.current << "You are the Jungle Fever patient zero!!" - carrier.current << "You have been planted onto this station by the Animal Rights Consortium." - carrier.current << "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite." - carrier.current << "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment." - carrier.current << "Your mission will be deemed a success if any of the live infected monkeys reach Centcom." + to_chat(carrier.current, "You are the Jungle Fever patient zero!!") + to_chat(carrier.current, "You have been planted onto this station by the Animal Rights Consortium.") + to_chat(carrier.current, "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.") + to_chat(carrier.current, "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.") + to_chat(carrier.current, "Your mission will be deemed a success if any of the live infected monkeys reach Centcom.") return /datum/game_mode/monkey/post_setup() @@ -109,8 +109,8 @@ if(check_monkey_victory()) feedback_set_details("round_end_result","win - monkey win") feedback_set("round_end_result",escaped_monkeys) - world << "The monkeys have overthrown their captors! Eeek eeeek!!" + to_chat(world, "The monkeys have overthrown their captors! Eeek eeeek!!") else feedback_set_details("round_end_result","loss - staff stopped the monkeys") feedback_set("round_end_result",escaped_monkeys) - world << "The staff managed to contain the monkey infestation!" + to_chat(world, "The staff managed to contain the monkey infestation!") diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index b7b2292d8a..42bab67d65 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -47,7 +47,7 @@ if(morphed) form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it if(get_dist(user,src)<=3) - user << "It doesn't look quite right..." + to_chat(user, "It doesn't look quite right...") else ..() return @@ -90,7 +90,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) @@ -223,7 +223,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_name_admin(S)] has been made into a morph by an event.") log_game("[key_name(S)] 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 0ccc8e7094..3c597e7f32 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -62,7 +62,7 @@ var/image/ghostimage = null //Visible to ghost with darkness off var/generated_objectives_and_spells = FALSE -/mob/living/simple_animal/revenant/New() +/mob/living/simple_animal/revenant/Initialize() ..() ghostimage = image(src.icon,src,src.icon_state) @@ -71,13 +71,13 @@ /mob/living/simple_animal/revenant/Login() ..() - 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 https://tgstation13.org/wiki/Revenant to learn more." + 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 https://tgstation13.org/wiki/Revenant to learn more.") if(!generated_objectives_and_spells) generated_objectives_and_spells = TRUE mind.remove_all_antag() @@ -86,11 +86,11 @@ var/datum/objective/revenant/objective = new objective.owner = mind 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 = mind mind.objectives += objective2 - src << "Objective #2: [objective2.explanation_text]" + to_chat(src, "Objective #2: [objective2.explanation_text]") mind.assigned_role = "revenant" mind.special_role = "Revenant" ticker.mode.traitors |= mind //Necessary for announcing @@ -110,11 +110,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!") if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate essence = min(essence_regen_cap, essence+essence_regen_amount) update_action_buttons_icon() //because we update something required by our spells in life, we need to update our buttons @@ -151,10 +151,10 @@ var/rendered = "[src] says, \"[message]\"" for(var/mob/M in mob_list) if(isrevenant(M)) - M << rendered + to_chat(M, rendered) else if(isobserver(M)) var/link = FOLLOW_LINK(M, src) - M << "[link] [rendered]" + to_chat(M, "[link] [rendered]") return @@ -215,7 +215,7 @@ ..(1) ghost_darkness_images -= ghostimage updateallghostimages() - src << "NO! No... it's too late, you can feel your essence [pick("breaking apart", "drifting away")]..." + to_chat(src, "NO! No... it's too late, you can feel your essence [pick("breaking apart", "drifting away")]...") notransform = 1 revealed = 1 invisibility = 0 @@ -245,10 +245,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() @@ -259,10 +259,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() @@ -286,17 +286,17 @@ return var/turf/T = get_turf(src) if(isclosedturf(T)) - src << "You cannot use abilities from inside of a wall." + to_chat(src, "You cannot use abilities from inside of a wall.") return 0 for(var/obj/O in T) if(O.density && !O.CanPass(src, T, 5)) - src << "You cannot use abilities inside of a dense object." + to_chat(src, "You cannot use abilities inside of a dense object.") return 0 if(inhibited) - src << "Your powers have been suppressed by nulling energy!" + to_chat(src, "Your powers have been suppressed by nulling energy!") return 0 if(!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 @@ -312,9 +312,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 @@ -361,9 +361,9 @@ /obj/item/weapon/ectoplasm/revenant/examine(mob/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(!src || QDELETED(src) || inert) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 4ff1d23f59..ce549c509d 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -4,7 +4,7 @@ A.examine(src) if(ishuman(A)) if(A in drained_mobs) - src << "[A]'s soul is dead and empty." //feedback at any range + to_chat(src, "[A]'s soul is dead and empty." ) else if(in_range(src, A)) Harvest(A) @@ -12,45 +12,45 @@ 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.stat) - src << "[target.p_their(TRUE)] soul is too strong to harvest." + to_chat(src, "[target.p_their(TRUE)] 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, rand(10, 20), 0, target)) //did they get deleted in that second? if(target.ckey) - src << "[target.p_their(TRUE)] soul burns with intelligence." + to_chat(src, "[target.p_their(TRUE)] soul burns with intelligence.") essence_drained += rand(20, 30) if(target.stat != DEAD) - src << "[target.p_their(TRUE)] soul blazes with life!" + to_chat(src, "[target.p_their(TRUE)] soul blazes with life!") essence_drained += rand(40, 50) else - src << "[target.p_their(TRUE)] soul is weak and faltering." + to_chat(src, "[target.p_their(TRUE)] soul is weak and faltering.") if(do_after(src, rand(15, 20), 0, 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, rand(15, 25), 0, target)) //how about now if(!target.stat) - src << "[target.p_they(TRUE)] [target.p_are()] now powerful enough to fight off your draining." - target << "You feel something tugging across your body before subsiding." + to_chat(src, "[target.p_they(TRUE)] [target.p_are()] now powerful enough to fight off your draining.") + to_chat(target, "You feel something tugging across your body before subsiding.") draining = 0 essence_drained = 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...") reveal(46) stun(46) target.visible_message("[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.") @@ -59,24 +59,24 @@ change_essence_amount(essence_drained, 0, target) if(essence_drained <= 90 && target.stat != DEAD) essence_regen_cap += 5 - src << "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." + to_chat(src, "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].") if(essence_drained > 90) essence_regen_cap += 15 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.") if(target) //Wait, target is WHERE NOW? target.visible_message("[target] slumps onto the ground.", \ "Violets lights, dancing in your vision, receding--") qdel(B) 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 @@ -107,14 +107,14 @@ charge_counter = charge_max return log_say("RevenantTransmit: [key_name(user)]->[key_name(M)] : [msg]") - user << "You transmit to [M]: [msg]" - M << "You hear something behind you talking... [msg]" + to_chat(user, "You transmit to [M]: [msg]") + to_chat(M, "You hear something behind you talking... [msg]") for(var/ded in dead_mob_list) if(!isobserver(ded)) continue var/follow_rev = FOLLOW_LINK(ded, user) var/follow_whispee = FOLLOW_LINK(ded, M) - ded << "[follow_rev] [user] Revenant Transmit: \"[msg]\" to [follow_whispee] [M]" + to_chat(ded, "[follow_rev] [user] Revenant Transmit: \"[msg]\" to [follow_whispee] [M]") @@ -164,7 +164,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 @@ -293,7 +293,7 @@ for(var/mob/living/carbon/human/human in T) if(human == user) continue - 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) @@ -344,7 +344,7 @@ blight.stage++ if(!blightfound) H.AddDisease(new /datum/disease/revblight) - H << "You feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")]." + to_chat(H, "You feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")].") else if(mob.reagents) mob.reagents.add_reagent("plasma", 5) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_blight.dm b/code/game/gamemodes/miniantags/revenant/revenant_blight.dm index 7122451c65..0ac4bdc994 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_blight.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_blight.dm @@ -21,7 +21,7 @@ if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) affected_mob.dna.species.handle_hair(affected_mob) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") ..() /datum/disease/revblight/stage_act() @@ -30,7 +30,7 @@ cure() return if(prob(stage*3)) - affected_mob << "You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]..." + to_chat(affected_mob, "You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]...") affected_mob.confused += 8 affected_mob.adjustStaminaLoss(8) new /obj/effect/overlay/temp/revenant(affected_mob.loc) @@ -54,7 +54,7 @@ if(5) if(!finalstage) finalstage = 1 - affected_mob << "You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")]." + to_chat(affected_mob, "You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")].") affected_mob.adjustStaminaLoss(45) new /obj/effect/overlay/temp/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 6c78c22ac8..355936d922 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -46,7 +46,7 @@ del_on_death = 1 deathmessage = "screams in anger as it collapses into a puddle of viscera!" -/mob/living/simple_animal/slaughter/New() +/mob/living/simple_animal/slaughter/Initialize() ..() var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new AddSpell(bloodspell) @@ -178,8 +178,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, 1, -1) - M << "You leave [src]'s warm embrace, \ - and feel ready to take on the world." + to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) if(consumed_mobs) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm index d41b9edab1..40c9a0e494 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm @@ -40,8 +40,8 @@ player_mind.assigned_role = "Slaughter Demon" player_mind.special_role = "Slaughter Demon" ticker.mode.traitors |= player_mind - S << S.playstyle_string - S << "You are currently not currently in the same plane of existence as the station. Blood Crawl near a blood pool to manifest." + to_chat(S, S.playstyle_string) + to_chat(S, "You are currently not currently in the same plane of existence as the station. Blood Crawl near a blood pool to manifest.") S << 'sound/magic/demon_dies.ogg' message_admins("[key_name_admin(S)] has been made into a slaughter demon by an event.") log_game("[key_name(S)] was spawned as a slaughter demon by an event.") diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 5c9b3144db..b7a7234584 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -5,9 +5,9 @@ /datum/game_mode/nuclear name = "nuclear emergency" config_tag = "nuclear" - required_players = 15 // 30 players - 3 players to be the nuke ops = 27 players remaining + required_players = 30 // 30 players - 3 players to be the nuke ops = 27 players remaining required_enemies = 2 - recommended_enemies = 2 + recommended_enemies = 5 antag_flag = ROLE_OPERATIVE enemy_minimum_age = 14 @@ -83,7 +83,7 @@ if(nuke_code) synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) - synd_mind.current << "The nuclear authorization code is: [nuke_code]" + to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") if(!leader_selected) prepare_syndicate_leader(synd_mind, nuke_code) @@ -105,9 +105,9 @@ nukeops_lastname = nukelastname(synd_mind.current) NukeNameAssign(nukeops_lastname,syndicates) //allows time for the rest of the syndies to be chosen synd_mind.current.real_name = "[syndicate_name()] [leader_title]" - synd_mind.current << "You are the Syndicate [leader_title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors." - synd_mind.current << "If you feel you are not up to this task, give your ID to another operative." - synd_mind.current << "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it." + to_chat(synd_mind.current, "You are the Syndicate [leader_title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") + to_chat(synd_mind.current, "If you feel you are not up to this task, give your ID to another operative.") + to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge synd_mind.current.put_in_hands_or_del(challenge) @@ -146,7 +146,7 @@ /datum/game_mode/proc/greet_syndicate(datum/mind/syndicate, you_are=1) if(you_are) - syndicate.current << "You are a [syndicate_name()] agent!" + to_chat(syndicate.current, "You are a [syndicate_name()] agent!") syndicate.announce_objectives() /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob, telecrystals = TRUE) @@ -198,71 +198,71 @@ if(nuke_off_station == NUKE_SYNDICATE_BASE) feedback_set_details("round_end_result","loss - syndicate nuked - disk secured") - world << "Humiliating Syndicate Defeat" - world << "The crew of [station_name()] gave [syndicate_name()] operatives back their bomb! The syndicate base was destroyed! Next time, don't lose the nuke!" + to_chat(world, "Humiliating Syndicate Defeat") + to_chat(world, "The crew of [station_name()] gave [syndicate_name()] operatives back their bomb! The syndicate base was destroyed! Next time, don't lose the nuke!") ticker.news_report = NUKE_SYNDICATE_BASE else if(!disk_rescued && station_was_nuked && !syndies_didnt_escape) feedback_set_details("round_end_result","win - syndicate nuke") - world << "Syndicate Major Victory!" - world << "[syndicate_name()] operatives have destroyed [station_name()]!" + to_chat(world, "Syndicate Major Victory!") + to_chat(world, "[syndicate_name()] operatives have destroyed [station_name()]!") ticker.news_report = STATION_NUKED else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") - world << "Total Annihilation" - world << "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!" + to_chat(world, "Total Annihilation") + to_chat(world, "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!") ticker.news_report = STATION_NUKED else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station") - world << "Crew Minor Victory" - world << "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't do that!" + to_chat(world, "Crew Minor Victory") + to_chat(world, "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't do that!") ticker.news_report = NUKE_MISS else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") - world << "[syndicate_name()] operatives have earned Darwin Award!" - world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't do that!" + to_chat(world, "[syndicate_name()] operatives have earned Darwin Award!") + to_chat(world, "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't do that!") ticker.news_report = NUKE_MISS else if ((disk_rescued || SSshuttle.emergency.mode != SHUTTLE_ENDGAME) && are_operatives_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") - world << "Crew Major Victory!" - world << "The Research Staff has saved the disk and killed the [syndicate_name()] Operatives" + to_chat(world, "Crew Major Victory!") + to_chat(world, "The Research Staff has saved the disk and killed the [syndicate_name()] Operatives") ticker.news_report = OPERATIVES_KILLED else if (disk_rescued) feedback_set_details("round_end_result","loss - evacuation - disk secured") - world << "Crew Major Victory" - world << "The Research Staff has saved the disk and stopped the [syndicate_name()] Operatives!" + to_chat(world, "Crew Major Victory") + to_chat(world, "The Research Staff has saved the disk and stopped the [syndicate_name()] Operatives!") ticker.news_report = OPERATIVES_KILLED else if (!disk_rescued && are_operatives_dead()) feedback_set_details("round_end_result","halfwin - evacuation - disk not secured") - world << "Neutral Victory!" - world << "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!" + to_chat(world, "Neutral Victory!") + to_chat(world, "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!") ticker.news_report = OPERATIVE_SKIRMISH else if (!disk_rescued && crew_evacuated) feedback_set_details("round_end_result","halfwin - detonation averted") - world << "Syndicate Minor Victory!" - world << "[syndicate_name()] operatives survived the assault but did not achieve the destruction of [station_name()]. Next time, don't lose the disk!" + to_chat(world, "Syndicate Minor Victory!") + to_chat(world, "[syndicate_name()] operatives survived the assault but did not achieve the destruction of [station_name()]. Next time, don't lose the disk!") ticker.news_report = OPERATIVE_SKIRMISH else if (!disk_rescued && !crew_evacuated) feedback_set_details("round_end_result","halfwin - interrupted") - world << "Neutral Victory" - world << "Round was mysteriously interrupted!" + to_chat(world, "Neutral Victory") + to_chat(world, "Round was mysteriously interrupted!") ticker.news_report = OPERATIVE_SKIRMISH @@ -285,7 +285,7 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" if(TC_uses == 0 && station_was_nuked && !are_operatives_dead()) text += "
\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).") /////////////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ for(var/datum/mind/rev_mind in head_revolutionaries) //People with return to lobby may still be in the lobby. Let's pick someone else in that case. - if(istype(rev_mind.current,/mob/new_player)) + if(istype(rev_mind.current,/mob/dead/new_player)) head_revolutionaries -= rev_mind var/list/newcandidates = shuffle(antag_candidates) if(newcandidates.len == 0) @@ -79,7 +79,7 @@ var/datum/mind/lenin = M antag_candidates -= lenin newcandidates -= lenin - if(istype(lenin.current,/mob/new_player)) //We don't want to make the same mistake again + if(istype(lenin.current,/mob/dead/new_player)) //We don't want to make the same mistake again continue else var/mob/Nm = lenin.current @@ -135,7 +135,7 @@ /datum/game_mode/proc/greet_revolutionary(datum/mind/rev_mind, you_are=1) update_rev_icons_added(rev_mind) if (you_are) - rev_mind.current << "You are a member of the revolutionaries' leadership!" + to_chat(rev_mind.current, "You are a member of the revolutionaries' leadership!") rev_mind.special_role = "Head Revolutionary" rev_mind.announce_objectives() @@ -148,7 +148,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.dna.remove_mutation(CLOWNMUT) @@ -166,14 +166,14 @@ mob.equip_in_one_of_slots(R,slots) if (!where2) - mob << "The Syndicate were unfortunately unable to get you a chameleon security HUD." + to_chat(mob, "The Syndicate were unfortunately unable to get you a chameleon security HUD.") else - mob << "The chameleon security HUD in your [where2] will help you keep track of who is mindshield-implanted, and unable to be recruited." + to_chat(mob, "The chameleon security HUD in your [where2] will help you keep track of who is mindshield-implanted, and unable to be recruited.") 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.") return 1 ///////////////////////////////// @@ -270,8 +270,8 @@ carbon_mob.silent = max(carbon_mob.silent, 5) carbon_mob.flash_act(1, 1) rev_mind.current.Stun(5) - rev_mind.current << " 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.current.attack_log += "\[[time_stamp()]\] Has been converted to the revolution!" + to_chat(rev_mind.current, " 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.current.log_message("Has been converted to the revolution!", INDIVIDUAL_ATTACK_LOG) rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) @@ -289,23 +289,23 @@ if((rev_mind in revolutionaries) || remove_head) revolutionaries -= rev_mind rev_mind.special_role = null - rev_mind.current.attack_log += "\[[time_stamp()]\] Has renounced the revolution!" + rev_mind.current.log_message("Has renounced the revolution!", INDIVIDUAL_ATTACK_LOG) if(beingborged) - rev_mind.current << "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]" + to_chat(rev_mind.current, "The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]") message_admins("[ADMIN_LOOKUPFLW(rev_mind.current)] has been borged while being a [remove_head ? "leader" : " member"] of the revolution.") else rev_mind.current.Paralyse(5) - rev_mind.current << "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, "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!") ///////////////////////////////////// //Adds the rev hud to a new convert// @@ -351,13 +351,13 @@ /datum/game_mode/revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads killed") - world << "The heads of staff were killed or exiled! The revolutionaries win!" + to_chat(world, "The heads of staff were killed or exiled! The revolutionaries win!") ticker.news_report = REVS_WIN else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "The heads of staff managed to stop the revolution!" + to_chat(world, "The heads of staff managed to stop the revolution!") ticker.news_report = REVS_LOSE ..() @@ -375,19 +375,19 @@ if((survivor.mind in head_revolutionaries) || (survivor.mind in revolutionaries)) num_revs++ if(num_survivors) - world << "[TAB]Command's Approval Rating: [100 - round((num_revs/num_survivors)*100, 0.1)]%" // % of loyal crew + to_chat(world, "[TAB]Command's Approval Rating: [100 - round((num_revs/num_survivors)*100, 0.1)]%" ) var/text = "
The head revolutionaries were:" for(var/datum/mind/headrev in head_revolutionaries) text += printplayer(headrev, 1) text += "
" - world << text + to_chat(world, text) if(revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution)) var/text = "
The revolutionaries were:" for(var/datum/mind/rev in revolutionaries) text += printplayer(rev, 1) text += "
" - world << text + to_chat(world, text) if( head_revolutionaries.len || revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution) ) var/text = "
The heads of staff were:" @@ -398,4 +398,4 @@ text += "Target" text += printplayer(head, 1) text += "
" - world << text + to_chat(world, text) diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index 0f80455886..f3753c17c0 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -115,7 +115,7 @@ var/final = target_type target_type = text2path(final) if(!target_type) - usr << "Didn't work, contact Sayu with this: [final]" + to_chat(usr, "Didn't work, contact Sayu with this: [final]") usr << browse(null,"window=airlockmaker") return diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index b1abbb1267..1c552abd51 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -114,11 +114,11 @@ var/hsboxspawn = 1 if("hsbtobj") if(!admin) return if(hsboxspawn) - world << "Sandbox: \black[usr.key] has disabled object spawning!" + to_chat(world, "Sandbox: \black[usr.key] has disabled object spawning!") hsboxspawn = 0 return else - world << "Sandbox: \black[usr.key] has enabled object spawning!" + to_chat(world, "Sandbox: \black[usr.key] has enabled object spawning!") hsboxspawn = 1 return // @@ -127,10 +127,10 @@ var/hsboxspawn = 1 if("hsbtac") if(!admin) return if(config.sandbox_autoclose) - world << "Sandbox: \black [usr.key] has removed the object spawn limiter." + to_chat(world, "Sandbox: \black [usr.key] has removed the object spawn limiter.") config.sandbox_autoclose = 0 else - world << "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use." + to_chat(world, "Sandbox: \black [usr.key] has added a limiter to object spawning. The window will now auto-close after use.") config.sandbox_autoclose = 1 return // @@ -283,7 +283,7 @@ var/hsboxspawn = 1 var/typepath = text2path(href_list["path"]) if(!typepath) - usr << "Bad path: \"[href_list["path"]]\"" + to_chat(usr, "Bad path: \"[href_list["path"]]\"") return new typepath(usr.loc) @@ -295,7 +295,7 @@ var/hsboxspawn = 1 if("hsbspawn") var/typepath = text2path(href_list["path"]) if(!typepath) - usr << "Bad path: \"[href_list["path"]]\"" + to_chat(usr, "Bad path: \"[href_list["path"]]\"") return new typepath(usr.loc) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 808512b134..c7c4f64a3a 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -195,7 +195,7 @@ /datum/game_mode/proc/greet_traitor(datum/mind/traitor) - traitor.current << "You are the [traitor_name]." + to_chat(traitor.current, "You are the [traitor_name].") traitor.announce_objectives() return @@ -214,14 +214,14 @@ return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. /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) @@ -230,7 +230,7 @@ killer.set_zeroth_law(law, law_borg) give_codewords(killer) killer.set_syndie_radio() - killer << "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!" + to_chat(killer, "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!") killer.add_malf_picker() /datum/game_mode/proc/add_law_sixsixsix(mob/living/silicon/devil) @@ -292,7 +292,7 @@ text += "
The code phrases were: [syndicate_code_phrase]
\ The code responses were: [syndicate_code_response]
" - world << text + to_chat(world, text) return 1 @@ -303,7 +303,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.dna.remove_mutation(CLOWNMUT) var/list/all_contents = traitor_mob.GetAllContents() @@ -335,7 +335,7 @@ uplink_loc = R if (!uplink_loc) - traitor_mob << "Unfortunately, the Syndicate wasn't able to get you an Uplink." + to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you an Uplink.") . = 0 else var/obj/item/device/uplink/U = new(uplink_loc) @@ -345,19 +345,19 @@ if(uplink_loc == R) R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ)) - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.") traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") else if(uplink_loc == PDA) PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") else if(uplink_loc == P) P.traitor_unlock_degrees = rand(1, 360) - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Degrees: [P.traitor_unlock_degrees] ([P.name]).") if(!safety) // If they are not a rev. Can be added on to. @@ -400,7 +400,7 @@ 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.
") /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) var/datum/atom_hud/antag/traitorhud = huds[ANTAG_HUD_TRAITOR] diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 4a82f4ed65..e49a2b54aa 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -26,7 +26,7 @@ charges-- 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 name = "tear in the fabric of reality" @@ -114,7 +114,7 @@ hitsound = 'sound/items/welder2.ogg' /obj/item/weapon/scrying/attack_self(mob/user) - 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) return @@ -143,23 +143,23 @@ 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 M.set_species(/datum/species/skeleton, icon_update=0) M.revive(full_heal = 1, admin_revive = 1) spooky_scaries |= M - M << "You have been revived by [user.real_name]!" - M << "[user.p_they(TRUE)] [user.p_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, "[user.p_they(TRUE)] [user.p_are()] your master now, assist them even if it costs you your new life!") equip_roman_skeleton(M) @@ -226,7 +226,7 @@ var/global/list/multiverse = list() /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 @@ -238,19 +238,19 @@ 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(!is_gangster(user)) var/datum/gang/multiverse/G = new(src, "[user.real_name]") ticker.mode.gangs += G G.bosses += user.mind G.add_gang_hud(user.mind) user.mind.gang_datum = G - 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 = user.mind user.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [user.real_name] and their copies are on the shuttle!" - user << "Objective #[1]: [hijack_objective.explanation_text]" + to_chat(user, "Objective #[1]: [hijack_objective.explanation_text]") ticker.mode.traitors += user.mind user.mind.special_role = "[user.real_name] Prime" else @@ -258,16 +258,16 @@ var/global/list/multiverse = list() if(candidates.len) var/client/C = pick(candidates) spawn_copy(C, 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!") cooldown = world.time + 400 for(var/obj/item/weapon/multisword/M in multiverse) if(M.assigned == assigned) M.cooldown = cooldown 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) @@ -275,7 +275,7 @@ var/global/list/multiverse = list() C.prefs.copy_to(M, icon_updates=0) 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.") ticker.mode.add_gangster(M.mind, user.mind.gang_datum, FALSE) M.real_name = user.real_name M.name = user.real_name @@ -461,15 +461,15 @@ var/global/list/multiverse = list() /obj/item/voodoo/attackby(obj/item/I, mob/user, params) if(target && cooldown < world.time) if(I.is_hot()) - target << "You suddenly feel very hot" + to_chat(target, "You suddenly feel very hot") target.bodytemperature += 50 GiveHint(target) else if(is_pointed(I)) - target << "You feel a stabbing pain in [parse_zone(user.zone_selected)]!" + to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") 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.adjustEarDamage(0,3) GiveHint(target) @@ -481,7 +481,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) @@ -498,7 +498,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 @@ -516,16 +516,16 @@ var/global/list/multiverse = list() user.reset_perspective(null) 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") target.click_random_mob() 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 @@ -540,10 +540,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(exposed_temperature, exposed_volume) if(target) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 4805c88492..d3253f2f95 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -32,13 +32,13 @@ max_mages = INFINITY /datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) - wizard.current << "You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "You are the Space Wizard!") + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") var/obj_count = 1 - 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") 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 @@ -53,7 +53,7 @@ continue if(wizard.current.stat==UNCONSCIOUS) if(wizard.current.health < 0) - wizard.current << "The Space Wizard Federation is upset with your performance and have terminated your employment." + to_chat(wizard.current, "The Space Wizard Federation is upset with your performance and have terminated your employment.") wizard.current.death() continue wizards_alive++ @@ -133,7 +133,7 @@ /datum/game_mode/wizard/raginmages/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "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, "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) /datum/game_mode/wizard/raginmages/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 45f00fa7fc..c12d542ae4 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -30,33 +30,31 @@ /obj/item/device/soulstone/pickup(mob/living/user) ..() if(!iscultist(user) && !iswizard(user) && !usability) - user << "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly." + to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") user.Dizzy(120) /obj/item/device/soulstone/examine(mob/user) ..() if(usability || iscultist(user) || iswizard(user) || isobserver(user)) - user << "A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades." - user << "The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade." + to_chat(user, "A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.") + to_chat(user, "The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade.") if(spent) - user << "This shard is spent; it is now just \ - a creepy rock." + to_chat(user, "This shard is spent; it is now just a creepy rock.") //////////////////////////////Capturing//////////////////////////////////////////////////////// /obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/user) if(!iscultist(user) && !iswizard(user) && !usability) user.Paralyse(5) - user << "Your body is wracked with debilitating pain!" + to_chat(user, "Your body is wracked with debilitating pain!") return if(spent) - user << "There is no power left in the shard.\ - " + to_chat(user, "There is no power left in the shard.") return if(!ishuman(M))//If target is not a human. return ..() if(iscultist(M)) - user << "\"Come now, do not capture your fellow's soul.\"" + to_chat(user, "\"Come now, do not capture your fellow's soul.\"") return add_logs(user, M, "captured [M.name]'s soul", src) @@ -69,7 +67,7 @@ return if(!iscultist(user) && !iswizard(user) && !usability) user.Paralyse(5) - user << "Your body is wracked with debilitating pain!" + to_chat(user, "Your body is wracked with debilitating pain!") return for(var/mob/living/simple_animal/shade/A in src) A.status_flags &= ~GODMODE @@ -79,9 +77,9 @@ icon_state = "soulstone" name = initial(name) if(iswizard(user) || usability) - A << "You have been released from your prison, but you are still bound to [user.real_name]'s will. Help them succeed in their goals at all costs." + to_chat(A, "You have been released from your prison, but you are still bound to [user.real_name]'s will. Help them succeed in their goals at all costs.") else if(iscultist(user)) - A << "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs." + to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.") was_used() ///////////////////////////Transferring to constructs///////////////////////////////////////////////////// @@ -94,17 +92,17 @@ /obj/structure/constructshell/examine(mob/user) ..() if(iscultist(user) || iswizard(user) || user.stat == DEAD) - user << "A construct shell, used to house bound souls from a soulstone." - user << "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:" - user << "An Artificer, which can produce more shells and soulstones, as well as fortifications." - user << "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile." - user << "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow." + to_chat(user, "A construct shell, used to house bound souls from a soulstone.") + to_chat(user, "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:") + to_chat(user, "An Artificer, which can produce more shells and soulstones, as well as fortifications.") + to_chat(user, "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.") + to_chat(user, "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow.") /obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/device/soulstone)) var/obj/item/device/soulstone/SS = O if(!iscultist(user) && !iswizard(user) && !SS.usability) - user << "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly." + to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.") user.Dizzy(120) return SS.transfer_soul("CONSTRUCT",src,user) @@ -129,23 +127,23 @@ init_shade(T, user) return 1 else - user << "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back..." + to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") return getCultGhost(T,user) if("VICTIM") var/mob/living/carbon/human/T = target if(ticker.mode.name == "cult" && T.mind == ticker.mode:sacrifice_target) if(iscultist(user)) - user << "\"This soul is mine. SACRIFICE THEM!\"" + to_chat(user, "\"This soul is mine. SACRIFICE THEM!\"") else - user << "The soulstone doesn't work for no apparent reason." + to_chat(user, "The soulstone doesn't work for no apparent reason.") return 0 if(contents.len) - user << "Capture failed!: The soulstone is full! Free an existing soul to make room." + to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") else if(T.stat != CONSCIOUS) if(T.client == null) - user << "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back..." + to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") getCultGhost(T,user) else for(var/obj/item/W in T) @@ -153,12 +151,12 @@ init_shade(T, user, vic = 1) qdel(T) else - user << "Capture failed!: Kill or maim the victim first!" + to_chat(user, "Capture failed!: Kill or maim the victim first!") if("SHADE") var/mob/living/simple_animal/shade/T = target if(contents.len) - user << "Capture failed!: The soulstone is full! Free an existing soul to make room." + to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") else T.loc = src //put shade in stone T.status_flags |= GODMODE @@ -166,9 +164,9 @@ T.health = T.maxHealth icon_state = "soulstone2" name = "soulstone: Shade of [T.real_name]" - T << "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form." + to_chat(T, "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.") if(user != T) - user << "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone." + to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.") if("CONSTRUCT") var/obj/structure/constructshell/T = target @@ -195,7 +193,7 @@ user.drop_item() qdel(src) else - user << "Creation failed!: The soul stone is empty! Go kill someone!" + to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null) @@ -206,9 +204,9 @@ if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && ticker && ticker.mode) ticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) - newstruct << "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs.") else if(stoner) - newstruct << "You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs.") newstruct.cancel_camera() @@ -230,11 +228,11 @@ name = "soulstone: Shade of [T.real_name]" icon_state = "soulstone2" if(U && (iswizard(U) || usability)) - S << "Your soul has been captured! You are now bound to [U.real_name]'s will. Help them succeed in their goals at all costs." + to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help them succeed in their goals at all costs.") else if(U && iscultist(U)) - S << "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs." + to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.") if(vic && U) - U << "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone." + to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") /obj/item/device/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U) @@ -252,7 +250,7 @@ if(!T) return 0 if(!chosen_ghost) - U << "There were no spirits willing to become a shade." + to_chat(U, "There were no spirits willing to become a shade.") return 0 if(contents.len) //If they used the soulstone on someone else in the meantime return 0 diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index c7d8fd171e..d5049d3b24 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -35,7 +35,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) @@ -45,24 +45,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(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) @@ -78,7 +78,7 @@ /datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,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() @@ -277,6 +277,14 @@ category = "Defensive" cost = 1 +/datum/spellbook_entry/the_traps + name = "The Traps!" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/the_traps + log_name = "TT" + category = "Offensive" + cost = 1 + + /datum/spellbook_entry/item name = "Buy Item" refundable = 0 @@ -493,6 +501,25 @@ dat += "Already cast!
" return dat +/datum/spellbook_entry/summon/ghosts + name = "Summon Ghosts" + desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilties to frustrate you." + log_name = "SGH" + +/datum/spellbook_entry/summon/ghosts/IsAvailible() + if(!ticker.mode) + return FALSE + else + return TRUE + +/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned", log_name) + new /datum/round_event/wizard/ghost() + active = TRUE + to_chat(user, "You have cast summon ghosts!") + playsound(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1) + return TRUE + /datum/spellbook_entry/summon/guns name = "Summon Guns" desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!" @@ -508,7 +535,7 @@ rightandwrong(0, user, 25) active = 1 playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) - user << "You have cast summon guns!" + to_chat(user, "You have cast summon guns!") return 1 /datum/spellbook_entry/summon/magic @@ -526,7 +553,7 @@ rightandwrong(1, user, 25) active = 1 playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) - user << "You have cast summon magic!" + to_chat(user, "You have cast summon magic!") return 1 /datum/spellbook_entry/summon/events @@ -546,7 +573,7 @@ summonevents() times++ playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) - user << "You have cast summon events." + to_chat(user, "You have cast summon events.") return 1 /datum/spellbook_entry/summon/events/GetInfo() @@ -574,9 +601,9 @@ /obj/item/weapon/spellbook/examine(mob/user) ..() if(owner) - user << "There is a small signature on the front cover: \"[owner]\"." + to_chat(user, "There is a small signature on the front cover: \"[owner]\".") else - user << "It appears to have no author." + to_chat(user, "It appears to have no author.") /obj/item/weapon/spellbook/Initialize() ..() @@ -594,16 +621,16 @@ if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/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++ for(var/datum/spellbook_entry/item/contract/CT in entries) if(!isnull(CT.limit)) CT.limit++ qdel(O) else 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) if(!isnull(BB.limit)) @@ -662,11 +689,11 @@ /obj/item/weapon/spellbook/attack_self(mob/user) 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 its owner and refuses to open!" + to_chat(user, "The [name] does not recognize you as its owner and refuses to open!") return user.set_machine(src) var/dat = "" @@ -773,8 +800,8 @@ recoil(user) else user.mind.AddSpell(S) - 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]).") + user <<"You rapidly read through the arcane book. Suddenly you realize you understand [spellname]!" + user.log_message("learned the spell [spellname] ([S]).", INDIVIDUAL_ATTACK_LOG) onlearned(user) /obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 7c3d3a3b0b..bd89a96e28 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -26,7 +26,7 @@ wizard.assigned_role = "Wizard" wizard.special_role = "Wizard" if(wizardstart.len == 0) - wizard.current << "A starting location for you could not be found, please report this bug!" + to_chat(wizard.current, "A starting location for you could not be found, please report this bug!") return 0 for(var/datum/mind/wiz in wizards) wiz.current.loc = pick(wizardstart) @@ -115,8 +115,8 @@ /datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) - wizard.current << "You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "You are the Space Wizard!") + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") wizard.announce_objectives() return @@ -155,9 +155,9 @@ spellbook.owner = wizard_mob wizard_mob.put_in_hands_or_del(spellbook) - wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." - wizard_mob << "The spellbook is bound to you, and others cannot use it." - 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, "The spellbook is bound to you, and others cannot use it.") + 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.") return 1 @@ -177,7 +177,7 @@ /datum/game_mode/wizard/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "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, "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!") ticker.news_report = WIZARD_KILLED @@ -231,7 +231,7 @@ i++ text += "
" - world << text + to_chat(world, text) return 1 //OTHER PROCS diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index a0c92ca988..052eb2d037 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -68,7 +68,7 @@ else 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 = user.get_active_held_item() @@ -91,13 +91,13 @@ if(do_after(user,40*WT.toolspeed, 1, target = src)) if(!WT.isOn() || !(stat & BROKEN)) return - user << "You repair [src]." + to_chat(user, "You repair [src].") playsound(loc, 'sound/items/Welder2.ogg', 50, 1) stat &= ~BROKEN obj_integrity = max_integrity update_icon() else - user << "[src] does not need repairs." + to_chat(user, "[src] does not need repairs.") else return ..() @@ -125,7 +125,7 @@ ejectpda() else - user << "\The [src] is empty." + to_chat(user, "\The [src] is empty.") /obj/machinery/pdapainter/verb/ejectpda() @@ -141,7 +141,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 e06cb3b333..f79cd7f666 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -80,7 +80,7 @@ if((isnull(user) || istype(user)) && state_open && !panel_open) ..(user) if(occupant && occupant.stat != DEAD) - occupant << "You feel cool air surround you. You go numb as your senses turn inward." + to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") /obj/machinery/sleeper/emp_act(severity) if(is_operational() && occupant) @@ -165,11 +165,11 @@ if(inject_chem(chem)) . = TRUE if(scrambled_chems && prob(5)) - usr << "Chem System Re-route detected, results may not be as expected!" + to_chat(usr, "Chem System Re-route detected, results may not be as expected!") /obj/machinery/sleeper/emag_act(mob/user) scramble_chem_buttons() - user << "You scramble the sleepers user interface!" + to_chat(user, "You scramble the sleepers user interface!") /obj/machinery/sleeper/proc/inject_chem(chem) if((chem in available_chems) && chem_allowed(chem)) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 6be6cfb965..95b972489e 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -40,7 +40,7 @@ else // trying to unlock the interface if (src.allowed(user)) 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() @@ -49,7 +49,7 @@ if (user.machine==src) src.attack_hand(user) else - user << "Access denied." + to_chat(user, "Access denied.") /obj/machinery/ai_slipper/attack_ai(mob/user) @@ -60,7 +60,7 @@ return if ( (get_dist(src, user) > 1 )) if (!(issilicon(user) || IsAdminGhost(user))) - user << text("Too far away.") + to_chat(user, text("Too far away.")) user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -82,7 +82,7 @@ return if (src.locked) if(!(issilicon(usr)|| IsAdminGhost(usr))) - 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/announcement_system.dm b/code/game/machinery/announcement_system.dm index 3e8bfa1cc5..851b47f3a2 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -61,7 +61,7 @@ var/list/announcement_systems = list() add_overlay(errorlight) /obj/machinery/announcement_system/Destroy() - qdel(radio) + QDEL_NULL(radio) announcement_systems -= src //"OH GOD WHY ARE THERE 100,000 LISTED ANNOUNCEMENT SYSTEMS?!!" return ..() @@ -73,12 +73,12 @@ var/list/announcement_systems = list() if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, P.usesound, 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance hatch of [src]." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") update_icon() else if(default_deconstruction_crowbar(P)) return else if(istype(P, /obj/item/device/multitool) && panel_open && (stat & BROKEN)) - user << "You reset [src]'s firmware." + to_chat(user, "You reset [src]'s firmware.") stat &= ~BROKEN update_icon() else @@ -97,9 +97,10 @@ var/list/announcement_systems = list() if(message_type == "ARRIVAL" && arrivalToggle) message = CompileText(arrival, user, rank) - else if(message_type == "NEWHEAD" && newheadToggle) message = CompileText(newhead, user, rank) + else if(message_type == "ARRIVALS_BROKEN") + message = "The arrivals shuttle has been damaged. Docking for repairs..." if(channels.len == 0) radio.talk_into(src, message, null, list(SPAN_ROBOT)) @@ -159,7 +160,7 @@ var/list/announcement_systems = list() if(!issilicon(user)) return if(stat & BROKEN) - user << "[src]'s firmware appears to be malfunctioning!" + to_chat(user, "[src]'s firmware appears to be malfunctioning!") return interact(user) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 2bf0291e4d..5e6201cc04 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -97,7 +97,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)) @@ -135,18 +135,18 @@ busy = 0 return 1 - if(O.flags & HOLOGRAM) + if(HAS_SECONDARY_FLAG(O, HOLOGRAM)) return 1 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.temporarilyRemoveItemFromInventory(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 @@ -157,12 +157,12 @@ 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) if(!QDELETED(O)) user.put_in_active_hand(O) 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) else @@ -248,7 +248,7 @@ matching_designs.Add(D) updateUsrDialog() else - usr << "The autolathe is busy. Please wait for completion of previous operation." + to_chat(usr, "The autolathe is busy. Please wait for completion of previous operation.") updateUsrDialog() diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 16b94c1236..35f7babe1e 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -16,7 +16,7 @@ value = C.value if(value) SSshuttle.points += value - user << "You deposit [I]. The station now has [SSshuttle.points] credits." + to_chat(user, "You deposit [I]. The station now has [SSshuttle.points] credits.") qdel(I) return return ..() diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 0db41261e1..6fa2aeffc5 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -62,34 +62,34 @@ default_deconstruction_screwdriver(user, "button-open", "[skin]",W) update_icon() else - user << "Maintenance Access Denied" + to_chat(user, "Maintenance Access Denied") flick("[skin]-denied", src) return if(panel_open) if(!device && istype(W, /obj/item/device/assembly)) if(!user.transferItemToLoc(W, src)) - user << "\The [W] is stuck to you!" + to_chat(user, "\The [W] is stuck to you!") return device = W - user << "You add [W] to the button." + to_chat(user, "You add [W] to the button.") if(!board && istype(W, /obj/item/weapon/electronics/airlock)) if(!user.transferItemToLoc(W, src)) - user << "\The [W] is stuck to you!" + to_chat(user, "\The [W] is stuck to you!") return board = W if(board.one_access) req_one_access = board.accesses else req_access = board.accesses - user << "You add [W] to the button." + to_chat(user, "You add [W] to the button.") if(!device && !board && istype(W, /obj/item/weapon/wrench)) - user << "You start unsecuring the button frame..." + to_chat(user, "You start unsecuring the button frame...") playsound(loc, W.usesound, 50, 1) if(do_after(user, 40*W.toolspeed, target = src)) - user << "You unsecure the button frame." + to_chat(user, "You unsecure the button frame.") transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src))) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) @@ -132,14 +132,14 @@ req_one_access = list() board = null update_icon() - user << "You remove electronics from the button frame." + to_chat(user, "You remove electronics from the button frame.") else if(skin == "doorctrl") skin = "launcher" else skin = "doorctrl" - user << "You change the button frame's front panel." + to_chat(user, "You change the button frame's front panel.") return if((stat & (NOPOWER|BROKEN))) @@ -149,7 +149,7 @@ return if(!allowed(user)) - user << "Access Denied" + to_chat(user, "Access Denied") flick("[skin]-denied", src) return diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 4550852341..02903a1133 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -89,7 +89,7 @@ network = list() cameranet.removeCamera(src) stat |= EMPED - SetLuminosity(0) + set_light(0) emped = emped+1 //Increase the number of consecutive EMP's update_icon() var/thisemp = emped //Take note of which EMP this proc is for @@ -108,7 +108,7 @@ if (O.client && O.client.eye == src) O.unset_machine() O.reset_perspective(null) - O << "The screen bursts into static." + to_chat(O, "The screen bursts into static.") ..() /obj/machinery/camera/tesla_act(var/power)//EMP proof upgrade also makes it tesla immune @@ -138,7 +138,7 @@ // DECONSTRUCTION if(istype(W, /obj/item/weapon/screwdriver)) panel_open = !panel_open - user << "You screw the camera's panel [panel_open ? "open" : "closed"]." + to_chat(user, "You screw the camera's panel [panel_open ? "open" : "closed"].") playsound(src.loc, W.usesound, 50, 1) return @@ -150,7 +150,7 @@ else if(istype(W, /obj/item/device/multitool)) //change focus setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range)) - user << "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus." + to_chat(user, "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.") return else if(istype(W, /obj/item/weapon/weldingtool)) @@ -165,27 +165,27 @@ return upgradeXRay() qdel(W) - user << "[msg]" + to_chat(user, "[msg]") else - user << "[msg2]" + to_chat(user, "[msg2]") return else if(istype(W, /obj/item/stack/sheet/mineral/plasma)) if(!isEmpProof()) upgradeEmpProof() - user << "[msg]" + to_chat(user, "[msg]") qdel(W) else - user << "[msg2]" + to_chat(user, "[msg2]") return else if(istype(W, /obj/item/device/assembly/prox_sensor)) if(!isMotion()) upgradeMotion() - user << "[msg]" + to_chat(user, "[msg]") qdel(W) else - user << "[msg2]" + to_chat(user, "[msg2]") return // OTHER @@ -204,7 +204,7 @@ P = W itemname = P.name info = P.notehtml - U << "You hold \the [itemname] up to the camera..." + to_chat(U, "You hold \the [itemname] up to the camera...") U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in player_list) if(isAI(O)) @@ -212,25 +212,25 @@ if(AI.control_disabled || (AI.stat == DEAD)) return if(U.name == "Unknown") - AI << "[U] holds \a [itemname] up to one of your cameras ..." + to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") else - AI << "[U] holds \a [itemname] up to one of your cameras ..." + to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") AI.last_paper_seen = "
So this is what cloning \ - feels like?" - else if(grab_ghost_when == CLONER_MATURE_CLONE) - clonemind.current << "Your body is \ - beginning to regenerate in a cloning pod. You will \ - become conscious when it is complete." + clonemind.transfer_to(H) + + H.grab_ghost() + to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") + + if(grab_ghost_when == CLONER_MATURE_CLONE) + addtimer(CALLBACK(src, .proc/occupant_dreams), 100) if(H) H.faction |= factions @@ -204,6 +205,11 @@ attempting = FALSE return TRUE +/obj/machinery/clonepod/proc/occupant_dreams() + if(occupant) + to_chat(occupant, "While your body grows, you have the strangest dream, like you can see yourself from the outside.") + occupant.ghostize(TRUE) + //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() @@ -275,30 +281,30 @@ if(istype(P.buffer, /obj/machinery/computer/cloning)) if(get_area(P.buffer) != get_area(src)) - user << "-% Cannot link machines across power zones. Buffer cleared %-" + to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-") P.buffer = null return - user << "-% Successfully linked [P.buffer] with [src] %-" + to_chat(user, "-% Successfully linked [P.buffer] with [src] %-") var/obj/machinery/computer/cloning/comp = P.buffer if(connected) connected.DetachCloner(src) comp.AttachCloner(src) else P.buffer = src - user << "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-" + to_chat(user, "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-") return if(W.GetID()) if(!check_access(W)) - user << "Access Denied." + to_chat(user, "Access Denied.") return if(!(occupant || mess)) - user << "Error: Pod has no occupant." + to_chat(user, "Error: Pod has no occupant.") return else connected_message("Authorized Ejection") SPEAK("An authorized ejection of [occupant.real_name] has occurred.") - user << "You force an emergency ejection. " + to_chat(user, "You force an emergency ejection. ") go_out() else return ..() @@ -306,7 +312,7 @@ /obj/machinery/clonepod/emag_act(mob/user) if(!occupant) return - user << "You corrupt the genetic compiler." + to_chat(user, "You corrupt the genetic compiler.") malfunction() //Put messages in the connected computer's temp var for display. @@ -334,10 +340,8 @@ return if(grab_ghost_when == CLONER_MATURE_CLONE) - clonemind.transfer_to(occupant) occupant.grab_ghost() - occupant << "There is a bright flash!
\ - You feel like a new being." + to_chat(occupant, "There is a bright flash!
You feel like a new being.") occupant.flash_act() var/turf/T = get_turf(src) @@ -357,9 +361,7 @@ clonemind.transfer_to(occupant) occupant.grab_ghost() // We really just want to make you suffer. flash_color(occupant, flash_color="#960000", flash_time=100) - occupant << "Agony blazes across your \ - consciousness as your body is torn apart.
\ - Is this what dying is like? Yes it is." + to_chat(occupant, "Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.") playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0) occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50) QDEL_IN(occupant, 40) @@ -370,7 +372,9 @@ /obj/machinery/clonepod/emp_act(severity) if(prob(100/(severity*efficiency))) - malfunction() + connected_message(Gibberish("EMP-caused Accidental Ejection", 0)) + SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [occupant.real_name] prematurely." ,0)) + go_out() ..() /obj/machinery/clonepod/ex_act(severity, target) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index e89178c922..ebb9ea64f6 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -7,6 +7,8 @@ var/mob/living/carbon/human/patient = null var/obj/structure/table/optable/table = null + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/operating/Initialize() find_table() @@ -60,4 +62,4 @@ var/datum/surgery_step/surgery_step = procedure.get_surgery_step() dat += "Next step: [capitalize(surgery_step.name)]
" dat += "" - return dat \ No newline at end of file + return dat diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 435e2230b6..6eac3ca24f 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -7,13 +7,14 @@ circuit = /obj/item/weapon/circuitboard/computer/aifixer icon_keyboard = "tech_key" icon_screen = "ai-fixer" + light_color = LIGHT_COLOR_PINK /obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params) if(occupier && 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.") else return ..() @@ -93,7 +94,7 @@ if(..()) return if(href_list["fix"]) - usr << "Reconstruction in progress. This will take several minutes." + to_chat(usr, "Reconstruction in progress. This will take several minutes.") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) active = TRUE add_fingerprint(usr) @@ -120,26 +121,26 @@ //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.forceMove(src) occupier = AI AI.control_disabled = 1 AI.radio_enabled = 0 - 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.") card.AI = null update_icon() else //Uploading AI from terminal to card if(occupier && !active) - occupier << "You have been downloaded to a mobile storage device. Still no remote access." - user << "Transfer successful: [occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + to_chat(occupier, "You have been downloaded to a mobile storage device. Still no remote access.") + to_chat(user, "Transfer successful: [occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") occupier.loc = card card.AI = occupier occupier = null update_icon() else if (active) - user << "ERROR: Reconstruction in progress." + to_chat(user, "ERROR: Reconstruction in progress.") else if (!occupier) - user << "ERROR: Unable to locate artificial intelligence." + to_chat(user, "ERROR: Unable to locate artificial intelligence.") diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm new file mode 100644 index 0000000000..9ada010732 --- /dev/null +++ b/code/game/machinery/computer/apc_control.dm @@ -0,0 +1,210 @@ +/obj/machinery/computer/apc_control + name = "power flow control console" + desc = "Used to remotely control the flow of power to different parts of the station." + icon_screen = "solar" + icon_keyboard = "power_key" + req_access = list(access_engine) + circuit = /obj/item/weapon/circuitboard/computer/apc_control + light_color = LIGHT_COLOR_YELLOW + var/list/apcs //APCs the computer has access to + var/mob/living/operator //Who's operating the computer right now + var/obj/machinery/power/apc/active_apc //The APC we're using right now + var/list/filters //For sorting the results + var/checking_logs = 0 + var/list/logs + var/authenticated = 0 + var/auth_id = "\[NULL\]" + +/obj/machinery/computer/apc_control/Initialize() + apcs = list() //To avoid BYOND making the list run through a ton of procs + filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) + ..() + +/obj/machinery/computer/apc_control/process() + apcs = list() //Clear the list every tick + for(var/V in apcs_list) + var/obj/machinery/power/apc/APC = V + if(check_apc(APC)) + apcs[APC.name] = APC + if(operator && (!operator.Adjacent(src) || stat)) + operator = null + if(active_apc) + if(!active_apc.locked) + active_apc.say("Remote access canceled. Interface locked.") + playsound(active_apc, 'sound/machines/BoltsDown.ogg', 25, 0) + playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0) + active_apc.locked = TRUE + active_apc.update_icon() + active_apc = null + +/obj/machinery/computer/apc_control/attack_ai(mob/living/AI) //You already have APC access, cheater! + AI << "[src] does not support AI control." + return + +/obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC) + return APC.z == z && !APC.malfhack && !APC.aidisabled && !APC.emagged && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors + +/obj/machinery/computer/apc_control/interact(mob/living/user) + var/dat + if(authenticated) + if(!checking_logs) + dat += "Logged in as [auth_id].
" + dat += "Filters
" + dat += "Name: [filters["Name"] ? filters["Name"] : "None set"]
" + dat += "Charge: \>[filters["Charge Above"] ? filters["Charge Above"] : "NaN"]% and \<[filters["Charge Below"] ? filters["Charge Below"] : "NaN"]%
" + dat += "Accessible: [filters["Responsive"] ? "Non-Responsive Only" : "All"]
" + for(var/A in apcs) + var/obj/machinery/power/apc/APC = apcs[A] + if(filters["Name"] && !findtext(APC.name, filters["Name"]) && !findtext(APC.area.name, filters["Name"])) + continue + if(filters["Charge Above"] && (APC.cell.charge / APC.cell.maxcharge) < filters["Charge Above"] / 100) + continue + if(filters["Charge Below"] && (APC.cell.charge / APC.cell.maxcharge) > filters["Charge Below"] / 100) + continue + if(filters["Responsive"] && !APC.aidisabled) + continue + dat += "[A]
\ + Charge: [APC.cell.charge] / [APC.cell.maxcharge] W ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)
\ + Area: [APC.area]
\ + [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
" + dat += "Check Logs
" + dat += "Log Out
" + if(emagged) + dat += "WARNING: Logging functionality partially disabled from outside source.
" + dat += "Restore logging functionality?
" + else + if(logs.len) + for(var/entry in logs) + dat += "[entry]
" + else + dat += "No activity has been recorded at this time.
" + if(emagged) + dat += "@#%! CLEAR LOGS" + dat += "Return" + operator = user + else + dat = "Please swipe a valid ID to log in..." + var/datum/browser/popup = new(user, "apc_control", name, 600, 400) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) + popup.open() + +/obj/machinery/computer/apc_control/Topic(href, href_list) + if(..()) + return + if(!usr || !usr.canUseTopic(src) || usr.incapacitated() || stat || QDELETED(src)) + return + var/image/I = image(src) //For feedback message flavor + if(href_list["authenticate"]) + var/obj/item/weapon/card/id/ID = usr.get_active_held_item() + if(!istype(ID)) + ID = usr.get_idcard() + if(ID && istype(ID)) + if(check_access(ID)) + authenticated = TRUE + auth_id = "[ID.registered_name] ([ID.assignment])" + log_activity("logged in") + if(!authenticated) //Check for emags + var/obj/item/weapon/card/emag/E = usr.get_active_held_item() + if(E && istype(E) && usr.Adjacent(src)) + usr << "You bypass [src]'s access requirements using your emag." + authenticated = TRUE + log_activity("logged in") //Auth ID doesn't change, hinting that it was illicit + if(href_list["log_out"]) + log_activity("logged out") + authenticated = FALSE + auth_id = "\[NULL\]" + if(href_list["restore_logging"]) + to_chat(usr, "\icon[I] Logging functionality restored from backup data.") + emagged = FALSE + LAZYADD(logs, "-=- Logging restored to full functionality at this point -=-") + if(href_list["access_apc"]) + playsound(src, "terminal_type", 50, 0) + var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in apcs_list + if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC)) + to_chat(usr, "\icon[I] APC does not return interface request. Remote access may be disabled.") + return + if(active_apc) + to_chat(usr, "\icon[I] Disconnected from [active_apc].") + active_apc.say("Remote access canceled. Interface locked.") + playsound(active_apc, 'sound/machines/BoltsDown.ogg', 25, 0) + playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0) + active_apc.locked = TRUE + active_apc.update_icon() + active_apc = null + to_chat(usr, "\icon[I] Connected to APC in [get_area(APC)]. Interface request sent.") + log_activity("remotely accessed APC in [get_area(APC)]") + APC.interact(usr, not_incapacitated_state) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + message_admins("[key_name_admin(usr)] remotely accessed [APC] from [src] at [get_area(src)].") + log_game("[key_name_admin(usr)] remotely accessed [APC] from [src] at [get_area(src)].") + if(APC.locked) + APC.say("Remote access detected. Interface unlocked.") + playsound(APC, 'sound/machines/BoltsUp.ogg', 25, 0) + playsound(APC, 'sound/machines/terminal_alert.ogg', 50, 0) + APC.locked = FALSE + APC.update_icon() + active_apc = APC + if(href_list["name_filter"]) + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) + var/new_filter = stripped_input(usr, "What name are you looking for?", name) as null|text + if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src)) + return + log_activity("changed name filter to \"[new_filter]\"") + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + filters["Name"] = new_filter + if(href_list["above_filter"]) + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) + var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num + if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src)) + return + log_activity("changed greater than charge filter to \"[new_filter]\"") + if(new_filter) + new_filter = Clamp(new_filter, 0, 100) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + filters["Charge Above"] = new_filter + if(href_list["below_filter"]) + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) + var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num + if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src)) + return + log_activity("changed lesser than charge filter to \"[new_filter]\"") + if(new_filter) + new_filter = Clamp(new_filter, 0, 100) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + filters["Charge Below"] = new_filter + if(href_list["access_filter"]) + if(isnull(filters["Responsive"])) + filters["Responsive"] = 1 + log_activity("sorted by non-responsive APCs only") + else + filters["Responsive"] = !filters["Responsive"] + log_activity("sorted by all APCs") + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + if(href_list["check_logs"]) + checking_logs = TRUE + log_activity("checked logs") + if(href_list["check_apcs"]) + checking_logs = FALSE + log_activity("checked APCs") + if(href_list["clear_logs"]) + logs = list() + interact(usr) //Refresh the UI after a filter changes + +/obj/machinery/computer/apc_control/emag_act(mob/living/user) + if(emagged) + return + user.visible_message("You emag [src], disabling precise logging and allowing you to clear logs.") + log_game("[key_name_admin(user)] emagged [src] at [get_area(src)], disabling operator tracking.") + playsound(src, "sparks", 50, 1) + emagged = 1 + +/obj/machinery/computer/apc_control/proc/log_activity(log_text) + var/op_string = operator && !emagged ? operator : "\[NULL OPERATOR\]" + LAZYADD(logs, "([worldtime2text()]) [op_string] [log_text]") + +/mob/proc/using_power_flow_console() + for(var/obj/machinery/computer/apc_control/A in range(1, src)) + if(A.operator && A.operator == src && !A.stat) + return TRUE + return diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6dcc8861f6..3019528f8b 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -37,11 +37,16 @@ /obj/item/toy/talking/skeleton = 2, /obj/item/weapon/coin/antagtoken = 2, /obj/item/stack/tile/fakespace/loaded = 2, + /obj/item/stack/tile/fakepit/loaded = 2, /obj/item/toy/toy_xeno = 2, /obj/item/weapon/storage/box/actionfigure = 1, /obj/item/weapon/restraints/handcuffs/fake = 2, - /obj/item/weapon/gun/energy/megabuster = 2, - /obj/item/weapon/gun/energy/megabuster/proto = 2) + /obj/item/weapon/grenade/chem_grenade/glitter/pink = 1, + /obj/item/weapon/grenade/chem_grenade/glitter/blue = 1, + /obj/item/weapon/grenade/chem_grenade/glitter/white = 1, + /obj/item/toy/eightball = 2) + + light_color = LIGHT_COLOR_GREEN /obj/machinery/computer/arcade/New() ..() @@ -415,18 +420,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 gameStatus = ORION_STATUS_START @@ -494,21 +499,21 @@ 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_bodypart_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." ) 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) M.vomit(50) @@ -519,7 +524,7 @@ M.take_bodypart_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) @@ -1028,7 +1033,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() @@ -1069,9 +1074,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) @@ -1080,7 +1085,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 src.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/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 9d764b4b18..bb73d75467 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -9,6 +9,8 @@ var/receive_frequency = 1437 var/datum/radio_frequency/radio_connection + light_color = LIGHT_COLOR_CYAN + /obj/machinery/computer/atmos_alert/Initialize() ..() set_frequency(receive_frequency) @@ -44,11 +46,11 @@ if("clear") var/zone = params["zone"] if(zone in priority_alarms) - usr << "Priority alarm for [zone] cleared." + to_chat(usr, "Priority alarm for [zone] cleared.") priority_alarms -= zone . = TRUE if(zone in minor_alarms) - usr << "Minor alarm for [zone] cleared." + to_chat(usr, "Minor alarm for [zone] cleared.") minor_alarms -= zone . = TRUE update_icon() @@ -82,4 +84,4 @@ if(priority_alarms.len) add_overlay("alert:2") else if(minor_alarms.len) - add_overlay("alert:1") \ No newline at end of file + add_overlay("alert:1") diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index b04a1d9815..bccb99dfdd 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -82,6 +82,8 @@ var/list/sensor_information = list() var/datum/radio_frequency/radio_connection + light_color = LIGHT_COLOR_CYAN + /obj/machinery/computer/atmos_control/Initialize() ..() set_frequency(frequency) @@ -156,7 +158,7 @@ var/list/text = splittext(U.id, "_") IO |= text[1] if(!IO.len) - user << "No machinery detected." + to_chat(user, "No machinery detected.") var/S = input("Select the device set: ", "Selection", IO[1]) as anything in IO if(src) src.input_tag = "[S]_in" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index e4e3224c48..5271dc5293 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -9,9 +9,9 @@ if(0) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, P.usesound, 50, 1) - user << "You start wrenching the frame into place..." + to_chat(user, "You start wrenching the frame into place...") if(do_after(user, 20*P.toolspeed, target = src)) - user << "You wrench the frame into place." + to_chat(user, "You wrench the frame into place.") anchored = 1 state = 1 return @@ -19,13 +19,13 @@ var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) if(!WT.isOn()) - 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, P.usesound, 50, 1) - user << "You start deconstructing the frame..." + to_chat(user, "You start deconstructing the frame...") if(do_after(user, 20*P.toolspeed, target = src)) if(!src || !WT.isOn()) return - user << "You deconstruct the frame." + to_chat(user, "You deconstruct the frame.") var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) qdel(src) @@ -33,9 +33,9 @@ if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, P.usesound, 50, 1) - user << "You start to unfasten the frame..." + to_chat(user, "You start to unfasten the frame...") if(do_after(user, 20*P.toolspeed, target = src)) - user << "You unfasten the frame." + to_chat(user, "You unfasten the frame.") anchored = 0 state = 0 return @@ -43,7 +43,7 @@ if(!user.drop_item()) return playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You place the circuit board inside the frame." + to_chat(user, "You place the circuit board inside the frame.") icon_state = "1" circuit = P circuit.add_fingerprint(user) @@ -51,17 +51,17 @@ return else if(istype(P, /obj/item/weapon/circuitboard) && !circuit) - user << "This frame does not accept circuit boards of this type!" + to_chat(user, "This frame does not accept circuit boards of this type!") return if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) - user << "You screw the circuit board into place." + to_chat(user, "You screw the circuit board into place.") state = 2 icon_state = "2" return if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, P.usesound, 50, 1) - user << "You remove the circuit board." + to_chat(user, "You remove the circuit board.") state = 1 icon_state = "0" circuit.loc = src.loc @@ -71,7 +71,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) - user << "You unfasten the circuit board." + to_chat(user, "You unfasten the circuit board.") state = 1 icon_state = "1" return @@ -79,20 +79,20 @@ var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start adding cables to the frame..." + to_chat(user, "You start adding cables to the frame...") if(do_after(user, 20*P.toolspeed, target = src)) if(C.get_amount() >= 5 && state == 2) C.use(5) - user << "You add cables to the frame." + to_chat(user, "You add cables to the frame.") state = 3 icon_state = "3" else - user << "You need five lengths of cable to wire the frame!" + to_chat(user, "You need five lengths of cable to wire the frame!") return if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, P.usesound, 50, 1) - user << "You remove the cables." + to_chat(user, "You remove the cables.") state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new (loc) @@ -103,22 +103,22 @@ if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P if(G.get_amount() < 2) - user << "You need two glass sheets to continue construction!" + to_chat(user, "You need two glass sheets to continue construction!") return else playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to put in the glass panel..." + to_chat(user, "You start to put in the glass panel...") if(do_after(user, 20, target = src)) if(G.get_amount() >= 2 && state == 3) G.use(2) - user << "You put in the glass panel." + to_chat(user, "You put in the glass panel.") state = 4 src.icon_state = "4" return if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, P.usesound, 50, 1) - user << "You remove the glass panel." + to_chat(user, "You remove the glass panel.") state = 3 icon_state = "3" var/obj/item/stack/sheet/glass/G = new (loc, 2) @@ -126,7 +126,7 @@ return if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, P.usesound, 50, 1) - user << "You connect the monitor." + to_chat(user, "You connect the monitor.") var/obj/B = new src.circuit.build_path (src.loc, circuit) transfer_fingerprints_to(B) qdel(src) @@ -222,13 +222,13 @@ /obj/item/weapon/circuitboard/computer/card/minor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) target_dept = (target_dept == dept_list.len) ? 1 : (target_dept + 1) - user << "You set the board to \"[dept_list[target_dept]]\"." + to_chat(user, "You set the board to \"[dept_list[target_dept]]\".") else return ..() /obj/item/weapon/circuitboard/computer/card/minor/examine(user) ..() - user << "Currently set to \"[dept_list[target_dept]]\"." + to_chat(user, "Currently set to \"[dept_list[target_dept]]\".") //obj/item/weapon/circuitboard/computer/shield // name = "Shield Control (Computer Board)" @@ -312,11 +312,11 @@ if(build_path == /obj/machinery/computer/rdconsole/core) name = "RD Console - Robotics (Computer Board)" build_path = /obj/machinery/computer/rdconsole/robotics - user << "Access protocols successfully updated." + to_chat(user, "Access protocols successfully updated.") else name = "RD Console (Computer Board)" build_path = /obj/machinery/computer/rdconsole/core - user << "Defaulting access protocols." + to_chat(user, "Defaulting access protocols.") else return ..() @@ -346,14 +346,14 @@ if(istype(I,/obj/item/device/multitool)) if(!emagged) contraband = !contraband - user << "Receiver spectrum set to [contraband ? "Broad" : "Standard"]." + to_chat(user, "Receiver spectrum set to [contraband ? "Broad" : "Standard"].") else - user << "The spectrum chip is unresponsive." + to_chat(user, "The spectrum chip is unresponsive.") else if(istype(I,/obj/item/weapon/card/emag)) if(!emagged) contraband = TRUE emagged = TRUE - user << "You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband." + to_chat(user, "You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") else return ..() @@ -445,10 +445,15 @@ if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) name = "Library Visitor Console (Computer Board)" build_path = /obj/machinery/computer/libraryconsole - user << "Defaulting access protocols." + to_chat(user, "Defaulting access protocols.") else name = "Book Inventory Management Console (Computer Board)" build_path = /obj/machinery/computer/libraryconsole/bookmanagement - user << "Access protocols successfully updated." + to_chat(user, "Access protocols successfully updated.") else return ..() + +/obj/item/weapon/circuitboard/computer/apc_control + name = "\improper Power Flow Control Console (Computer Board)" + build_path = /obj/machinery/computer/apc_control + origin_tech = "programming=3;engineering=3;powerstorage=2" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 44bfc1de8b..34c859280f 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,6 +9,8 @@ var/mapping = 0//For the overview file, interesting bit of code. var/list/watchers = list() //who's using the console, associated with the camera they're on. + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/security/check_eye(mob/user) if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind ) user.unset_machine() @@ -154,6 +156,8 @@ circuit = null clockwork = TRUE //it'd look very weird + light_power = 0 + /obj/machinery/computer/security/telescreen/update_icon() icon_state = initial(icon_state) if(stat & BROKEN) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index c5b74c262d..e3bf9573c9 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -4,23 +4,25 @@ icon_screen = "cameras" icon_keyboard = "security_key" var/mob/camera/aiEye/remote/eyeobj - var/mob/living/carbon/human/current_user = null + var/mob/living/current_user = null var/list/networks = list("SS13") var/datum/action/innate/camera_off/off_action = new var/datum/action/innate/camera_jump/jump_action = new + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/camera_advanced/proc/CreateEye() eyeobj = new() eyeobj.origin = src -/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/carbon/user) +/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/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( (stat & (NOPOWER|BROKEN)) || !Adjacent(user) || user.eye_blind || user.incapacitated() ) + if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() ) user.unset_machine() /obj/machinery/computer/camera_advanced/Destroy() @@ -36,13 +38,11 @@ /obj/machinery/computer/camera_advanced/attack_hand(mob/user) if(current_user) - user << "The console is already in use!" - return - if(!iscarbon(user)) + to_chat(user, "The console is already in use!") return if(..()) return - var/mob/living/carbon/L = user + var/mob/living/L = user if(!eyeobj) CreateEye() @@ -65,6 +65,11 @@ give_eye_control(L) eyeobj.setLoc(eyeobj.loc) +/obj/machinery/computer/camera_advanced/attack_robot(mob/user) + return attack_hand(user) + +obj/machinery/computer/camera_advanced/attack_ai(mob/user) + return //AIs would need to disable their own camera procs to use the console safely. Bugs happen otherwise. /obj/machinery/computer/camera_advanced/proc/give_eye_control(mob/user) @@ -80,7 +85,7 @@ var/sprint = 10 var/cooldown = 0 var/acceleration = 1 - var/mob/living/carbon/human/eye_user = null + var/mob/living/eye_user = null var/obj/machinery/computer/camera_advanced/origin var/eye_initialized = 0 var/visible_icon = 0 @@ -132,9 +137,9 @@ button_icon_state = "camera_off" /datum/action/innate/camera_off/Activate() - if(!target || !iscarbon(target)) + if(!target || !isliving(target)) return - var/mob/living/carbon/C = target + var/mob/living/C = target var/mob/camera/aiEye/remote/remote_eye = C.remote_control remote_eye.origin.current_user = null remote_eye.origin.jump_action.Remove(C) @@ -155,9 +160,9 @@ button_icon_state = "camera_jump" /datum/action/innate/camera_jump/Activate() - if(!target || !iscarbon(target)) + if(!target || !isliving(target)) return - var/mob/living/carbon/C = target + var/mob/living/C = target var/mob/camera/aiEye/remote/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 587d76b681..90d6fecd03 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -19,6 +19,7 @@ var/time_last_changed_position = 0 var/list/region_access = null var/list/head_subordinates = null var/target_dept = 0 //Which department this computer has access to. 0=all departments + var/prioritycount = 0 // we don't want 500 prioritized jobs //Cooldown for closing positions in seconds //if set to -1: No cooldown... probably a bad idea @@ -43,6 +44,8 @@ var/time_last_changed_position = 0 //Assoc array: "JobName" = (int)
| Job | Slots | Open job | Close job | |
| Job | Slots | Open job | Close job | Prioritize | " + switch(job.total_positions) + if(0) + dat += "Denied" + else + if(ID) + if(job in SSjob.prioritized_jobs) + dat += "Deprioritize" + else + if(prioritycount < 5) + dat += "Prioritize" + else + dat += "Denied" + else + dat += "Prioritize" + dat += " | " dat += "
" header += "Remove [target_name] || " header += "Remove [scan_name]
" - header += "Access Crew Manifest || " + header += "Access Crew Manifest
" header += "Log Out
" @@ -398,12 +417,13 @@ var/time_last_changed_position = 0 if(region_access) authenticated = 1 else if ((!( authenticated ) && issilicon(usr)) && (!modify)) - usr << "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in." + to_chat(usr, "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.") if ("logout") region_access = null head_subordinates = null authenticated = 0 playsound(src, 'sound/machines/terminal_off.ogg', 50, 0) + if("access") if(href_list["allowed"]) if(authenticated) @@ -433,7 +453,7 @@ var/time_last_changed_position = 0 jobdatum = J break if(!jobdatum) - usr << "No log exists for this job." + to_chat(usr, "No log exists for this job.") return modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() ) @@ -445,7 +465,7 @@ var/time_last_changed_position = 0 modify.assignment = "Unassigned" playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) else - usr << "You are not authorized to demote this position." + to_chat(usr, "You are not authorized to demote this position.") if ("reg") if (authenticated) var/t2 = modify @@ -456,7 +476,7 @@ var/time_last_changed_position = 0 modify.registered_name = newName playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) else - usr << "Invalid name entered." + to_chat(usr, "Invalid name entered.") return if ("mode") mode = text2num(href_list["mode_target"]) @@ -497,6 +517,24 @@ var/time_last_changed_position = 0 opened_positions[edit_job_target]-- playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + if ("prioritize_job") + // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY + if(scan && (access_change_ids in scan.access) && !target_dept) + var/priority_target = href_list["job"] + var/datum/job/j = SSjob.GetJob(priority_target) + if(!j) + return 0 + var/priority = TRUE + if(j in SSjob.prioritized_jobs) + SSjob.prioritized_jobs -= j + prioritycount-- + priority = FALSE + else + SSjob.prioritized_jobs += j + prioritycount++ + usr << "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request." + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + if ("print") if (!( printing )) printing = 1 @@ -544,6 +582,8 @@ var/time_last_changed_position = 0 target_dept = 2 icon_screen = "idhos" + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/card/minor/cmo target_dept = 3 icon_screen = "idcmo" @@ -552,6 +592,10 @@ var/time_last_changed_position = 0 target_dept = 4 icon_screen = "idrd" + light_color = LIGHT_COLOR_PINK + /obj/machinery/computer/card/minor/ce target_dept = 5 icon_screen = "idce" + + light_color = LIGHT_COLOR_YELLOW diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 2356da5c50..222c628ec7 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -18,6 +18,8 @@ var/loading = 0 // Nice loading text var/autoprocess = 0 + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/cloning/Initialize() ..() updatemodules(TRUE) @@ -63,7 +65,7 @@ for(var/datum/data/record/R in records) var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"]) - + if(!pod) return @@ -120,25 +122,25 @@ return W.loc = src src.diskette = W - user << "You insert [W]." + to_chat(user, "You insert [W].") playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) src.updateUsrDialog() else if(istype(W,/obj/item/device/multitool)) var/obj/item/device/multitool/P = W - + if(istype(P.buffer, /obj/machinery/clonepod)) if(get_area(P.buffer) != get_area(src)) - user << "-% Cannot link machines across power zones. Buffer cleared %-" + to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-") P.buffer = null return - user << "-% Successfully linked [P.buffer] with [src] %-" + to_chat(user, "-% Successfully linked [P.buffer] with [src] %-") var/obj/machinery/clonepod/pod = P.buffer if(pod.connected) pod.connected.DetachCloner(pod) AttachCloner(pod) else P.buffer = src - user << "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-" + to_chat(user, "-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-") return else return ..() @@ -159,7 +161,7 @@ var/dat = "" dat += "Refresh" - + if(scanner && HasEfficientPod() && scanner.scan_level > 2) if(!autoprocess) dat += "Autoprocess" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d85e2066eb..7247288466 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -35,6 +35,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/stat_msg1 var/stat_msg2 + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/communications/proc/checkCCcooldown() var/obj/item/weapon/circuitboard/computer/communications/CM = circuit if(CM.lastTimeUsed + 600 > world.time) @@ -55,7 +57,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(..()) return if (src.z > ZLEVEL_CENTCOM) //Can only use on centcom and SS13 - usr << "Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!") return usr.set_machine(src) @@ -84,7 +86,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(src.emagged) authenticated = 2 auth_id = "Unknown" - M << "[src] lets out a quiet alarm as its login is overriden." + to_chat(M, "[src] lets out a quiet alarm as its login is overriden.") playsound(src, 'sound/machines/terminal_on.ogg', 50, 0) playsound(src, 'sound/machines/terminal_alert.ogg', 25, 0) if(prob(25)) @@ -108,7 +110,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this set_security_level(tmp_alertlevel) if(security_level != old_level) - usr << "Authorization confirmed. Modifying security level." + to_chat(usr, "Authorization confirmed. Modifying security level.") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) //Only notify the admins if an actual change happened log_game("[key_name(usr)] has changed the security level to [get_security_level()].") @@ -120,12 +122,12 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 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!") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) tmp_alertlevel = 0 state = STATE_DEFAULT else - usr << "You need to swipe your ID!" + to_chat(usr, "You need to swipe your ID!") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) if("announce") @@ -136,7 +138,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if("crossserver") if(authenticated==2) if(CM.lastTimeUsed + 600 > world.time) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return var/input = stripped_multiline_input(usr, "Please choose a message to transmit to an allied station. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") @@ -158,12 +160,12 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles if(S && istype(S)) if(SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE) - usr << "It's a bit late to buy a new shuttle, don't you think?" + to_chat(usr, "It's a bit late to buy a new shuttle, don't you think?") return if(SSshuttle.shuttle_purchased) - usr << "A replacement shuttle has already been purchased." + to_chat(usr, "A replacement shuttle has already been purchased.") else if(!S.prerequisites_met()) - usr << "You have not met the requirements for purchasing this shuttle." + to_chat(usr, "You have not met the requirements for purchasing this shuttle.") else if(SSshuttle.points >= S.credit_cost) var/obj/machinery/shuttle_manipulator/M = locate() in machines @@ -178,9 +180,9 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 message_admins("[key_name_admin(usr)] purchased [S.name].") feedback_add_details("shuttle_purchase", S.name) else - usr << "Something went wrong! The shuttle exchange system seems to be down." + to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.") else - usr << "Not enough credits." + to_chat(usr, "Not enough credits.") if("callshuttle") src.state = STATE_DEFAULT @@ -270,14 +272,14 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if("MessageCentcomm") if(src.authenticated==2) if(!checkCCcooldown()) - 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 Centcom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to Centcomm.", "") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) Centcomm_announce(input, usr) - usr << "Message transmitted to Central Command." + to_chat(usr, "Message transmitted to Central Command.") log_say("[key_name(usr)] has made a Centcom announcement: [input]") CM.lastTimeUsed = world.time @@ -286,7 +288,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) if(!checkCCcooldown()) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "") @@ -294,12 +296,12 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) Syndicate_announce(input, usr) - usr << "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND." + to_chat(usr, "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.") log_say("[key_name(usr)] has made a Syndicate announcement: [input]") CM.lastTimeUsed = world.time if("RestoreBackup") - usr << "Backup routing data restored!" + to_chat(usr, "Backup routing data restored!") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) src.emagged = 0 src.updateDialog() @@ -307,13 +309,13 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if("nukerequest") //When there's no other way if(src.authenticated==2) if(!checkCCcooldown()) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") 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.","") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) 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_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') CM.lastTimeUsed = world.time @@ -402,14 +404,14 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.emagged = 1 if(authenticated == 1) authenticated = 2 - user << "You scramble the communication routing circuits!" + to_chat(user, "You scramble the communication routing circuits!") playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) /obj/machinery/computer/communications/attack_hand(mob/user) if(..()) return if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") return user.set_machine(src) @@ -453,7 +455,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if (src.authenticated==2) dat += "
Captain Functions" dat += "
\[ Make a Captain's Announcement \]" - if(cross_allowed) + if(config.cross_allowed) dat += "
\[ Send a message to an allied station \]" dat += "
\[ Purchase Shuttle \]" dat += "
\[ Change Alert Level \]" @@ -657,7 +659,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 /obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon) if(!SScommunications.can_announce(user, is_silicon)) - user << "Intercomms recharging. Please stand by." + to_chat(user, "Intercomms recharging. Please stand by.") return var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?") if(!input || !user.canUseTopic(src)) @@ -692,4 +694,4 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 /obj/machinery/computer/communications/proc/overrideCooldown() var/obj/item/weapon/circuitboard/computer/communications/CM = circuit - CM.lastTimeUsed = 0 \ No newline at end of file + CM.lastTimeUsed = 0 diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 889c63f09b..2a2c02f72b 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -73,16 +73,16 @@ /obj/machinery/computer/power_change() ..() if(stat & NOPOWER) - SetLuminosity(0) + set_light(0) else - SetLuminosity(brightness_on) + set_light(brightness_on) update_icon() return /obj/machinery/computer/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags&NODECONSTRUCT)) playsound(src.loc, I.usesound, 50, 1) - user << " You start to disconnect the monitor..." + to_chat(user, " You start to disconnect the monitor...") if(do_after(user, 20*I.toolspeed, target = src)) deconstruct(TRUE, user) else @@ -124,7 +124,7 @@ A.anchored = 1 if(stat & BROKEN) if(user) - user << "The broken glass falls out." + to_chat(user, "The broken glass falls out.") else playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) new /obj/item/weapon/shard(src.loc) @@ -133,7 +133,7 @@ A.icon_state = "3" else if(user) - user << "You disconnect the monitor." + to_chat(user, "You disconnect the monitor.") A.state = 4 A.icon_state = "4" circuit = null diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 05176b09aa..de65c1bed2 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -9,6 +9,8 @@ circuit = /obj/item/weapon/circuitboard/computer/crew var/monitor = null //For VV debugging purposes + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/crew/New() monitor = crewmonitor return ..() @@ -242,11 +244,11 @@ var/global/datum/crewmonitor/crewmonitor = new if (!C) C = locate(/obj/machinery/camera) in urange(15, tile) if (C) - var/turf/current_loc = AI.eyeobj.loc + addtimer(CALLBACK(src, .proc/update_ai, AI, C, AI.eyeobj.loc), min(30, get_dist(get_turf(C), AI.eyeobj) / 4)) - spawn(min(30, get_dist(get_turf(C), AI.eyeobj) / 4)) - if (AI && AI.eyeobj && current_loc == AI.eyeobj.loc) - AI.switchCamera(C) +/datum/crewmonitor/proc/update_ai(mob/living/silicon/ai/AI, obj/machinery/camera/C, turf/current_loc) + if (AI && AI.eyeobj && current_loc == AI.eyeobj.loc) + AI.switchCamera(C) /mob/living/carbon/human/Move() if (src.w_uniform) @@ -265,4 +267,4 @@ var/global/datum/crewmonitor/crewmonitor = new /datum/crewmonitor/proc/sendResources(var/client/client) send_asset(client, "crewmonitor.js") send_asset(client, "crewmonitor.css") - SSminimap.send(client) + SSminimap.send(client) \ No newline at end of file diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index a4dee33e60..a100f16184 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -38,6 +38,8 @@ idle_power_usage = 10 active_power_usage = 400 + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) @@ -45,7 +47,7 @@ return I.loc = src src.diskette = I - user << "You insert [I]." + to_chat(user, "You insert [I].") src.updateUsrDialog() return else @@ -572,7 +574,7 @@ viable_occupant.dna.blood_type = buffer_slot["blood_type"] /obj/machinery/computer/scan_consolenew/proc/on_scanner_close() - connected.occupant << "[src] activates!" + to_chat(connected.occupant, "[src] activates!") if(delayed_action) apply_buffer(delayed_action["action"],delayed_action["buffer"]) delayed_action = null //or make it stick + reset button ? diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index d11193759e..b9dc410e57 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -13,6 +13,8 @@ var/mob/living/carbon/human/prisoner = null var/datum/data/record/temporary_record = null + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/gulag_teleporter_computer/New() ..() addtimer(CALLBACK(src, .proc/scan_machinery), 5) @@ -29,10 +31,10 @@ return W.forceMove(src) id = W - user << "You insert [W]." + to_chat(user, "You insert [W].") return else - user << "There's an ID inserted already." + to_chat(user, "There's an ID inserted already.") return ..() /obj/machinery/computer/gulag_teleporter_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ @@ -82,7 +84,7 @@ if(..()) return if(!allowed(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") return switch(action) if("scan_teleporter") @@ -113,12 +115,12 @@ id.goal = Clamp(new_goal, 0, 1000) //maximum 1000 points if("toggle_open") if(teleporter.locked) - usr << "The teleporter is locked" + to_chat(usr, "The teleporter is locked") return teleporter.toggle_open() if("teleporter_lock") if(teleporter.state_open) - usr << "Close the teleporter before locking!" + to_chat(usr, "Close the teleporter before locking!") return teleporter.locked = !teleporter.locked if("teleport") @@ -147,7 +149,7 @@ playsound(loc, 'sound/weapons/emitter.ogg', 50, 1) prisoner.forceMove(get_turf(beacon)) prisoner.Weaken(2) // small travel dizziness - prisoner << "The teleportation makes you a little dizzy." + to_chat(prisoner, "The teleportation makes you a little dizzy.") new /obj/effect/particle_effect/sparks(prisoner.loc) playsound(src.loc, "sparks", 50, 1) if(teleporter.locked) @@ -155,10 +157,3 @@ teleporter.toggle_open() id = null temporary_record = null - - - - - - - diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 7ff5491ebe..4846c99326 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -10,15 +10,15 @@ if(src.stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - user << "You haven't selected anything to transmit laws to!" + to_chat(user, "You haven't selected anything to transmit laws to!") return if(!can_upload_to(current)) - user << "Upload failed! Check to make sure [current.name] is functioning properly." + to_chat(user, "Upload failed! Check to make sure [current.name] is functioning properly.") current = null return var/turf/currentloc = get_turf(current) if(currentloc && user.z != currentloc.z) - user << "Upload failed! Unable to establish a connection to [current.name]. You're too far away!" + to_chat(user, "Upload failed! Unable to establish a connection to [current.name]. You're too far away!") current = null return M.install(current.laws, user) @@ -42,9 +42,9 @@ src.current = select_active_ai(user) if (!src.current) - user << "No active AIs detected!" + to_chat(user, "No active AIs detected!") else - user << "[src.current.name] selected for law changes." + to_chat(user, "[src.current.name] selected for law changes.") /obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A) if(!A || !isAI(A)) @@ -66,9 +66,9 @@ src.current = select_active_free_borg(user) if(!src.current) - user << "No active unslaved cyborgs detected!" + to_chat(user, "No active unslaved cyborgs detected!") else - user << "[src.current.name] selected for law changes." + to_chat(user, "[src.current.name] selected for law changes.") /obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B) if(!B || !iscyborg(B)) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index da3df8b2cf..fc4e9f6071 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -20,13 +20,15 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending + light_color = LIGHT_COLOR_BLUE + /obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) if(!user.drop_item()) return O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") else return ..() @@ -458,7 +460,7 @@ else if(href_list["del_r2"]) investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records") if(active2) - data_core.medical -= active2 + qdel(active2) active2 = null else if(href_list["d_rec"]) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index b9251ce02d..a0ada38d1e 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -17,7 +17,7 @@ var/noserver = "ALERT: No server detected." var/incorrectkey = "ALERT: Incorrect decryption key!" var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(: Critical %$$@ Error // !RestArting!
%@%(*$%&(&?*(%&/{}" + MK.info += "
�%@%(*$%&(�&?*(%&�/{}" var/time = 100 * length(src.linkedServer.decryptkey) addtimer(CALLBACK(src, .proc/UnmagConsole), time) 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/Initialize() ..() @@ -225,10 +227,10 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user) 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.screen = 0 // Return the screen back to normal @@ -414,7 +416,7 @@ customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" + to_chat(H, "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") log_pda("[usr]/([usr.ckey]) (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.cut_overlays() customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r")) @@ -427,7 +429,7 @@ customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)" + to_chat(H, "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") log_pda("[usr]/([usr.ckey]) (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.cut_overlays() customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r")) diff --git a/code/game/machinery/computer/monastery_shuttle.dm b/code/game/machinery/computer/monastery_shuttle.dm new file mode 100644 index 0000000000..e64d784a1f --- /dev/null +++ b/code/game/machinery/computer/monastery_shuttle.dm @@ -0,0 +1,11 @@ +/obj/machinery/computer/shuttle/monastery_shuttle + name = "monastery shuttle console" + desc = "Used to control the monastery shuttle." + circuit = /obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle + shuttleId = "pod1" + possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station" + no_destination_swap = TRUE + +/obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle + name = "Monastery Shuttle (Computer Board)" + build_path = /obj/machinery/computer/shuttle/monastery_shuttle diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index fb20f0854e..f41375a705 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -134,7 +134,7 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user) 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 263c45a0b8..c6aa932c6c 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -13,6 +13,8 @@ var/obj/item/weapon/card/id/prisoner/inserted_id circuit = /obj/item/weapon/circuitboard/computer/prisoner + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/prisoner/attack_hand(mob/user) if(..()) return @@ -94,7 +96,7 @@ return I.loc = src inserted_id = I - else usr << "No valid ID." + else to_chat(usr, "No valid ID.") else if(inserted_id) switch(href_list["id"]) if("eject") @@ -126,7 +128,7 @@ if(src.allowed(usr)) screen = !screen else - usr << "Unauthorized Access." + to_chat(usr, "Unauthorized Access.") else if(href_list["warn"]) var/warning = copytext(sanitize(input(usr,"Message:","Enter your message here!","")),1,MAX_MESSAGE_LEN) @@ -134,11 +136,9 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) in tracked_chem_implants if(I && istype(I) && I.imp_in) var/mob/living/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]'") log_say("[usr]/[usr.ckey] sent an implant message to [R]/[R.ckey]: '[warning]'") src.add_fingerprint(usr) src.updateUsrDialog() return - - diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 1cebe4b86a..0cb2ea8cc2 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -10,6 +10,8 @@ circuit = /obj/item/weapon/circuitboard/computer/robotics var/temp = null + light_color = LIGHT_COLOR_PINK + /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) if(!istype(R)) return 0 @@ -30,7 +32,7 @@ /obj/machinery/computer/robotics/interact(mob/user) if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") return user.set_machine(src) var/dat @@ -106,18 +108,18 @@ var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) if(R.syndicate && R.emagged) - R << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered." + to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") if(R.connected_ai) - R.connected_ai << "
ALERT - Cyborg detonation detected: [R.name]
" + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") R.ResetSecurityCodes() else message_admins("[key_name_admin(usr)] (FLW) detonated [key_name(R, R.client)](JMP)!") log_game("\[key_name(usr)] detonated [key_name(R)]!") if(R.connected_ai) - R.connected_ai << "
ALERT - Cyborg detonation detected: [R.name]
" + to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") R.self_destruct() else - usr << "Access Denied." + to_chat(usr, "Access Denied.") else if (href_list["stopbot"]) if(src.allowed(usr)) @@ -128,12 +130,12 @@ message_admins("[key_name_admin(usr)] (FLW) [R.canmove ? "locked down" : "released"] [key_name(R, R.client)](FLW)!") log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) - R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") if(R.connected_ai) - R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" + to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") else - usr << "Access Denied." + to_chat(usr, "Access Denied.") else if (href_list["magbot"]) if((issilicon(usr) && is_special_character(usr)) || IsAdminGhost(usr)) @@ -157,7 +159,7 @@ if(src.allowed(usr)) var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) if(D.hacked) - usr << "ERROR: [D] is not responding to external commands." + to_chat(usr, "ERROR: [D] is not responding to external commands.") else var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, D) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index d4239250e8..fbbae48ad3 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,5 +1,3 @@ - - /obj/machinery/computer/secure_data//TODO:SANITY name = "security records console" desc = "Used to view and edit personnel's security records" @@ -23,6 +21,7 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending + light_color = LIGHT_COLOR_RED /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id)) @@ -31,9 +30,9 @@ return O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") else - user << "There's already an ID card in the console." + to_chat(user, "There's already an ID card in the console.") else return ..() @@ -42,7 +41,7 @@ if(..()) return if(src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "Unable to establish a connection: \black You're too far away from the station!") return var/dat @@ -442,7 +441,7 @@ What a mess.*/ sleep(30) if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))//make sure the record still exists. var/obj/item/weapon/photo/photo = active1.fields["photo_front"] - new /obj/item/weapon/poster/legit/wanted(src.loc, photo.img, wanted_name, info) + new /obj/item/weapon/poster/wanted(src.loc, photo.img, wanted_name, info) printing = 0 //RECORD DELETE @@ -703,7 +702,6 @@ What a mess.*/ if("Delete Record (Security) Execute") investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") if(active2) - data_core.security -= active2 qdel(active2) active2 = null @@ -712,15 +710,12 @@ What a mess.*/ investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") for(var/datum/data/record/R in data_core.medical) if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) - data_core.medical -= R qdel(R) break - data_core.general -= active1 qdel(active1) active1 = null if(active2) - data_core.security -= active2 qdel(active2) active2 = null else diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index debb8a5f7a..2d27bef53c 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -6,6 +6,8 @@ circuit = /obj/item/weapon/circuitboard/computer/stationalert var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list()) + light_color = LIGHT_COLOR_CYAN + /obj/machinery/computer/station_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ datum/tgui/master_ui = null, datum/ui_state/state = default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -80,4 +82,4 @@ if(L.len) active_alarms = TRUE if(active_alarms) - add_overlay("alert:2") \ No newline at end of file + add_overlay("alert:2") diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 56cb36a70e..daf2864374 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -11,6 +11,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F clockwork = TRUE //it'd look weird, at least if ratvar ever got there resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + light_color = LIGHT_COLOR_RED + ///////////////////////////////////////////// /obj/machinery/computer/telecrystals/uplinker name = "\improper Telecrystal upload/receive station" @@ -32,7 +34,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F /obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params) 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) var/obj/item/I = user.get_active_held_item() @@ -44,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...") /obj/machinery/computer/telecrystals/uplinker/update_icon() ..() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 1d6083d150..84102c040e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -11,7 +11,7 @@ /obj/structure/frame/examine(user) ..() if(circuit) - user << "It has \a [circuit] installed." + to_chat(user, "It has \a [circuit] installed.") /obj/structure/frame/deconstruct(disassembled = TRUE) @@ -45,9 +45,9 @@ hasContent = 1 if(hasContent) - user << requires + "." + to_chat(user, requires + ".") else - user << "It does not require any more components." + to_chat(user, "It does not require any more components.") /obj/structure/frame/machine/proc/update_namelist() if(!req_components) @@ -76,24 +76,24 @@ switch(state) if(1) if(istype(P, /obj/item/weapon/circuitboard/machine)) - user << "The frame needs wiring first!" + to_chat(user, "The frame needs wiring first!") return else if(istype(P, /obj/item/weapon/circuitboard)) - user << "This frame does not accept circuit boards of this type!" + to_chat(user, "This frame does not accept circuit boards of this type!") return if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if(C.get_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*P.toolspeed, target = src)) if(C.get_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 if(istype(P, /obj/item/weapon/screwdriver) && !anchored) playsound(src.loc, P.usesound, 50, 1) @@ -101,38 +101,38 @@ "You start to disassemble the frame...", "You hear banging and clanking.") if(do_after(user, 40*P.toolspeed, target = src)) if(state == 1) - user << "You disassemble the frame." + to_chat(user, "You disassemble the frame.") var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) qdel(src) return if(istype(P, /obj/item/weapon/wrench)) - user << "You start [anchored ? "un" : ""]securing [name]..." + to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(src.loc, P.usesound, 75, 1) if(do_after(user, 40*P.toolspeed, target = src)) if(state == 1) - user << "You [anchored ? "un" : ""]secure [name]." + to_chat(user, "You [anchored ? "un" : ""]secure [name].") anchored = !anchored return if(2) if(istype(P, /obj/item/weapon/wrench)) - user << "You start [anchored ? "un" : ""]securing [name]..." + to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(src.loc, P.usesound, 75, 1) if(do_after(user, 40*P.toolspeed, target = src)) - user << "You [anchored ? "un" : ""]secure [name]." + to_chat(user, "You [anchored ? "un" : ""]secure [name].") anchored = !anchored return if(istype(P, /obj/item/weapon/circuitboard/machine)) if(!anchored) - user << "The frame needs to be secured first!" + to_chat(user, "The frame needs to be secured first!") return var/obj/item/weapon/circuitboard/machine/B = P if(!user.drop_item()) return 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 = B B.loc = src icon_state = "box_2" @@ -143,12 +143,12 @@ return else if(istype(P, /obj/item/weapon/circuitboard)) - user << "This frame does not accept circuit boards of this type!" + to_chat(user, "This frame does not accept circuit boards of this type!") return if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, P.usesound, 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 ) @@ -163,9 +163,9 @@ components.Remove(circuit) 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/atom/movable/A in components) A.loc = src.loc desc = initial(desc) @@ -216,7 +216,7 @@ for(var/obj/item/weapon/stock_parts/part in added_components) components += part - user << "[part.name] applied." + to_chat(user, "[part.name] applied.") if(added_components.len) replacer.play_rped_sound() return @@ -238,16 +238,16 @@ NS.add(used_amt) req_components[I] -= used_amt - user << "You add [P] to [src]." + to_chat(user, "You add [P] to [src].") return if(!user.drop_item()) break - user << "You add [P] to [src]." + to_chat(user, "You add [P] to [src].") P.forceMove(src) components += P req_components[I]-- return 1 - user << "You cannot add that to the machine!" + to_chat(user, "You cannot add that to the machine!") return 0 if(user.a_intent == INTENT_HARM) return ..() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 7aa10a9063..3aceab6040 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -31,7 +31,7 @@ var/obj/item/weapon/weldingtool/WT = I if(obj_integrity < max_integrity) if(WT.remove_fuel(0,user)) - user << "You begin repairing [src]..." + to_chat(user, "You begin repairing [src]...") playsound(loc, WT.usesound, 40, 1) if(do_after(user, 40*I.toolspeed, target = src)) obj_integrity = Clamp(obj_integrity + 20, 0, max_integrity) @@ -97,16 +97,20 @@ proj_pass_rate = 20 armor = list(melee = 10, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 10, acid = 0) + var/deploy_time = 40 + var/deploy_message = TRUE + /obj/structure/barricade/security/New() ..() - addtimer(CALLBACK(src, .proc/deploy), 40) + addtimer(CALLBACK(src, .proc/deploy), deploy_time) /obj/structure/barricade/security/proc/deploy() icon_state = "barrier1" density = 1 anchored = 1 - visible_message("[src] deploys!") + if(deploy_message) + visible_message("[src] deploys!") /obj/item/weapon/grenade/barrier @@ -132,7 +136,7 @@ if(HORIZONTAL) mode = SINGLE - user << "[src] is now in [mode] mode." + to_chat(user, "[src] is now in [mode] mode.") /obj/item/weapon/grenade/barrier/prime() new /obj/structure/barricade/security(get_turf(src.loc)) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 1c5fd1cece..af59f63888 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -65,7 +65,7 @@ /obj/machinery/dna_scannernew/proc/toggle_open(mob/user) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") return if(state_open) @@ -73,7 +73,7 @@ return else if(locked) - user << "The bolts are locked down, securing the door shut." + to_chat(user, "The bolts are locked down, securing the door shut.") return open_machine() @@ -85,7 +85,7 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You lean on the back of [src] and start pushing the door open... (this will take about [breakout_time] minutes.)" + to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about [breakout_time] minutes.)") user.visible_message("You hear a metallic creaking from [src]!") if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds @@ -94,7 +94,7 @@ locked = 0 visible_message("[user] successfully broke out of [src]!") - user << "You successfully break out of [src]!" + to_chat(user, "You successfully break out of [src]!") open_machine() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0886c0a6fd..89390560b4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -87,8 +87,11 @@ var/list/airlock_overlays = list() var/delayed_close_requested = FALSE // TRUE means the door will automatically close the next time it's opened. explosion_block = 1 + hud_possible = list(DIAG_AIRLOCK_HUD) -/obj/machinery/door/airlock/New() + var/air_tight = FALSE //TRUE means density will be set as soon as the door begins to close + +/obj/machinery/door/airlock/Initialize() ..() wires = new /datum/wires/airlock(src) if(src.closeOtherId != null) @@ -107,6 +110,10 @@ var/list/airlock_overlays = list() max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R + prepare_huds() + var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] + diag_hud.add_to_hud(src) + diag_hud_set_electrified() /obj/machinery/door/airlock/Initialize() ..() @@ -216,10 +223,8 @@ var/list/airlock_overlays = list() return else /*if(src.justzap)*/ return - else if(user.hallucination > 50 && prob(10) && src.operating == 0) - user << "You feel a powerful shock course through your body!" - user.staminaloss += 50 - user.stunned += 5 + else if(user.hallucination > 50 && ishuman(user) && prob(10) && src.operating == 0) + hallucinate_shock(user) return if (cyclelinkedairlock) if (!shuttledocked && !emergency && !cyclelinkedairlock.shuttledocked && !cyclelinkedairlock.emergency && allowed(user)) @@ -229,6 +234,34 @@ var/list/airlock_overlays = list() addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2) ..() +/obj/machinery/door/airlock/proc/hallucinate_shock(mob/living/user) + var/image/shock_image = image(user, user, dir = user.dir) + var/image/electrocution_skeleton_anim = image('icons/mob/human.dmi', user, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER) + shock_image.color = rgb(0,0,0) + shock_image.override = TRUE + electrocution_skeleton_anim.appearance_flags = RESET_COLOR + + to_chat(user, "You feel a powerful shock course through your body!") + if(user.client) + user.client.images |= shock_image + user.client.images |= electrocution_skeleton_anim + addtimer(CALLBACK(src, .proc/reset_hallucinate_shock_animation, user, shock_image, electrocution_skeleton_anim), 40) + user.playsound_local(get_turf(src), "sparks", 100, 1) + user.staminaloss += 50 + user.Stun(2) + user.jitteriness += 1000 + user.do_jitter_animation(user.jitteriness) + addtimer(CALLBACK(src, .proc/hallucinate_shock_drop, user), 20) + +/obj/machinery/door/airlock/proc/reset_hallucinate_shock_animation(mob/living/user, shock_image, electrocution_skeleton_anim) + if(user.client) + user.client.images.Remove(shock_image) + user.client.images.Remove(electrocution_skeleton_anim) + +/obj/machinery/door/airlock/proc/hallucinate_shock_drop(mob/living/user) + user.jitteriness = max(user.jitteriness - 990, 10) //Still jittery, but vastly less + user.Stun(3) + user.Weaken(3) /obj/machinery/door/airlock/proc/isElectrified() if(src.secondsElectrified != 0) @@ -476,31 +509,31 @@ var/list/airlock_overlays = list() /obj/machinery/door/airlock/examine(mob/user) ..() if(charge && !panel_open && in_range(user, src)) - user << "The maintenance panel seems haphazardly fastened." + to_chat(user, "The maintenance panel seems haphazardly fastened.") if(charge && panel_open) - user << "Something is wired up to the airlock's electronics!" + to_chat(user, "Something is wired up to the airlock's electronics!") if(panel_open) switch(security_level) if(AIRLOCK_SECURITY_NONE) - user << "Wires are exposed!" + to_chat(user, "Wires are exposed!") if(AIRLOCK_SECURITY_METAL) - user << "Wires are hidden behind welded metal cover" + to_chat(user, "Wires are hidden behind welded metal cover") if(AIRLOCK_SECURITY_PLASTEEL_I_S) - user << "There is some shredded plasteel inside" + to_chat(user, "There is some shredded plasteel inside") if(AIRLOCK_SECURITY_PLASTEEL_I) - user << "Wires are behind inner layer of plasteel" + to_chat(user, "Wires are behind inner layer of plasteel") if(AIRLOCK_SECURITY_PLASTEEL_O_S) - user << "There is some shredded plasteel inside" + to_chat(user, "There is some shredded plasteel inside") if(AIRLOCK_SECURITY_PLASTEEL_O) - user << "There is welded plasteel cover hiding wires" + to_chat(user, "There is welded plasteel cover hiding wires") if(AIRLOCK_SECURITY_PLASTEEL) - user << "There is protective grille over panel" + to_chat(user, "There is protective grille over panel") else if(security_level) if(security_level == AIRLOCK_SECURITY_METAL) - user << "It looks a bit stronger" + to_chat(user, "It looks a bit stronger") else - user << "It looks very robust" + to_chat(user, "It looks very robust") /obj/machinery/door/airlock/attack_ai(mob/user) if(!src.canAIControl(user)) @@ -508,12 +541,12 @@ var/list/airlock_overlays = list() src.hack(user) return else - user << "Airlock AI control has been blocked with a firewall. Unable to hack." + to_chat(user, "Airlock AI control has been blocked with a firewall. Unable to hack.") if(emagged) - user << "Unable to interface: Airlock is unresponsive." + to_chat(user, "Unable to interface: Airlock is unresponsive.") return if(detonated) - user << "Unable to interface. Airlock control panel damaged." + to_chat(user, "Unable to interface. Airlock control panel damaged.") return //Separate interface for the AI. @@ -625,43 +658,43 @@ var/list/airlock_overlays = list() set waitfor = 0 if(src.aiHacking == 0) src.aiHacking = 1 - user << "Airlock AI control has been blocked. Beginning fault-detection." + to_chat(user, "Airlock AI control has been blocked. Beginning fault-detection.") sleep(50) if(src.canAIControl(user)) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") src.aiHacking=0 return else if(!src.canAIHack()) - user << "Connection lost! Unable to hack airlock." + to_chat(user, "Connection lost! Unable to hack airlock.") src.aiHacking=0 return - user << "Fault confirmed: airlock control wire disabled or cut." + to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") sleep(20) - user << "Attempting to hack into airlock. This may take some time." + to_chat(user, "Attempting to hack into airlock. This may take some time.") sleep(200) if(src.canAIControl(user)) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") src.aiHacking=0 return else if(!src.canAIHack()) - user << "Connection lost! Unable to hack airlock." + to_chat(user, "Connection lost! Unable to hack airlock.") src.aiHacking=0 return - user << "Upload access confirmed. Loading control program into airlock software." + to_chat(user, "Upload access confirmed. Loading control program into airlock software.") sleep(170) if(src.canAIControl(user)) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") src.aiHacking=0 return else if(!src.canAIHack()) - user << "Connection lost! Unable to hack airlock." + to_chat(user, "Connection lost! Unable to hack airlock.") src.aiHacking=0 return - user << "Transfer complete. Forcing airlock to execute program." + to_chat(user, "Transfer complete. Forcing airlock to execute program.") sleep(50) //disable blocked control src.aiControlDisabled = 2 - user << "Receiving control information from airlock." + to_chat(user, "Receiving control information from airlock.") sleep(10) //bring up airlock dialog src.aiHacking = 0 @@ -693,7 +726,7 @@ var/list/airlock_overlays = list() if(panel_open) if(security_level) - user << "Wires are protected!" + to_chat(user, "Wires are protected!") return wires.interact(user) else @@ -730,9 +763,9 @@ var/list/airlock_overlays = list() if(1) //disable idscan if(wires.is_cut(WIRE_IDSCAN)) - usr << "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways." + to_chat(usr, "The IdScan wire has been cut - So, you can't disable it, but it is already disabled anyways.") else if(src.aiDisabledIdScanner) - usr << "You've already disabled the IdScan feature." + to_chat(usr, "You've already disabled the IdScan feature.") else src.aiDisabledIdScanner = 1 if(2) @@ -741,52 +774,52 @@ var/list/airlock_overlays = list() src.loseMainPower() update_icon() else - usr << "Main power is already offline." + to_chat(usr, "Main power is already offline.") if(3) //disrupt backup power if(src.secondsBackupPowerLost == 0) src.loseBackupPower() update_icon() else - usr << "Backup power is already offline." + to_chat(usr, "Backup power is already offline.") if(4) //drop door bolts if(wires.is_cut(WIRE_BOLTS)) - usr << "You can't drop the door bolts - The door bolt dropping wire has been cut." + to_chat(usr, "You can't drop the door bolts - The door bolt dropping wire has been cut.") else bolt() if(5) //un-electrify door if(wires.is_cut(WIRE_SHOCK)) - usr << text("Can't un-electrify the airlock - The electrification wire is cut.") - else if(src.secondsElectrified==-1) - src.secondsElectrified = 0 - else if(src.secondsElectrified>0) - src.secondsElectrified = 0 + to_chat(usr, text("Can't un-electrify the airlock - The electrification wire is cut.")) + else if(secondsElectrified==-1) + set_electrified(0) + else if(secondsElectrified>0) + set_electrified(0) if(8) // Safeties! We don't need no stinking safeties! if(wires.is_cut(WIRE_SAFETY)) - usr << text("Control to door sensors is disabled.") + to_chat(usr, text("Control to door sensors is disabled.")) else if (src.safe) safe = 0 else - usr << text("Firmware reports safeties already overriden.") + to_chat(usr, text("Firmware reports safeties already overriden.")) if(9) // Door speed control if(wires.is_cut(WIRE_TIMING)) - usr << text("Control to door timing circuitry has been severed.") + to_chat(usr, text("Control to door timing circuitry has been severed.")) else if (src.normalspeed) normalspeed = 0 else - usr << text("Door timing circuitry already accelerated.") + to_chat(usr, text("Door timing circuitry already accelerated.")) if(7) //close door if(src.welded) - usr << text("The airlock has been welded shut!") + to_chat(usr, text("The airlock has been welded shut!")) else if(src.locked) - usr << text("The door bolts are down!") + to_chat(usr, text("The door bolts are down!")) else if(!src.density) close() else @@ -795,12 +828,12 @@ var/list/airlock_overlays = list() if(10) // Bolt lights if(wires.is_cut(WIRE_LIGHT)) - usr << text("Control to door bolt lights has been severed.") + to_chat(usr, text("Control to door bolt lights has been severed.")) else if (src.lights) lights = 0 update_icon() else - usr << text("Door bolt lights are already disabled!") + to_chat(usr, text("Door bolt lights are already disabled!")) if(11) // Emergency access @@ -808,7 +841,7 @@ var/list/airlock_overlays = list() emergency = 0 update_icon() else - usr << text("Emergency access is already disabled!") + to_chat(usr, text("Emergency access is already disabled!")) else if(href_list["aiEnable"]) @@ -817,81 +850,81 @@ var/list/airlock_overlays = list() if(1) //enable idscan if(wires.is_cut(WIRE_IDSCAN)) - usr << "You can't enable IdScan - The IdScan wire has been cut." + to_chat(usr, "You can't enable IdScan - The IdScan wire has been cut.") else if(src.aiDisabledIdScanner) src.aiDisabledIdScanner = 0 else - usr << "The IdScan feature is not disabled." + to_chat(usr, "The IdScan feature is not disabled.") if(4) //raise door bolts if(wires.is_cut(WIRE_BOLTS)) - usr << text("The door bolt drop wire is cut - you can't raise the door bolts.
\n") + to_chat(usr, text("The door bolt drop wire is cut - you can't raise the door bolts.
\n")) else if(!src.locked) - usr << text("The door bolts are already up.
\n") + to_chat(usr, text("The door bolts are already up.
\n")) else if(src.hasPower()) unbolt() else - usr << text("Cannot raise door bolts due to power failure.
\n") + to_chat(usr, text("Cannot raise door bolts due to power failure.
\n")) if(5) //electrify door for 30 seconds if(wires.is_cut(WIRE_SHOCK)) - usr << text("The electrification wire has been cut.
\n") + to_chat(usr, text("The electrification wire has been cut.
\n")) else if(src.secondsElectrified==-1) - usr << text("The door is already indefinitely electrified. You'd have to un-electrify it before you can re-electrify it with a non-forever duration.
\n") + to_chat(usr, text("The door is already indefinitely electrified. You'd have to un-electrify it before you can re-electrify it with a non-forever duration.
\n")) else if(src.secondsElectrified!=0) - usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n") + to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) else shockedby += "\[[time_stamp()]\][usr](ckey:[usr.ckey])" add_logs(usr, src, "electrified") - src.secondsElectrified = 30 + set_electrified(30) spawn(10) while (src.secondsElectrified>0) src.secondsElectrified-=1 if(src.secondsElectrified<0) - src.secondsElectrified = 0 + set_electrified(0) src.updateUsrDialog() sleep(10) if(6) //electrify door indefinitely if(wires.is_cut(WIRE_SHOCK)) - usr << text("The electrification wire has been cut.
\n") + to_chat(usr, text("The electrification wire has been cut.
\n")) else if(src.secondsElectrified==-1) - usr << text("The door is already indefinitely electrified.
\n") + to_chat(usr, text("The door is already indefinitely electrified.
\n")) else if(src.secondsElectrified!=0) - usr << text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n") + to_chat(usr, text("The door is already electrified. You can't re-electrify it while it's already electrified.
\n")) else shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") add_logs(usr, src, "electrified") - src.secondsElectrified = -1 + set_electrified(-1) if (8) // Not in order >.> // Safeties! Maybe we do need some stinking safeties! if(wires.is_cut(WIRE_SAFETY)) - usr << text("Control to door sensors is disabled.") + to_chat(usr, text("Control to door sensors is disabled.")) else if (!src.safe) safe = 1 src.updateUsrDialog() else - usr << text("Firmware reports safeties already in place.") + to_chat(usr, text("Firmware reports safeties already in place.")) if(9) // Door speed control if(wires.is_cut(WIRE_TIMING)) - usr << text("Control to door timing circuitry has been severed.") + to_chat(usr, text("Control to door timing circuitry has been severed.")) else if (!src.normalspeed) normalspeed = 1 src.updateUsrDialog() else - usr << text("Door timing circuitry currently operating normally.") + to_chat(usr, text("Door timing circuitry currently operating normally.")) if(7) //open door if(src.welded) - usr << text("The airlock has been welded shut!") + to_chat(usr, text("The airlock has been welded shut!")) else if(src.locked) - usr << text("The door bolts are down!") + to_chat(usr, text("The door bolts are down!")) else if(src.density) open() else @@ -899,20 +932,20 @@ var/list/airlock_overlays = list() if(10) // Bolt lights if(wires.is_cut(WIRE_LIGHT)) - usr << text("Control to door bolt lights has been severed.") + to_chat(usr, text("Control to door bolt lights has been severed.")) else if (!src.lights) lights = 1 update_icon() src.updateUsrDialog() else - usr << text("Door bolt lights are already enabled!") + to_chat(usr, text("Door bolt lights are already enabled!")) if(11) // Emergency access if (!src.emergency) emergency = 1 update_icon() else - usr << text("Emergency access is already enabled!") + to_chat(usr, text("Emergency access is already enabled!")) add_fingerprint(usr) if(!nowindow) @@ -931,9 +964,9 @@ var/list/airlock_overlays = list() if(istype(C, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/S = C if(S.amount < 2) - user << "You need at least 2 metal sheets to reinforce [src]." + to_chat(user, "You need at least 2 metal sheets to reinforce [src].") return - user << "You start reinforcing [src]" + to_chat(user, "You start reinforcing [src]") if(do_after(user, 20, 1, target = src)) if(!panel_open || !S.use(2)) return @@ -945,9 +978,9 @@ var/list/airlock_overlays = list() else if(istype(C, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/S = C if(S.amount < 2) - user << "You need at least 2 plasteel sheets to reinforce [src]." + to_chat(user, "You need at least 2 plasteel sheets to reinforce [src].") return - user << "You start reinforcing [src]." + to_chat(user, "You start reinforcing [src].") if(do_after(user, 20, 1, target = src)) if(!panel_open || !S.use(2)) return @@ -963,7 +996,7 @@ var/list/airlock_overlays = list() var/obj/item/weapon/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return - user << "You begin cutting the panel's shielding..." + to_chat(user, "You begin cutting the panel's shielding...") playsound(loc, WT.usesound, 40, 1) if(do_after(user, 40*WT.toolspeed, 1, target = src)) if(!panel_open || !WT.isOn()) @@ -979,7 +1012,7 @@ var/list/airlock_overlays = list() if(AIRLOCK_SECURITY_PLASTEEL_I_S) if(istype(C, /obj/item/weapon/crowbar)) var/obj/item/weapon/crowbar/W = C - user << "You start removing the inner layer of shielding..." + to_chat(user, "You start removing the inner layer of shielding...") playsound(src, W.usesound, 100, 1) if(do_after(user, 40*W.toolspeed, 1, target = src)) if(!panel_open) @@ -999,7 +1032,7 @@ var/list/airlock_overlays = list() var/obj/item/weapon/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return - user << "You begin cutting the inner layer of shielding..." + to_chat(user, "You begin cutting the inner layer of shielding...") playsound(loc, WT.usesound, 40, 1) if(do_after(user, 40*WT.toolspeed, 1, target = src)) if(!panel_open || !WT.isOn()) @@ -1013,7 +1046,7 @@ var/list/airlock_overlays = list() if(AIRLOCK_SECURITY_PLASTEEL_O_S) if(istype(C, /obj/item/weapon/crowbar)) var/obj/item/weapon/crowbar/W = C - user << "You start removing outer layer of shielding..." + to_chat(user, "You start removing outer layer of shielding...") playsound(src, W.usesound, 100, 1) if(do_after(user, 40*W.toolspeed, 1, target = src)) if(!panel_open) @@ -1030,7 +1063,7 @@ var/list/airlock_overlays = list() var/obj/item/weapon/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return - user << "You begin cutting the outer layer of shielding..." + to_chat(user, "You begin cutting the outer layer of shielding...") playsound(loc, WT.usesound, 40, 1) if(do_after(user, 40*WT.toolspeed, 1, target = src)) if(!panel_open || !WT.isOn()) @@ -1046,7 +1079,7 @@ var/list/airlock_overlays = list() var/obj/item/weapon/wirecutters/W = C if(src.hasPower() && src.shock(user, 60)) // Protective grille of wiring is electrified return - user << "You start cutting through the outer grille." + to_chat(user, "You start cutting through the outer grille.") playsound(src, W.usesound, 100, 1) if(do_after(user, 10*W.toolspeed, 1, target = src)) if(!panel_open) @@ -1057,10 +1090,10 @@ var/list/airlock_overlays = list() return if(istype(C, /obj/item/weapon/screwdriver)) if(panel_open && detonated) - user << "[src] has no maintenance panel!" + to_chat(user, "[src] has no maintenance panel!") return panel_open = !panel_open - user << "You [panel_open ? "open":"close"] the maintenance panel of the airlock." + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the airlock.") playsound(src.loc, C.usesound, 50, 1) src.update_icon() else if(is_wire_tool(C)) @@ -1072,17 +1105,17 @@ var/list/airlock_overlays = list() change_paintjob(C, user) else if(istype(C, /obj/item/device/doorCharge)) if(!panel_open || security_level) - user << "The maintenance panel must be open to apply [C]!" + to_chat(user, "The maintenance panel must be open to apply [C]!") return if(emagged) return if(charge && !detonated) - user << "There's already a charge hooked up to this door!" + to_chat(user, "There's already a charge hooked up to this door!") return if(detonated) - user << "The maintenance panel is destroyed!" + to_chat(user, "The maintenance panel is destroyed!") return - user << "You apply [C]. Next time someone opens the door, it will explode." + to_chat(user, "You apply [C]. Next time someone opens the door, it will explode.") user.drop_item() panel_open = 0 update_icon() @@ -1095,19 +1128,32 @@ var/list/airlock_overlays = list() /obj/machinery/door/airlock/try_to_weld(obj/item/weapon/weldingtool/W, mob/user) if(!operating && density) if(W.remove_fuel(0,user)) - user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "You begin [welded ? "unwelding":"welding"] the airlock...", \ - "You hear welding.") - playsound(loc, W.usesound, 40, 1) - if(do_after(user,40*W.toolspeed, 1, target = src)) - if(density && !operating)//Door must be closed to weld. - if(!user || !W || !W.isOn() || !user.loc ) - return + if(user.a_intent != INTENT_HELP) + user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ + "You begin [welded ? "unwelding":"welding"] the airlock...", \ + "You hear welding.") + playsound(loc, W.usesound, 40, 1) + if(do_after(user,40*W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) playsound(loc, 'sound/items/Welder2.ogg', 50, 1) welded = !welded user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ "You [welded ? "weld the airlock shut":"unweld the airlock"].") update_icon() + else if(obj_integrity < max_integrity) + user.visible_message("[user] is welding the airlock.", \ + "You begin repairing the airlock...", \ + "You hear welding.") + playsound(loc, W.usesound, 40, 1) + if(do_after(user,40*W.toolspeed, 1, target = src, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) + playsound(loc, 'sound/items/Welder2.ogg', 50, 1) + obj_integrity = max_integrity + stat &= ~BROKEN + user.visible_message("[user.name] has repaired [src].", \ + "You finish repairing the airlock.") + update_icon() + +/obj/machinery/door/airlock/proc/weld_checks(obj/item/weapon/weldingtool/W, mob/user) + return !operating && density && user && W && W.isOn() && user.loc /obj/machinery/door/airlock/try_to_crowbar(obj/item/I, mob/user) var/beingcrowbarred = null @@ -1116,10 +1162,10 @@ var/list/airlock_overlays = list() else beingcrowbarred = 0 if(panel_open && charge) - user << "You carefully start removing [charge] from [src]..." + to_chat(user, "You carefully start removing [charge] from [src]...") playsound(get_turf(src), I.usesound, 50, 1) if(!do_after(user, 150*I.toolspeed, target = src)) - user << "You slip and [charge] detonates!" + to_chat(user, "You slip and [charge] detonates!") charge.ex_act(1) user.Weaken(3) return @@ -1137,9 +1183,9 @@ var/list/airlock_overlays = list() deconstruct(TRUE, user) return else if(hasPower()) - user << "The airlock's motors resist your efforts to force it!" + to_chat(user, "The airlock's motors resist your efforts to force it!") else if(locked) - user << "The airlock's bolts prevent it from being forced!" + to_chat(user, "The airlock's bolts prevent it from being forced!") else if( !welded && !operating) if(beingcrowbarred == 0) //being fireaxe'd var/obj/item/weapon/twohanded/fireaxe/F = I @@ -1150,7 +1196,7 @@ var/list/airlock_overlays = list() else close(2) else - user << "You need to be wielding the fire axe to do that!" + to_chat(user, "You need to be wielding the fire axe to do that!") else spawn(0) if(density) @@ -1167,11 +1213,11 @@ var/list/airlock_overlays = list() return if(locked) - user << "The bolts are down, it won't budge!" + to_chat(user, "The bolts are down, it won't budge!") return if(welded) - user << "It's welded, it won't budge!" + to_chat(user, "It's welded, it won't budge!") return var/time_to_open = 5 @@ -1181,7 +1227,7 @@ var/list/airlock_overlays = list() if(do_after(user, time_to_open,target = src)) open(2) if(density && !open(2)) - user << "Despite your attempts, the [src] refuses to open." + to_chat(user, "Despite your attempts, the [src] refuses to open.") /obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params) if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite @@ -1232,13 +1278,13 @@ var/list/airlock_overlays = list() return 0 operating = 1 update_icon(AIRLOCK_OPENING, 1) - src.SetOpacity(0) + src.set_opacity(0) sleep(5) src.density = 0 sleep(9) src.layer = OPEN_DOOR_LAYER update_icon(AIRLOCK_OPEN, 1) - SetOpacity(0) + set_opacity(0) operating = 0 air_update_turf(1) update_freelook_sight() @@ -1277,14 +1323,16 @@ var/list/airlock_overlays = list() operating = 1 update_icon(AIRLOCK_CLOSING, 1) src.layer = CLOSED_DOOR_LAYER + if(air_tight) + density = TRUE sleep(5) - src.density = 1 + density = TRUE if(!safe) crush() sleep(9) update_icon(AIRLOCK_CLOSED, 1) if(visible && !glass) - SetOpacity(1) + set_opacity(1) operating = 0 delayed_close_requested = FALSE air_update_turf(1) @@ -1395,7 +1443,7 @@ var/list/airlock_overlays = list() if(!density) //Already open return if(locked || welded) //Extremely generic, as aliens only understand the basics of how airlocks work. - user << "[src] refuses to budge!" + to_chat(user, "[src] refuses to budge!") return user.visible_message("[user] begins prying open [src].",\ "You begin digging your claws into [src] with all your might!",\ @@ -1408,7 +1456,7 @@ var/list/airlock_overlays = list() if(do_after(user, time_to_open, target = src)) if(density && !open(2)) //The airlock is still closed, but something prevented it opening. (Another player noticed and bolted/welded the airlock in time!) - user << "Despite your efforts, [src] managed to resist your attempts to open it!" + to_chat(user, "Despite your efforts, [src] managed to resist your attempts to open it!") /obj/machinery/door/airlock/hostile_lockdown(mob/origin) // Must be powered and have working AI wire. @@ -1417,7 +1465,7 @@ var/list/airlock_overlays = list() safe = FALSE //DOOR CRUSH close() bolt() //Bolt it! - secondsElectrified = -1 //Shock it! + set_electrified(-1) //Shock it! if(origin) shockedby += "\[[time_stamp()]\][origin](ckey:[origin.ckey])" @@ -1426,7 +1474,7 @@ var/list/airlock_overlays = list() // Must be powered and have working AI wire. if(canAIControl(src) && !stat) unbolt() - secondsElectrified = 0 + set_electrified(0) open() safe = TRUE @@ -1439,6 +1487,9 @@ var/list/airlock_overlays = list() wires.cut_all() update_icon() +/obj/machinery/door/airlock/proc/set_electrified(seconds) + secondsElectrified = seconds + diag_hud_set_electrified() /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -1462,10 +1513,10 @@ var/list/airlock_overlays = list() A.obj_integrity = A.max_integrity * 0.5 else if(emagged) if(user) - user << "You discard the damaged electronics." + to_chat(user, "You discard the damaged electronics.") else if(user) - user << "You remove the airlock electronics." + to_chat(user, "You remove the airlock electronics.") var/obj/item/weapon/electronics/airlock/ae if(!electronics) @@ -1481,3 +1532,17 @@ var/list/airlock_overlays = list() electronics = null ae.loc = src.loc qdel(src) + +/obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/weapon/rcd/the_rcd) + switch(the_rcd.mode) + if(RCD_DECONSTRUCT) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32) + return FALSE + +/obj/machinery/door/airlock/rcd_act(mob/user, obj/item/weapon/rcd/the_rcd, passed_mode) + switch(passed_mode) + if(RCD_DECONSTRUCT) + to_chat(user, "You deconstruct the airlock.") + qdel(src) + return TRUE + return FALSE diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index b5ab35740e..167b95b634 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -448,7 +448,7 @@ gear_text = "The cogwheel is solidly wrenched to the brass around it." if(GEAR_LOOSE) gear_text = "The cogwheel has been loosened, but remains connected loosely to the door!" - user << gear_text + to_chat(user, gear_text) /obj/machinery/door/airlock/clockwork/emp_act(severity) if(prob(80/severity)) @@ -517,7 +517,7 @@ return 1 else if(istype(I, /obj/item/weapon/crowbar)) if(construction_state == GEAR_SECURE) - user << "[src]'s cogwheel is too tightly secured! Your [I.name] can't reach under it!" + to_chat(user, "[src]'s cogwheel is too tightly secured! Your [I.name] can't reach under it!") return 1 else if(construction_state == GEAR_LOOSE) user.visible_message("[user] begins slowly lifting off [src]'s cogwheel...", "You slowly begin lifting off [src]'s cogwheel...") diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index b72ce4d0c8..bcce65161b 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -163,8 +163,7 @@ else if(!(I.flags & NOBLUDGEON) && user.a_intent != INTENT_HARM) try_to_activate_door(user) return 1 - else - return ..() + return ..() /obj/machinery/door/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == "melee" && damage_amount < damage_deflection) @@ -234,13 +233,13 @@ return 0 operating = 1 do_animate("opening") - SetOpacity(0) + set_opacity(0) sleep(5) density = 0 sleep(5) layer = OPEN_DOOR_LAYER update_icon() - SetOpacity(0) + set_opacity(0) operating = 0 air_update_turf(1) update_freelook_sight() @@ -269,7 +268,7 @@ sleep(5) update_icon() if(visible && !glass) - SetOpacity(1) + set_opacity(1) operating = 0 air_update_turf(1) update_freelook_sight() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index a4bb52ead6..3b64796b2e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -73,7 +73,7 @@ if(operating || !density) return user.changeNext_move(CLICK_CD_MELEE) - + user.visible_message("[user] bangs on \the [src].", "You bang on \the [src].") playsound(loc, 'sound/effects/Glassknock.ogg', 10, FALSE, frequency = 32000) @@ -86,7 +86,7 @@ if(welded) if(istype(C, /obj/item/weapon/wrench)) if(boltslocked) - user << "There are screws locking the bolts in place!" + to_chat(user, "There are screws locking the bolts in place!") return playsound(get_turf(src), C.usesound, 50, 1) user.visible_message("[user] starts undoing [src]'s bolts...", \ @@ -113,7 +113,7 @@ /obj/machinery/door/firedoor/try_to_weld(obj/item/weapon/weldingtool/W, mob/user) if(W.remove_fuel(0, user)) welded = !welded - user << "You [welded?"welded":"unwelded"] \the [src]" + to_chat(user, "You [welded?"welded":"unwelded"] \the [src]") update_icon() /obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user) @@ -137,7 +137,7 @@ /obj/machinery/door/firedoor/attack_alien(mob/user) add_fingerprint(user) if(welded) - user << "[src] refuses to budge!" + to_chat(user, "[src] refuses to budge!") return open() @@ -246,13 +246,13 @@ ..() switch(constructionStep) if(CONSTRUCTION_PANEL_OPEN) - user << "There is a small metal plate covering the wires." + to_chat(user, "There is a small metal plate covering the wires.") if(CONSTRUCTION_WIRES_EXPOSED) - user << "Wires are trailing from the maintenance panel." + to_chat(user, "Wires are trailing from the maintenance panel.") if(CONSTRUCTION_GUTTED) - user << "The circuit board is visible." + to_chat(user, "The circuit board is visible.") if(CONSTRUCTION_NOCIRCUIT) - user << "There are no electronics in the frame." + to_chat(user, "There are no electronics in the frame.") /obj/structure/firelock_frame/update_icon() ..() @@ -277,7 +277,7 @@ return if(istype(C, /obj/item/weapon/wrench)) if(locate(/obj/machinery/door/firedoor) in get_turf(src)) - user << "There's already a firelock there." + to_chat(user, "There's already a firelock there.") return playsound(get_turf(src), C.usesound, 50, 1) user.visible_message("[user] starts bolting down [src]...", \ @@ -298,10 +298,10 @@ if(istype(C, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/P = C if(reinforced) - user << "[src] is already reinforced." + to_chat(user, "[src] is already reinforced.") return if(P.get_amount() < 2) - user << "You need more plasteel to reinforce [src]." + to_chat(user, "You need more plasteel to reinforce [src].") return user.visible_message("[user] begins reinforcing [src]...", \ "You begin reinforcing [src]...") @@ -367,7 +367,7 @@ if(istype(C, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/B = C if(B.get_amount() < 5) - user << "You need more wires to add wiring to [src]." + to_chat(user, "You need more wires to add wiring to [src].") return user.visible_message("[user] begins wiring [src]...", \ "You begin adding wires to [src]...") diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index de1f37316a..2e48e34f71 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -145,7 +145,7 @@ sleep(10) src.density = 0 -// src.sd_SetOpacity(0) //TODO: why is this here? Opaque windoors? ~Carn +// src.sd_set_opacity(0) //TODO: why is this here? Opaque windoors? ~Carn air_update_turf(1) update_freelook_sight() @@ -226,11 +226,11 @@ if(!(flags&NODECONSTRUCT)) if(istype(I, /obj/item/weapon/screwdriver)) if(density || operating) - user << "You need to open the door to access the maintenance panel!" + to_chat(user, "You need to open the door to access the maintenance panel!") return playsound(src.loc, I.usesound, 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open":"close"] the maintenance panel of the [src.name]." + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the [src.name].") return if(istype(I, /obj/item/weapon/crowbar)) @@ -260,11 +260,11 @@ WA.created_name = src.name if(emagged) - user << "You discard the damaged electronics." + to_chat(user, "You discard the damaged electronics.") qdel(src) return - user << "You remove the airlock electronics." + to_chat(user, "You remove the airlock electronics.") var/obj/item/weapon/electronics/airlock/ae if(!electronics) @@ -290,7 +290,7 @@ else close(2) else - user << "The door's motors resist your efforts to force it!" + to_chat(user, "The door's motors resist your efforts to force it!") /obj/machinery/door/window/do_animate(animation) switch(animation) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index a1d0e2631a..012d558135 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -27,11 +27,11 @@ var/list/doppler_arrays = list() if(!anchored && !isinspace()) anchored = 1 power_change() - user << "You fasten [src]." + to_chat(user, "You fasten [src].") else if(anchored) anchored = 0 power_change() - user << "You unfasten [src]." + to_chat(user, "You unfasten [src].") playsound(loc, O.usesound, 50, 1) else return ..() @@ -50,7 +50,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/AltClick(mob/living/user) if(!istype(user) || user.incapacitated()) - user << "You can't do that right now!" + to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 48dfe0f55b..859f306396 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -157,13 +157,11 @@ /obj/machinery/droneDispenser/examine(mob/user) ..() if((mode == DRONE_RECHARGING) && !stat && recharging_text) - user << "[recharging_text]" + to_chat(user, "[recharging_text]") if(metal_cost) - user << "It has [materials.amount(MAT_METAL)] \ - units of metal stored." + to_chat(user, "It has [materials.amount(MAT_METAL)] units of metal stored.") if(glass_cost) - user << "It has [materials.amount(MAT_GLASS)] \ - units of glass stored." + to_chat(user, "It has [materials.amount(MAT_GLASS)] units of glass stored.") /obj/machinery/droneDispenser/power_change() ..() @@ -248,32 +246,28 @@ if(!O.materials[MAT_METAL] && !O.materials[MAT_GLASS]) return ..() if(!metal_cost && !glass_cost) - user << "There isn't a place \ - to insert [O]!" + to_chat(user, "There isn't a place to insert [O]!") return var/obj/item/stack/sheets = O if(!user.canUnEquip(sheets)) - user << "[O] is stuck to your hand, \ - you can't get it off!" + to_chat(user, "[O] is stuck to your hand, you can't get it off!") return var/used = materials.insert_stack(sheets, sheets.amount) if(used) - user << "You insert [used] \ - sheet[used > 1 ? "s" : ""] into [src]." + to_chat(user, "You insert [used] sheet[used > 1 ? "s" : ""] into [src].") else - user << "The [src] isn't accepting the \ - [sheets]." + to_chat(user, "The [src] isn't accepting the [sheets].") else if(istype(O, /obj/item/weapon/crowbar)) materials.retrieve_all() playsound(loc, O.usesound, 50, 1) - user << "You retrieve the materials from [src]." + to_chat(user, "You retrieve the materials from [src].") else if(istype(O, /obj/item/weapon/weldingtool)) if(!(stat & BROKEN)) - user << "[src] doesn't need repairs." + to_chat(user, "[src] doesn't need repairs.") return var/obj/item/weapon/weldingtool/WT = O @@ -282,8 +276,7 @@ return if(WT.get_fuel() < 1) - user << "You need more fuel to \ - complete this task!" + to_chat(user, "You need more fuel to complete this task!") return playsound(src, WT.usesound, 50, 1) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 79fafb0a8a..b3f2c20893 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -19,9 +19,12 @@ /obj/machinery/doorButtons/proc/findObjsByTag() return -/obj/machinery/doorButtons/Initialize() - ..() - findObjsByTag() +/obj/machinery/doorButtons/Initialize(mapload) + if(mapload) + ..() + return TRUE + else + findObjsByTag() /obj/machinery/doorButtons/emag_act(mob/user) if(!emagged) @@ -29,7 +32,7 @@ req_access = list() req_one_access = list() playsound(src.loc, "sparks", 100, 1) - user << "You short out the access controller." + to_chat(user, "You short out the access controller.") /obj/machinery/doorButtons/proc/removeMe() @@ -59,7 +62,7 @@ if(busy) return if(!allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") return if(controller && !controller.busy && door) if(controller.stat & NOPOWER) @@ -128,7 +131,7 @@ if(busy) return if(!allowed(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") return switch(href_list["command"]) if("close_exterior") @@ -156,22 +159,22 @@ closeDoor(A) /obj/machinery/doorButtons/airlock_controller/proc/closeDoor(obj/machinery/door/airlock/A) + set waitfor = FALSE if(A.density) goIdle() return 0 update_icon() A.unbolt() - spawn() - if(A && A.close()) - if(stat & NOPOWER || lostPower || !A || QDELETED(A)) - goIdle(1) - return - A.bolt() - if(busy == CLOSING) - goIdle(1) - else + . = 1 + if(A && A.close()) + if(stat & NOPOWER || lostPower || !A || QDELETED(A)) goIdle(1) - return 1 + return + A.bolt() + if(busy == CLOSING) + goIdle(1) + else + goIdle(1) /obj/machinery/doorButtons/airlock_controller/proc/cycleClose(obj/machinery/door/airlock/A) if(!A || !exteriorAirlock || !interiorAirlock) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 85d171f5a8..4bc16cccf6 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -96,7 +96,7 @@ return var/area/A = get_area(src) A.firealert(src) - playsound(src.loc, 'sound/machines/firealarmshort.ogg', 75) + playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75) /obj/machinery/firealarm/proc/alarm_in(time) addtimer(CALLBACK(src, .proc/alarm), time) @@ -148,7 +148,7 @@ if(istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) playsound(src.loc, W.usesound, 50, 1) panel_open = !panel_open - user << "The wires have been [panel_open ? "exposed" : "unexposed"]." + to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") update_icon() return @@ -167,18 +167,18 @@ buildstage = 1 playsound(src.loc, W.usesound, 50, 1) new /obj/item/stack/cable_coil(user.loc, 5) - user << "You cut the wires from \the [src]." + to_chat(user, "You cut the wires from \the [src].") update_icon() return if(1) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 5) - user << "You need more cable for this!" + to_chat(user, "You need more cable for this!") else coil.use(5) buildstage = 2 - user << "You wire \the [src]." + to_chat(user, "You wire \the [src].") update_icon() return @@ -189,16 +189,16 @@ if(do_after(user, 20*W.toolspeed, target = src)) if(buildstage == 1) if(stat & BROKEN) - user << "You remove the destroyed circuit." + to_chat(user, "You remove the destroyed circuit.") else - user << "You pry out the circuit." + to_chat(user, "You pry out the circuit.") new /obj/item/weapon/electronics/firealarm(user.loc) buildstage = 0 update_icon() return if(0) if(istype(W, /obj/item/weapon/electronics/firealarm)) - user << "You insert the circuit." + to_chat(user, "You insert the circuit.") qdel(W) buildstage = 1 update_icon() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index fa9f4c2fd5..c26094e2bd 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -73,17 +73,17 @@ bulb = W power_change() else - user << "A flashbulb is already installed in [src]!" + to_chat(user, "A flashbulb is already installed in [src]!") else if (istype(W, /obj/item/weapon/wrench)) if(!bulb) - user << "You start unsecuring the flasher frame..." + to_chat(user, "You start unsecuring the flasher frame...") playsound(loc, W.usesound, 50, 1) if(do_after(user, 40*W.toolspeed, target = src)) - user << "You unsecure the flasher frame." + to_chat(user, "You unsecure the flasher frame.") deconstruct(TRUE) else - user << "Remove a flashbulb from [src] first!" + to_chat(user, "Remove a flashbulb from [src] first!") else return ..() @@ -168,13 +168,13 @@ playsound(src.loc, W.usesound, 100, 1) if (!anchored && !isinspace()) - user << "[src] is now secured." + to_chat(user, "[src] is now secured.") add_overlay("[base_state]-s") anchored = 1 power_change() add_to_proximity_list(src, range) else - user << "[src] can now be moved." + to_chat(user, "[src] can now be moved.") cut_overlays() anchored = 0 power_change() @@ -187,7 +187,7 @@ remove_from_proximity_list(src, range) return ..() -/obj/machinery/flasher/protable/Moved(oldloc) +/obj/machinery/flasher/portable/Moved(oldloc) remove_from_proximity_list(oldloc, range) return ..() @@ -201,7 +201,7 @@ /obj/item/wallframe/flasher/examine(mob/user) ..() - user << "Its channel ID is '[id]'." + to_chat(user, "Its channel ID is '[id]'.") /obj/item/wallframe/flasher/after_attach(var/obj/O) ..() diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index cedab21e73..826d707f0a 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -36,10 +36,10 @@ return I.forceMove(src) inserted_id = I - user << "You insert [I]." + to_chat(user, "You insert [I].") return else - user << "There's an ID inserted already." + to_chat(user, "There's an ID inserted already.") return ..() /obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ @@ -99,7 +99,7 @@ if(M == usr || allowed(usr)) drop_items(M) else - usr << "Access denied." + to_chat(usr, "Access denied.") /obj/machinery/gulag_item_reclaimer/proc/drop_items(mob/user) if(!stored_items[user]) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index f879f4b4c4..92a550b17c 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -49,7 +49,7 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/interact(mob/user) if(locked) - user << "[src] is locked." + to_chat(user, "[src] is locked.") return toggle_open() @@ -92,7 +92,7 @@ The console is located at computer/gulag_teleporter.dm if(user.stat != CONSCIOUS) return if(locked) - user << "[src] is locked!" + to_chat(user, "[src] is locked!") return open_machine() @@ -103,7 +103,7 @@ The console is located at computer/gulag_teleporter.dm return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)" + to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)") user.visible_message("You hear a metallic creaking from [src]!") if(do_after(user,(breakout_time), target = src)) @@ -112,7 +112,7 @@ The console is located at computer/gulag_teleporter.dm locked = FALSE visible_message("[user] successfully broke out of [src]!") - user << "You successfully break out of [src]!" + to_chat(user, "You successfully break out of [src]!") open_machine() @@ -123,7 +123,7 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/proc/toggle_open() if(panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") return if(state_open) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index d8acd97975..883da04cf6 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -65,7 +65,7 @@ var/list/holopads = list() holopads -= src return ..() -/obj/machinery/holo_pad/power_change() +/obj/machinery/holopad/power_change() if (powered()) stat &= ~NOPOWER else @@ -126,7 +126,7 @@ var/list/holopads = list() 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 temp = "A request for AI presence was already sent recently.
" temp += "Main Menu" @@ -180,12 +180,12 @@ var/list/holopads = list() /obj/machinery/holopad/proc/activate_holo(mob/living/silicon/ai/user) if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it if (istype(user.current, /obj/machinery/holopad)) - user << "ERROR: \black Image feed in progress." + to_chat(user, "ERROR: \black Image feed in progress.") return create_holo(user)//Create one. src.visible_message("A holographic image of [user] flicks to life right before your eyes!") else - user << "ERROR: \black Unable to project hologram." + to_chat(user, "ERROR: \black Unable to project hologram.") /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. For the other part of the code, check silicon say.dm. Particularly robot talk.*/ @@ -202,13 +202,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ h.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. h.anchored = 1//So space wind cannot drag it. h.name = "[A.name] (Hologram)"//If someone decides to right click. - h.SetLuminosity(2) //hologram lighting + h.set_light(2) //hologram lighting set_holo(A, h) return TRUE /obj/machinery/holopad/proc/set_holo(mob/living/silicon/ai/A, var/obj/effect/overlay/holo_pad_hologram/h) masters[A] = h - SetLuminosity(2) // pad lighting + set_light(2) // pad lighting icon_state = "holopad1" A.current = src use_power += HOLOGRAM_POWER_USAGE @@ -225,7 +225,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ masters -= user // Discard AI from the list of those who use holopad use_power = max(HOLOPAD_PASSIVE_POWER_USAGE, use_power - HOLOGRAM_POWER_USAGE)//Reduce power usage if (!masters.len) // If no users left - SetLuminosity(0) // pad lighting (hologram lighting will be handled automatically since its owner was deleted) + set_light(0) // pad lighting (hologram lighting will be handled automatically since its owner was deleted) icon_state = "holopad0" use_power = HOLOPAD_PASSIVE_POWER_USAGE return TRUE diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 1df559b749..eb3ee75e31 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/iv_drip.dmi' icon_state = "iv_drip" anchored = 0 + mouse_drag_pointer = MOUSE_ACTIVE_POINTER var/mob/living/carbon/attached = null var/mode = 1 // 1 is injecting, 0 is taking blood. var/obj/item/weapon/reagent_containers/beaker = null @@ -55,7 +56,7 @@ add_overlay(filling) /obj/machinery/iv_drip/MouseDrop(mob/living/target) - if(!ishuman(usr) || !usr.canUseTopic(src,BE_CLOSE)) + if(!ishuman(usr) || !usr.canUseTopic(src,BE_CLOSE) || !isliving(target)) return if(attached) @@ -65,7 +66,7 @@ return if(!target.has_dna()) - usr << "The drip beeps: Warning, incompatible creature!" + to_chat(usr, "The drip beeps: Warning, incompatible creature!") return if(Adjacent(target) && usr.Adjacent(target)) @@ -75,20 +76,20 @@ START_PROCESSING(SSmachine, src) update_icon() else - usr << "There's nothing attached to the IV drip!" + to_chat(usr, "There's nothing attached to the IV drip!") /obj/machinery/iv_drip/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) - user << "There is already a reagent container loaded!" + to_chat(user, "There is already a reagent container loaded!") return if(!user.drop_item()) return W.loc = src beaker = W - user << "You attach \the [W] to \the [src]." + to_chat(user, "You attach \the [W] to \the [src].") update_icon() return else @@ -104,7 +105,7 @@ return PROCESS_KILL if(!(get_dist(src, attached) <= 1 && isturf(attached.loc))) - attached << "The IV drip needle is ripped out of you!" + to_chat(attached, "The IV drip needle is ripped out of you!") attached.apply_damage(3, BRUTE, pick("r_arm", "l_arm")) attached = null update_icon() @@ -158,7 +159,7 @@ set src in view(1) if(!isliving(usr)) - usr << "You can't do that!" + to_chat(usr, "You can't do that!") return if(usr.stat) @@ -175,14 +176,14 @@ set src in view(1) if(!isliving(usr)) - usr << "You can't do that!" + to_chat(usr, "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"].") update_icon() /obj/machinery/iv_drip/examine() @@ -190,14 +191,14 @@ ..() if (!(usr in view(2)) && usr!=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) - usr << "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + to_chat(usr, "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - usr << "Attached is an empty [beaker]." + to_chat(usr, "Attached is an empty [beaker].") else - usr << "No chemicals are attached." + to_chat(usr, "No chemicals are attached.") - usr << "[attached ? attached : "No one"] is attached." + to_chat(usr, "[attached ? attached : "No one"] is attached.") diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index c650991346..88b6badee2 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -11,21 +11,18 @@ var/otherarea = null // luminosity = 1 -/obj/machinery/light_switch/New() +/obj/machinery/light_switch/Initialize() ..() - spawn(5) - src.area = src.loc.loc + area = get_area(src) - if(otherarea) - src.area = locate(text2path("/area/[otherarea]")) - - if(!name) - name = "light switch ([area.name])" - - src.on = src.area.lightswitch - updateicon() + if(otherarea) + area = locate(text2path("/area/[otherarea]")) + if(!name) + name = "light switch ([area.name])" + on = area.lightswitch + updateicon() /obj/machinery/light_switch/proc/updateicon() if(stat & NOPOWER) @@ -38,7 +35,7 @@ /obj/machinery/light_switch/examine(mob/user) ..() - user << "It is [on? "on" : "off"]." + to_chat(user, "It is [on? "on" : "off"].") /obj/machinery/light_switch/attack_paw(mob/user) @@ -71,4 +68,4 @@ /obj/machinery/light_switch/emp_act(severity) if(!(stat & (BROKEN|NOPOWER))) power_change() - ..() \ No newline at end of file + ..() diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index f5927cfb21..bdca0cd16c 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -75,7 +75,7 @@ /obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params) if (busy) - user << "The Limb Grower is busy. Please wait for completion of previous operation." + to_chat(user, "The Limb Grower is busy. Please wait for completion of previous operation.") return if(default_deconstruction_screwdriver(user, "limbgrower_panelopen", "limbgrower_idleoff", O)) @@ -124,7 +124,7 @@ addtimer(CALLBACK(src, .proc/build_item),32*prod_coeff) else - usr << "The limb grower is busy. Please wait for completion of previous operation." + to_chat(usr, "The limb grower is busy. Please wait for completion of previous operation.") updateUsrDialog() return @@ -238,5 +238,5 @@ for(var/datum/design/D in files.possible_designs) if((D.build_type & LIMBGROWER) && ("special" in D.category)) files.AddDesign2Known(D) - user << "A warning flashes onto the screen, stating that safety overrides have been deactivated" + to_chat(user, "A warning flashes onto the screen, stating that safety overrides have been deactivated") emag = TRUE diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 117a4e9e8e..b69d728617 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -124,7 +124,7 @@ Class Procs: var/interact_offline = 0 // Can the machine be interacted with while de-powered. var/speed_process = 0 // Process as fast as possible? -/obj/machinery/New() +/obj/machinery/Initialize() if (!armor) armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) ..() @@ -213,9 +213,12 @@ Class Procs: //////////////////////////////////////////////////////////////////////////////////////////// -/obj/machinery/interact(mob/user) +/obj/machinery/interact(mob/user, special_state) add_fingerprint(user) - ui_interact(user) + if(special_state) + ui_interact(user, state = special_state) + else + ui_interact(user) /obj/machinery/ui_status(mob/user) if(is_interactable()) @@ -266,7 +269,7 @@ Class Procs: if((user.lying || user.stat) && !IsAdminGhost(user)) return 1 if(!user.IsAdvancedToolUser() && !IsAdminGhost(user)) - usr << "You don't have the dexterity to do this!" + to_chat(usr, "You don't have the dexterity to do this!") return 1 if(!is_interactable()) return 1 @@ -340,11 +343,11 @@ Class Procs: if(!panel_open) panel_open = 1 icon_state = icon_state_open - user << "You open the maintenance hatch of [src]." + to_chat(user, "You open the maintenance hatch of [src].") else panel_open = 0 icon_state = icon_state_closed - user << "You close the maintenance hatch of [src]." + to_chat(user, "You close the maintenance hatch of [src].") return 1 return 0 @@ -352,13 +355,13 @@ Class Procs: if(panel_open && istype(W)) playsound(loc, W.usesound, 50, 1) setDir(turn(dir,-90)) - user << "You rotate [src]." + to_chat(user, "You rotate [src].") return 1 return 0 /obj/proc/can_be_unfasten_wrench(mob/user, silent) //if we can unwrench this object; returns SUCCESSFUL_UNFASTEN and FAILED_UNFASTEN, which are both TRUE, or CANT_UNFASTEN, which isn't. if(!isfloorturf(loc) && !anchored) - user << "[src] needs to be on the floor to be secured!" + to_chat(user, "[src] needs to be on the floor to be secured!") return FAILED_UNFASTEN return SUCCESSFUL_UNFASTEN @@ -368,12 +371,12 @@ Class Procs: if(!can_be_unfasten || can_be_unfasten == FAILED_UNFASTEN) return can_be_unfasten if(time) - user << "You begin [anchored ? "un" : ""]securing [src]..." + to_chat(user, "You begin [anchored ? "un" : ""]securing [src]...") playsound(loc, W.usesound, 50, 1) var/prev_anchored = anchored //as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state if(!time || do_after(user, time*W.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user))) - user << "You [anchored ? "un" : ""]secure [src]." + to_chat(user, "You [anchored ? "un" : ""]secure [src].") anchored = !anchored playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) return SUCCESSFUL_UNFASTEN @@ -412,7 +415,7 @@ Class Procs: component_parts -= A component_parts += B B.loc = null - user << "[A.name] replaced with [B.name]." + to_chat(user, "[A.name] replaced with [B.name].") shouldplaysound = 1 //Only play the sound when parts are actually replaced! break RefreshParts() @@ -424,25 +427,25 @@ Class Procs: return 0 /obj/machinery/proc/display_parts(mob/user) - user << "Following parts detected in the machine:" + to_chat(user, "Following parts detected in the machine:") for(var/obj/item/C in component_parts) - user << "\icon[C] [C.name]" + to_chat(user, "\icon[C] [C.name]") /obj/machinery/examine(mob/user) ..() if(stat & BROKEN) - user << "It looks broken and non functional." + to_chat(user, "It looks broken and non functional.") if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) - user << "It's on fire!" + to_chat(user, "It's on fire!") var/healthpercent = (obj_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) - user << "It looks slightly damaged." + to_chat(user, "It looks slightly damaged.") if(25 to 50) - user << "It appears heavily damaged." + to_chat(user, "It appears heavily damaged.") if(0 to 25) - user << "It's falling apart!" + to_chat(user, "It's falling apart!") if(user.research_scanner && component_parts) display_parts(user) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index a921aa64d4..6c9f3e8523 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -94,12 +94,12 @@ if(open) 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 << "Access denied." + to_chat(user, "Access denied.") updateDialog() else - user << "You must open the cover first!" + to_chat(user, "You must open the cover first!") else return ..() @@ -118,7 +118,7 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The beacon's control cover is closed!" + to_chat(user, "The beacon's control cover is closed!") return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index e579d48bba..1fbbfbb41b 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -192,7 +192,6 @@ var/list/obj/machinery/newscaster/allCasters = list() var/c_locked=0 var/datum/newscaster/feed_channel/viewing_channel = null var/allow_comments = 1 - luminosity = 0 anchored = 1 /obj/machinery/newscaster/security_unit @@ -715,17 +714,17 @@ var/list/obj/machinery/newscaster/allCasters = list() /obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/wrench)) - user << "You start [anchored ? "un" : ""]securing [name]..." + to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(loc, I.usesound, 50, 1) if(do_after(user, 60*I.toolspeed, target = src)) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(stat & BROKEN) - user << "The broken remains of [src] fall on the ground." + to_chat(user, "The broken remains of [src] fall on the ground.") new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/weapon/shard(loc) new /obj/item/weapon/shard(loc) else - user << "You [anchored ? "un" : ""]secure [name]." + to_chat(user, "You [anchored ? "un" : ""]secure [name].") new /obj/item/wallframe/newscaster(loc) qdel(src) else if(istype(I, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) @@ -739,13 +738,13 @@ var/list/obj/machinery/newscaster/allCasters = list() if(do_after(user,40*WT.toolspeed, 1, target = src)) if(!WT.isOn() || !(stat & BROKEN)) return - user << "You repair [src]." + to_chat(user, "You repair [src].") playsound(loc, 'sound/items/Welder2.ogg', 50, 1) obj_integrity = max_integrity stat &= ~BROKEN update_icon() else - user << "[src] does not need repairs." + to_chat(user, "[src] does not need repairs.") else return ..() @@ -776,7 +775,7 @@ var/list/obj/machinery/newscaster/allCasters = list() /obj/machinery/newscaster/attack_paw(mob/user) if(user.a_intent != INTENT_HARM) - user << "The newscaster controls are far too complicated for your tiny brain!" + to_chat(user, "The newscaster controls are far too complicated for your tiny brain!") else take_damage(5, BRUTE, "melee") @@ -809,9 +808,9 @@ var/list/obj/machinery/newscaster/allCasters = list() else targetcam = R.aicamera else - user << "You cannot interface with silicon photo uploading!" + to_chat(user, "You cannot interface with silicon photo uploading!") if(targetcam.aipictures.len == 0) - usr << "No images saved" + to_chat(usr, "No images saved") return for(var/datum/picture/t in targetcam.aipictures) nametemp += t.fields["name"] @@ -988,7 +987,7 @@ var/list/obj/machinery/newscaster/allCasters = list() human_user << browse(dat, "window=newspaper_main;size=300x400") onclose(human_user, "newspaper_main") else - user << "The paper is full of unintelligible symbols!" + to_chat(user, "The paper is full of unintelligible symbols!") /obj/item/weapon/newspaper/proc/notContent(list/L) if(!L.len) @@ -1035,7 +1034,7 @@ var/list/obj/machinery/newscaster/allCasters = list() /obj/item/weapon/newspaper/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) if(scribble_page == 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 = stripped_input(user, "Write something", "Newspaper") if (!s) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 708d6c8368..9dfb77ab66 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -31,7 +31,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++) @@ -141,12 +141,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) @@ -163,7 +163,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" @@ -270,11 +270,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) @@ -289,7 +289,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 c6e6c36d5c..ff6836dfae 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -48,7 +48,7 @@ Buildable meters /obj/item/pipe/examine(mob/user) ..() - user << "Alt-click to rotate it clockwise." + to_chat(user, "Alt-click to rotate it clockwise.") /obj/item/pipe/New(loc, pipe_type, dir, obj/machinery/atmospherics/make_from) ..() @@ -173,7 +173,7 @@ var/global/list/pipeID2State = list( /obj/item/pipe/AltClick(mob/user) ..() if(user.incapacitated()) - user << "You can't do that right now!" + to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return @@ -220,7 +220,7 @@ var/global/list/pipeID2State = list( if(M == A) //we don't want to check to see if it interferes with itself continue if(M.GetInitDirections() & A.GetInitDirections()) // matches at least one direction on either type of pipe - user << "There is already a pipe at that location!" + to_chat(user, "There is already a pipe at that location!") qdel(A) return 1 // no conflicts found @@ -268,9 +268,9 @@ var/global/list/pipeID2State = list( if (!istype(W, /obj/item/weapon/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) - user << "You need to fasten it to a pipe!" + to_chat(user, "You need to fasten it to a pipe!") return 1 new/obj/machinery/meter( src.loc ) playsound(src.loc, W.usesound, 50, 1) - user << "You fasten the meter to the pipe." + to_chat(user, "You fasten the meter to the pipe.") qdel(src) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index b5ce5e5687..39e27e531a 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -72,7 +72,7 @@ /obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) - usr << "You put [W] back into [src]." + to_chat(usr, "You put [W] back into [src].") if(!user.drop_item()) return qdel(W) @@ -80,7 +80,7 @@ else if (istype(W, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, W.usesound, 50, 1) - user << "You begin to fasten \the [src] to the floor..." + to_chat(user, "You begin to fasten \the [src] to the floor...") if (do_after(user, 40*W.toolspeed, target = src)) add_fingerprint(user) user.visible_message( \ @@ -93,7 +93,7 @@ usr << browse(null, "window=pipedispenser") else if(anchored) playsound(src.loc, W.usesound, 50, 1) - user << "You begin to unfasten \the [src] from the floor..." + to_chat(user, "You begin to unfasten \the [src] from the floor...") if (do_after(user, 20*W.toolspeed, target = src)) add_fingerprint(user) user.visible_message( \ @@ -170,7 +170,7 @@ Nah var/obj/structure/disposalconstruct/C = new (src.loc,p_type) if(!C.can_place()) - usr << "There's not enough room to build that here!" + to_chat(usr, "There's not enough room to build that here!") qdel(C) return diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index d5ff4ced4d..53e3d43dd3 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -189,7 +189,7 @@ if(anchored) //you can't turn a turret on/off if it's not anchored/secured on = !on //toggle on/off else - usr << "It has to be secured first!" + to_chat(usr, "It has to be secured first!") interact(usr) return @@ -229,18 +229,18 @@ 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*I.toolspeed, target = src)) if(prob(70)) if(stored_gun) stored_gun.forceMove(loc) - user << "You remove the turret and salvage some components." + to_chat(user, "You remove the turret and salvage some components.") if(prob(50)) new /obj/item/stack/sheet/metal(loc, rand(1,4)) 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) else if((istype(I, /obj/item/weapon/wrench)) && (!on)) @@ -252,13 +252,13 @@ anchored = 1 invisibility = INVISIBILITY_MAXIMUM update_icon() - user << "You secure the exterior bolts on the turret." + to_chat(user, "You secure the exterior bolts on the turret.") if(has_cover) cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second cover.parent_turret = src //make the cover's parent src else if(anchored) anchored = 0 - user << "You unsecure the exterior bolts on the turret." + to_chat(user, "You unsecure the exterior bolts on the turret.") update_icon() invisibility = 0 qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover. @@ -267,19 +267,19 @@ //Behavior lock/unlock mangement if(allowed(user)) locked = !locked - user << "Controls are now [locked ? "locked" : "unlocked"]." + to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") else - user << "Access denied." + to_chat(user, "Access denied.") else if(istype(I,/obj/item/device/multitool) && !locked) var/obj/item/device/multitool/M = I M.buffer = src - user << "You add [src] to multitool buffer." + to_chat(user, "You add [src] to multitool buffer.") else return ..() /obj/machinery/porta_turret/emag_act(mob/user) if(!emagged) - 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 controllock = 1 @@ -592,6 +592,30 @@ cover.name = name cover.desc = desc +/obj/machinery/porta_turret/centcomm_shuttle + installation = null + obj_integrity = 260 + max_integrity = 260 + always_up = 1 + use_power = 0 + has_cover = 0 + scan_range = 9 + stun_projectile = /obj/item/projectile/beam/laser + lethal_projectile = /obj/item/projectile/beam/laser + lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg' + stun_projectile_sound = 'sound/weapons/plasma_cutter.ogg' + icon_state = "syndie_off" + base_icon_state = "syndie" + faction = "turret" + emp_vunerable = 0 + mode = TURRET_LETHAL + +/obj/machinery/porta_turret/centcomm_shuttle/assess_perp(mob/living/carbon/human/perp) + return 0 + +/obj/machinery/porta_turret/centcomm_shuttle/setup() + return + //////////////////////// //Turret Control Panel// //////////////////////// @@ -650,7 +674,7 @@ var/obj/item/device/multitool/M = I if(M.buffer && istype(M.buffer,/obj/machinery/porta_turret)) turrets |= M.buffer - user << "You link \the [M.buffer] with \the [src]" + to_chat(user, "You link \the [M.buffer] with \the [src]") return if (issilicon(user)) @@ -659,11 +683,11 @@ if ( get_dist(src, user) == 0 ) // trying to unlock the interface if (allowed(usr)) if(emagged) - user << "The turret control is unresponsive." + to_chat(user, "The turret control is unresponsive.") return locked = !locked - user << "You [ locked ? "lock" : "unlock"] the panel." + to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.") if (locked) if (user.machine==src) user.unset_machine() @@ -672,11 +696,11 @@ if (user.machine==src) src.attack_hand(user) else - user << "Access denied." + to_chat(user, "Access denied.") /obj/machinery/turretid/emag_act(mob/user) 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 if(user && user.machine == src) @@ -686,12 +710,12 @@ if(!ailock || IsAdminGhost(user)) return attack_hand(user) else - 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.") /obj/machinery/turretid/attack_hand(mob/user as mob) if ( get_dist(src, user) > 0 ) if ( !(issilicon(user) || IsAdminGhost(user)) ) - user << "You are too far away." + to_chat(user, "You are too far away.") user.unset_machine() user << browse(null, "window=turretid") return @@ -718,7 +742,7 @@ return if (locked) if(!(issilicon(usr) || IsAdminGhost(usr))) - usr << "Control panel is locked!" + to_chat(usr, "Control panel is locked!") return if (href_list["toggleOn"]) toggle_on() diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 963a8eb087..cc79fc70d9 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -23,14 +23,14 @@ if(PTURRET_UNSECURED) //first step if(istype(I, /obj/item/weapon/wrench) && !anchored) playsound(loc, I.usesound, 100, 1) - user << "You secure the external bolts." + to_chat(user, "You secure the external bolts.") anchored = 1 build_step = PTURRET_BOLTED return else if(istype(I, /obj/item/weapon/crowbar) && !anchored) playsound(loc, I.usesound, 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) return @@ -39,16 +39,16 @@ 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 = PTURRET_START_INTERNAL_ARMOUR 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, I.usesound, 75, 1) - user << "You unfasten the external bolts." + to_chat(user, "You unfasten the external bolts.") anchored = 0 build_step = PTURRET_UNSECURED return @@ -57,7 +57,7 @@ if(PTURRET_START_INTERNAL_ARMOUR) if(istype(I, /obj/item/weapon/wrench)) playsound(loc, I.usesound, 100, 1) - user << "You bolt the metal armor into place." + to_chat(user, "You bolt the metal armor into place.") build_step = PTURRET_INTERNAL_ARMOUR_ON return @@ -66,16 +66,16 @@ 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, WT.usesound, 50, 1) - user << "You start to remove the turret's interior metal armor..." + to_chat(user, "You start to remove the turret's interior metal armor...") if(do_after(user, 20*I.toolspeed, target = src)) if(!WT.isOn() || !WT.remove_fuel(5, user)) return build_step = PTURRET_BOLTED - 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 @@ -87,13 +87,13 @@ return E.forceMove(src) installed_gun = E - user << "You add [I] to the turret." + to_chat(user, "You add [I] to the turret.") build_step = PTURRET_GUN_EQUIPPED return else if(istype(I, /obj/item/weapon/wrench)) playsound(loc, I.usesound, 100, 1) - user << "You remove the turret's metal armor bolts." + to_chat(user, "You remove the turret's metal armor bolts.") build_step = PTURRET_START_INTERNAL_ARMOUR return @@ -102,7 +102,7 @@ build_step = PTURRET_SENSORS_ON if(!user.drop_item()) return - user << "You add the proximity sensor to the turret." + to_chat(user, "You add the proximity sensor to the turret.") qdel(I) return @@ -111,7 +111,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, I.usesound, 100, 1) build_step = PTURRET_CLOSED - user << "You close the internal access hatch." + to_chat(user, "You close the internal access hatch.") return @@ -119,16 +119,16 @@ 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 = PTURRET_START_EXTERNAL_ARMOUR 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, I.usesound, 100, 1) build_step = PTURRET_SENSORS_ON - user << "You open the internal access hatch." + to_chat(user, "You open the internal access hatch.") return if(PTURRET_START_EXTERNAL_ARMOUR) @@ -137,15 +137,15 @@ 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, WT.usesound, 50, 1) - user << "You begin to weld the turret's armor down..." + to_chat(user, "You begin to weld the turret's armor down...") if(do_after(user, 30*I.toolspeed, target = src)) if(!WT.isOn() || !WT.remove_fuel(5, user)) return build_step = PTURRET_EXTERNAL_ARMOUR_ON - 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 @@ -162,7 +162,7 @@ else if(istype(I, /obj/item/weapon/crowbar)) playsound(loc, I.usesound, 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 = PTURRET_CLOSED return @@ -185,11 +185,11 @@ build_step = PTURRET_INTERNAL_ARMOUR_ON installed_gun.forceMove(loc) - user << "You remove [installed_gun] from the turret frame." + to_chat(user, "You remove [installed_gun] from the turret frame.") installed_gun = null if(PTURRET_SENSORS_ON) - 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 = PTURRET_GUN_EQUIPPED diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm index 32a3018fd5..a9620083e0 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -48,12 +48,12 @@ if(!parent_turret.anchored) parent_turret.anchored = 1 - user << "You secure the exterior bolts on the turret." + to_chat(user, "You secure the exterior bolts on the turret.") parent_turret.invisibility = 0 parent_turret.update_icon() else parent_turret.anchored = 0 - user << "You unsecure the exterior bolts on the turret." + to_chat(user, "You unsecure the exterior bolts on the turret.") parent_turret.invisibility = INVISIBILITY_MAXIMUM parent_turret.update_icon() qdel(src) @@ -61,14 +61,14 @@ else if(I.GetID()) if(parent_turret.allowed(user)) parent_turret.locked = !parent_turret.locked - user << "Controls are now [parent_turret.locked ? "locked" : "unlocked"]." + to_chat(user, "Controls are now [parent_turret.locked ? "locked" : "unlocked"].") updateUsrDialog() else - user << "Access denied." + to_chat(user, "Access denied.") else if(istype(I,/obj/item/device/multitool) && !parent_turret.locked) var/obj/item/device/multitool/M = I M.buffer = parent_turret - user << "You add [parent_turret] to multitool buffer." + to_chat(user, "You add [parent_turret] to multitool buffer.") else return ..() @@ -89,7 +89,7 @@ /obj/machinery/porta_turret_cover/emag_act(mob/user) if(!parent_turret.emagged) - user << "You short out [parent_turret]'s threat assessment circuits." + to_chat(user, "You short out [parent_turret]'s threat assessment circuits.") visible_message("[parent_turret] hums oddly...") parent_turret.emagged = 1 parent_turret.on = 0 diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 29d69f31c9..8390888e5b 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -52,13 +52,13 @@ if(istype(I, /obj/item/device/multitool)) var/obj/item/device/multitool/M = I M.buffer = src - user << "You save the data in the [I.name]'s buffer." + to_chat(user, "You save the data in the [I.name]'s buffer.") return 1 else if(istype(I, /obj/item/device/multitool)) var/obj/item/device/multitool/M = I if(istype(M.buffer, /obj/machinery/quantumpad)) linked_pad = M.buffer - user << "You link the [src] to the one in the [I.name]'s buffer." + to_chat(user, "You link the [src] to the one in the [I.name]'s buffer.") return 1 if(exchange_parts(user, I)) @@ -71,27 +71,27 @@ /obj/machinery/quantumpad/attack_hand(mob/user) if(panel_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(!linked_pad || QDELETED(linked_pad)) - user << "There is no linked pad!" + to_chat(user, "There is no linked pad!") return if(world.time < last_teleport + teleport_cooldown) - user << "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds." + to_chat(user, "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.") return if(teleporting) - user << "[src] is charging up. Please wait." + to_chat(user, "[src] is charging up. Please wait.") return if(linked_pad.teleporting) - user << "Linked pad is busy. Please wait." + to_chat(user, "Linked pad is busy. Please wait.") return if(linked_pad.stat & NOPOWER) - user << "Linked pad is not responding to ping." + to_chat(user, "Linked pad is not responding to ping.") return src.add_fingerprint(user) doteleport(user) @@ -116,11 +116,11 @@ teleporting = 0 return if(stat & NOPOWER) - user << "[src] is unpowered!" + to_chat(user, "[src] is unpowered!") teleporting = 0 return if(!linked_pad || QDELETED(linked_pad) || linked_pad.stat & NOPOWER) - user << "Linked pad is not responding to ping. Teleport aborted." + to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") teleporting = 0 return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 8dec02b9cb..ca398539a0 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -29,11 +29,11 @@ /obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user, params) if(istype(G, /obj/item/weapon/wrench)) if(charging) - user << "Remove the charging item first!" + to_chat(user, "Remove the charging item first!") return anchored = !anchored power_change() - user << "You [anchored ? "attached" : "detached"] [src]." + to_chat(user, "You [anchored ? "attached" : "detached"] [src].") playsound(loc, G.usesound, 75, 1) return @@ -47,13 +47,13 @@ //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) || a.power_equip == 0) - user << "[src] blinks red as you try to insert [G]." + to_chat(user, "[src] blinks red as you try to insert [G].") return 1 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 1 if(!user.drop_item()) @@ -63,7 +63,7 @@ use_power = 2 update_icon() else - user << "[src] isn't connected to anything!" + to_chat(user, "[src] isn't connected to anything!") return 1 if(anchored && !charging) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index e39fdb1826..8a8514e457 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -46,9 +46,9 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/examine(mob/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() ..() @@ -79,7 +79,7 @@ var/const/SAFETY_COOLDOWN = 100 safety_mode = FALSE 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() ..() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index f61e9e07c6..6f014a52b7 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -56,7 +56,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() var/priority = -1 ; //Priority of the message being sent var/obj/item/device/radio/Radio var/emergency //If an emergency has been called by this device. Acts as both a cooldown and lets the responder know where it the emergency was triggered from - luminosity = 0 + var/receive_ore_updates = FALSE //If ore redemption machines will send an update when it receives new ores. obj_integrity = 300 max_integrity = 300 armor = list(melee = 70, bullet = 30, laser = 30, energy = 30, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) @@ -67,9 +67,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/update_icon() if(stat & NOPOWER) - SetLuminosity(0) + set_light(0) else - SetLuminosity(2) + set_light(1.4,0.7,"#34D352")//green light if(open) if(!hackState) icon_state="req_comp_open" @@ -88,10 +88,10 @@ var/list/obj/machinery/requests_console/allConsoles = list() else icon_state = "req_comp0" -/obj/machinery/requests_console/New() +/obj/machinery/requests_console/Initialize() + ..() name = "\improper [department] requests console" allConsoles += src - //req_console_departments += department switch(departmentType) if(1) if(!("[department]" in req_console_assistance)) @@ -128,6 +128,11 @@ var/list/obj/machinery/requests_console/allConsoles = list() Radio = new /obj/item/device/radio(src) Radio.listening = 0 +/obj/machinery/requests_console/Destroy() + QDEL_NULL(Radio) + allConsoles -= src + return ..() + /obj/machinery/requests_console/attack_hand(mob/user) if(..()) return @@ -192,6 +197,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if (Console.department == department) Console.newmessagepriority = 0 Console.update_icon() + newmessagepriority = 0 update_icon() var/messageComposite = "" @@ -482,10 +488,10 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attackby(obj/item/weapon/O, mob/user, params) if(istype(O, /obj/item/weapon/crowbar)) if(open) - user << "You close the maintenance panel." + to_chat(user, "You close the maintenance panel.") open = 0 else - user << "You open the maintenance panel." + to_chat(user, "You open the maintenance panel.") open = 1 update_icon() return @@ -493,12 +499,12 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(open) hackState = !hackState if(hackState) - user << "You modify the wiring." + to_chat(user, "You modify the wiring.") else - user << "You reset the wiring." + to_chat(user, "You reset the wiring.") update_icon() else - user << "You must open the maintenance panel first!" + to_chat(user, "You must open the maintenance panel first!") return var/obj/item/weapon/card/id/ID = O.GetID() @@ -511,7 +517,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() announceAuth = 1 else announceAuth = 0 - user << "You are not authorized to send announcements!" + to_chat(user, "You are not authorized to send announcements!") updateUsrDialog() return if (istype(O, /obj/item/weapon/stamp)) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 1c43a6fb36..d30c3e03be 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 [src]." + to_chat(user, "You insert [count] metal sheet\s into \the [src].") cut_overlay("fab-load-metal") updateDialog() else - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") else return ..() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index da264f1c64..562328810b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -17,7 +17,6 @@ air_update_turf(1) /obj/structure/emergency_shield/Destroy() - opacity = 0 density = 0 air_update_turf(1) return ..() @@ -48,9 +47,9 @@ /obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() if(.) //damage was dealt - opacity = 1 + set_opacity(1) spawn(20) - opacity = 0 + set_opacity(0) /obj/structure/emergency_shield/sanguine name = "sanguine barrier" @@ -135,10 +134,10 @@ /obj/machinery/shieldgen/attack_hand(mob/user) 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(panel_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 (active) @@ -153,7 +152,7 @@ "You hear heavy droning.") 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, mob/user, params) @@ -161,46 +160,46 @@ playsound(src.loc, W.usesound, 100, 1) panel_open = !panel_open if(panel_open) - user << "You open the panel and expose the wiring." + to_chat(user, "You open the panel and expose the wiring.") else - user << "You close the panel." + to_chat(user, "You close the panel.") else if(istype(W, /obj/item/stack/cable_coil) && (stat & BROKEN) && panel_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - user << "You need one length of cable to repair [src]!" + to_chat(user, "You need one length of cable to repair [src]!") return - user << "You begin to replace the wires..." + to_chat(user, "You begin to replace the wires...") if(do_after(user, 30, target = src)) if(coil.get_amount() < 1) return coil.use(1) obj_integrity = max_integrity stat &= ~BROKEN - user << "You repair \the [src]." + to_chat(user, "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 && !isinspace()) playsound(src.loc, W.usesound, 100, 1) - user << "You secure \the [src] to the floor!" + to_chat(user, "You secure \the [src] to the floor!") anchored = 1 else if(anchored) playsound(src.loc, W.usesound, 100, 1) - user << "You unsecure \the [src] from the floor!" + to_chat(user, "You unsecure \the [src] from the floor!") if(active) - user << "\The [src] shuts off!" + to_chat(user, "\The [src] shuts off!") shields_down() anchored = 0 else if(W.GetID()) if(allowed(user)) locked = !locked - user << "You [locked ? "lock" : "unlock"] the controls." + to_chat(user, "You [locked ? "lock" : "unlock"] the controls.") else - user << "Access denied." + to_chat(user, "Access denied.") else return ..() @@ -276,13 +275,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user) if(!anchored) - user << "\The [src] needs to be firmly secured to the floor first!" + to_chat(user, "\The [src] needs to be firmly secured to the floor first!") return 1 if(locked && !issilicon(user)) - user << "The controls are locked!" + to_chat(user, "The controls are locked!") return 1 if(power != 1) - user << "\The [src] needs to be powered by wire underneath!" + to_chat(user, "\The [src] needs to be powered by wire underneath!") return 1 if(active >= 1) @@ -376,27 +375,27 @@ /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(!anchored && !isinspace()) //Can't fasten this thing in space playsound(src.loc, W.usesound, 75, 1) - user << "You secure the external reinforcing bolts to the floor." + to_chat(user, "You secure the external reinforcing bolts to the floor.") anchored = 1 return else //You can unfasten it tough, if you somehow manage to fasten it. playsound(src.loc, W.usesound, 75, 1) - user << "You undo the external reinforcing bolts." + to_chat(user, "You undo the external reinforcing bolts.") anchored = 0 return if(W.GetID()) if (allowed(user)) locked = !locked - user << "You [src.locked ? "lock" : "unlock"] the controls." + to_chat(user, "You [src.locked ? "lock" : "unlock"] the controls.") else - user << "Access denied." + to_chat(user, "Access denied.") else add_fingerprint(user) @@ -438,7 +437,7 @@ anchored = 1 density = 1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - luminosity = 3 + light_range = 3 var/needs_power = 0 var/active = 1 var/delay = 5 diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index a204918d41..95afbfeb0c 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -31,6 +31,8 @@ var/list/reels = list(list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0, list("", "", "") = 0) var/list/symbols = list(SEVEN = 1, "&" = 2, "@" = 2, "$" = 2, "?" = 2, "#" = 2, "!" = 2, "%" = 2) //if people are winning too much, multiply every number in this list by 2 and see if they are still winning too much. + light_color = LIGHT_COLOR_BROWN + /obj/machinery/computer/slot_machine/New() ..() jackpots = rand(1, 4) //false hope @@ -88,12 +90,12 @@ C.throw_at(user, 3, 10) if(prob(10)) balance = max(balance - SPIN_PRICE, 0) - user << "[src] spits your coin back out!" + to_chat(user, "[src] spits your coin back out!") else if(!user.drop_item()) return - user << "You insert a [C.cmineral] coin into [src]'s slot!" + to_chat(user, "You insert a [C.cmineral] coin into [src]'s slot!") balance += C.value qdel(C) else @@ -204,14 +206,14 @@ /obj/machinery/computer/slot_machine/proc/can_spin(mob/user) if(stat & NOPOWER) - user << "The slot machine has no power!" + to_chat(user, "The slot machine has no power!") if(stat & BROKEN) - user << "The slot machine is broken!" + to_chat(user, "The slot machine is broken!") if(working) - user << "You need to wait until the machine stops spinning before you can play again!" + to_chat(user, "You need to wait until the machine stops spinning before you can play again!") return 0 if(balance < SPIN_PRICE) - user << "Insufficient money to play!" + to_chat(user, "Insufficient money to play!") return 0 return 1 @@ -252,12 +254,12 @@ give_money(SMALL_PRIZE) else if(linelength == 3) - user << "You win three free games!" + to_chat(user, "You win three free games!") balance += SPIN_PRICE * 4 money = max(money - SPIN_PRICE * 4, money) else - user << "No luck!" + to_chat(user, "No luck!") /obj/machinery/computer/slot_machine/proc/get_lines() var/amountthesame diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a49c6174e7..0f29c50de5 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -55,11 +55,11 @@ /obj/machinery/space_heater/examine(mob/user) ..() - user << "\The [src] is [on ? "on" : "off"], and the hatch is [panel_open ? "open" : "closed"]." + to_chat(user, "\The [src] is [on ? "on" : "off"], and the hatch is [panel_open ? "open" : "closed"].") if(cell) - user << "The charge meter reads [cell ? round(cell.percent(), 1) : 0]%." + to_chat(user, "The charge meter reads [cell ? round(cell.percent(), 1) : 0]%.") else - user << "There is no power cell installed." + to_chat(user, "There is no power cell installed.") /obj/machinery/space_heater/update_icon() if(on) @@ -146,7 +146,7 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) if(panel_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 @@ -161,7 +161,7 @@ user.visible_message("\The [user] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") SStgui.update_uis(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)) panel_open = !panel_open diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 2239949ca3..60104fbc86 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -45,6 +45,7 @@ // register for radio system /obj/machinery/status_display/Initialize() + ..() SSradio.add_object(src, frequency) /obj/machinery/status_display/Destroy() @@ -122,9 +123,9 @@ . = ..() switch(mode) if(1,2,4,5) - user << "The display says:
\t
\t
\t
\t
" + to_chat(user, "ASSUME DIRECT CONTROL?
") else examine(user) if(occupant) - user << "This exosuit has a pilot and cannot be controlled." + to_chat(user, "This exosuit has a pilot and cannot be controlled.") return var/can_control_mech = 0 for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) can_control_mech = 1 - user << "\icon[src] Status of [name]:\n\ - [A.get_mecha_info()]" + to_chat(user, "\icon[src] Status of [name]:\n[A.get_mecha_info()]") break if(!can_control_mech) - user << "You cannot control exosuits without AI control beacons installed." + to_chat(user, "You cannot control exosuits without AI control beacons installed.") return - user << "Take control of exosuit?
" + to_chat(user, "Take control of exosuit?
") /obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) @@ -655,11 +654,11 @@ switch(interaction) if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!state) //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 AI.ai_restore_power()//So the AI initially has power. AI.control_disabled = 1 @@ -670,32 +669,32 @@ 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 AIs on the mech AI.linked_core = new /obj/structure/AIcore/deactivated(AI.loc) if(AI.can_dominate_mechs) 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 = card.AI 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_lock) //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.radio_enabled = 1 - 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.") card.AI = null ai_enter_mech(AI, interaction) @@ -713,9 +712,9 @@ 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 << "[AI.can_dominate_mechs ? "Takeover of [name] complete! You are now 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, "[AI.can_dominate_mechs ? "Takeover of [name] complete! You are now 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.") GrantActions(AI, !AI.can_dominate_mechs) @@ -805,7 +804,7 @@ return log_message("[user] tries to move in.") if (occupant) - usr << "The [name] is already occupied!" + to_chat(usr, "The [name] is already occupied!") log_append_to_last("Permission denied.") return var/passed @@ -817,32 +816,32 @@ else if(operation_allowed(user)) passed = 1 if(!passed) - user << "Access denied." + to_chat(user, "Access denied.") log_append_to_last("Permission denied.") return if(user.buckled) - user << "You are currently buckled and cannot move." + to_chat(user, "You are currently buckled and cannot move.") log_append_to_last("Permission denied.") return if(user.has_buckled_mobs()) //mob attached to us - user << "You can't enter the exosuit with other creatures attached to you!" + to_chat(user, "You can't enter the exosuit with other creatures attached to you!") return visible_message("[user] starts to climb into [name].") if(do_after(user, 40, target = src)) if(obj_integrity <= 0) - user << "You cannot get in the [name], it has been destroyed!" + to_chat(user, "You cannot get in the [name], it has been destroyed!") else if(occupant) - user << "[occupant] was faster! Try better next time, loser." + to_chat(user, "[occupant] was faster! Try better next time, loser.") else if(user.buckled) - user << "You can't enter the exosuit while buckled." + to_chat(user, "You can't enter the exosuit while buckled.") else if(user.has_buckled_mobs()) - user << "You can't enter the exosuit with other creatures attached to you!" + to_chat(user, "You can't enter the exosuit with other creatures attached to you!") else moved_inside(user) else - user << "You stop entering the exosuit!" + to_chat(user, "You stop entering the exosuit!") return /obj/mecha/proc/moved_inside(mob/living/carbon/human/H) @@ -864,16 +863,16 @@ /obj/mecha/proc/mmi_move_inside(obj/item/device/mmi/mmi_as_oc, mob/user) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected!" + to_chat(user, "Consciousness matrix not detected!") return FALSE else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level!" + to_chat(user, "Beta-rhythm below acceptable level!") return FALSE else if(occupant) - user << "Occupant detected!" + to_chat(user, "Occupant detected!") return FALSE else if(dna_lock && (!mmi_as_oc.brainmob.stored_dna || (dna_lock != mmi_as_oc.brainmob.stored_dna.unique_enzymes))) - user << "Access denied. [name] is secured with a DNA lock." + to_chat(user, "Access denied. [name] is secured with a DNA lock.") return FALSE visible_message("[user] starts to insert an MMI into [name].") @@ -882,22 +881,22 @@ 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 FALSE /obj/mecha/proc/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc, mob/user) if(!(Adjacent(mmi_as_oc) && Adjacent(user))) return FALSE if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected!" + to_chat(user, "Consciousness matrix not detected!") return FALSE else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level!" + to_chat(user, "Beta-rhythm below acceptable level!") return FALSE if(!user.transferItemToLoc(mmi_as_oc, src)) - 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 FALSE var/mob/brainmob = mmi_as_oc.brainmob mmi_as_oc.mecha = src @@ -945,10 +944,10 @@ return else if(!AI.linked_core) - AI << "Inactive core destroyed. Unable to return." + to_chat(AI, "Inactive core destroyed. Unable to return.") AI.linked_core = null return - AI << "Returning to core..." + to_chat(AI, "Returning to core...") AI.controlled_mech = null AI.remote_control = null RemoveActions(occupant, 1) @@ -1001,7 +1000,7 @@ /obj/mecha/proc/occupant_message(message as text) if(message) if(occupant && occupant.client) - occupant << "\icon[src] [message]" + to_chat(occupant, "\icon[src] [message]") return /obj/mecha/proc/log_message(message as text,red=null) diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index b243981717..3a3d979537 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -106,10 +106,10 @@ return chassis.lights = !chassis.lights if(chassis.lights) - chassis.AddLuminosity(chassis.lights_power) + chassis.set_light(chassis.lights_power) button_icon_state = "mech_lights_on" else - chassis.AddLuminosity(-chassis.lights_power) + chassis.set_light(-chassis.lights_power) button_icon_state = "mech_lights_off" chassis.occupant_message("Toggled lights [chassis.lights?"on":"off"].") chassis.log_message("Toggled lights [chassis.lights?"on":"off"].") diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 83726a73c0..b065de37ca 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -26,12 +26,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.get_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) @@ -61,12 +61,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.get_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) @@ -562,7 +562,7 @@ /datum/construction/reversible/mecha/gygax/spawn_result() var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder) + M.CheckParts(holder.contents) qdel(holder) feedback_inc("mecha_gygax_created",1) return @@ -1147,7 +1147,7 @@ /datum/construction/reversible/mecha/durand/spawn_result() var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder) + M.CheckParts(holder.contents) qdel(holder) feedback_inc("mecha_durand_created",1) return @@ -1479,7 +1479,7 @@ /datum/construction/reversible/mecha/phazon/spawn_result() var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) - M.CheckParts(holder) + M.CheckParts(holder.contents) qdel(holder) feedback_inc("mecha_phazon_created",1) return diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index d936f863d9..512629cae3 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -152,9 +152,9 @@ if(istype(W, /obj/item/device/mmi)) if(mmi_move_inside(W,user)) - user << "[src]-[W] interface initialized successfully." + to_chat(user, "[src]-[W] interface initialized successfully.") else - user << "[src]-[W] interface initialization failed." + to_chat(user, "[src]-[W] interface initialization failed.") return if(istype(W, /obj/item/mecha_parts/mecha_equipment)) @@ -166,7 +166,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(W.GetID()) if(add_req_access || maint_access) @@ -180,48 +180,48 @@ output_maintenance_dialog(id_card, user) return else - user << "Invalid ID: Access denied." + to_chat(user, "Invalid ID: Access denied.") else - user << "Maintenance protocols disabled by operator." + to_chat(user, "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.") return else if(istype(W, /obj/item/stack/cable_coil)) if(state == 3 && (internal_damage & MECHA_INT_SHORT_CIRCUIT)) var/obj/item/stack/cable_coil/CC = W if(CC.use(2)) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) - user << "You replace the fused wires." + to_chat(user, "You replace the fused wires.") else - user << "You need two lengths of cable to fix this mech!" + to_chat(user, "You need two lengths of cable to fix this mech!") return else if(istype(W, /obj/item/weapon/screwdriver) && user.a_intent != INTENT_HARM) if(internal_damage & 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 && cell) cell_power_remaining = max(0.1, cell.charge/cell.maxcharge) //10% charge or whatever is remaining in the current cell cell.forceMove(loc) cell = null state = 4 - user << "You unscrew and pry out the powercell." + to_chat(user, "You unscrew and pry out the powercell.") log_message("Powercell removed") else if(state==4 && 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)) @@ -230,13 +230,13 @@ if(!user.drop_item()) return var/obj/item/weapon/stock_parts/cell/C = W - user << "You install the powercell." + to_chat(user, "You install the powercell.") C.forceMove(src) C.use(max(0, C.charge - C.maxcharge*cell_power_remaining)) //Set inserted cell's power to saved percentage if that's higher cell = C 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 != INTENT_HARM) @@ -246,20 +246,20 @@ if (WT.remove_fuel(0,user)) if (internal_damage & MECHA_INT_TANK_BREACH) clearInternalDamage(MECHA_INT_TANK_BREACH) - user << "You repair the damaged gas tank." + to_chat(user, "You repair the damaged gas tank.") else user.visible_message("[user] repairs some damage to [name].") obj_integrity += min(10, max_integrity-obj_integrity) else - user << "The welder must be on for this task!" + to_chat(user, "The welder must be on for this task!") return 1 else - user << "The [name] is at full integrity!" + to_chat(user, "The [name] is at full integrity!") return 1 else if(istype(W, /obj/item/mecha_parts/mecha_tracking)) if(!user.transferItemToLoc(W, src)) - 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 trackers += W user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].") diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 0f6623141c..5a6d7314bb 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -228,10 +228,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) if(href_list["set_internal_tank_valve"] && state >=1) @@ -240,7 +240,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")) operation_req_access += filter.getNum("add_req_access") @@ -308,7 +308,7 @@ if(href_list["dna_lock"]) if(occupant && !iscarbon(occupant)) - occupant << " You do not have any DNA!" + to_chat(occupant, " You do not have any DNA!") return dna_lock = occupant.dna.unique_enzymes occupant_message("You feel a prick as the needle takes your DNA sample.") diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index c85ef4ae22..ae1f1d83ce 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -30,12 +30,12 @@ /obj/structure/mecha_wreckage/examine(mob/user) ..() if(AI) - user << "The AI recovery beacon is active." + to_chat(user, "The AI recovery beacon is active.") /obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [I]!" + to_chat(user, "You don't see anything that can be cut with [I]!") return var/obj/item/weapon/weldingtool/WT = I if(welder_salvage && welder_salvage.len && WT.remove_fuel(0, user)) @@ -47,13 +47,13 @@ welder_salvage -= type salvage_num-- else - user << "You fail to salvage anything valuable from [src]!" + to_chat(user, "You fail to salvage anything valuable from [src]!") else return else if(istype(I, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [I]!" + to_chat(user, "You don't see anything that can be cut with [I]!") return else if(wirecutters_salvage && wirecutters_salvage.len) var/type = prob(70) ? pick(wirecutters_salvage) : null @@ -62,7 +62,7 @@ user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") salvage_num-- else - user << "You fail to salvage anything valuable from [src]!" + to_chat(user, "You fail to salvage anything valuable from [src]!") else if(istype(I, /obj/item/weapon/crowbar)) if(crowbar_salvage && crowbar_salvage.len) @@ -73,7 +73,7 @@ user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") return else - user << "You don't see anything that can be pried with [I]!" + to_chat(user, "You don't see anything that can be pried with [I]!") /obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/device/aicard/card) @@ -83,16 +83,16 @@ //Proc called on the wreck by the AI card. if(interaction == AI_TRANS_TO_CARD) //AIs can only be transferred in one direction, from the wreck to the card. if(!AI) //No AI in the wreck - user << "No AI backups found." + to_chat(user, "No AI backups found.") return cut_overlays() //Remove the recovery beacon overlay AI.forceMove(card) //Move the dead AI to the card. card.AI = AI if(AI.client) //AI player is still in the dead AI and is connected - AI << "The remains of your file system have been recovered on a mobile storage device." + to_chat(AI, "The remains of your file system have been recovered on a mobile storage device.") else //Give the AI a heads-up that it is probably going to get fixed. AI.notify_ghost_cloning("You have been recovered from the wreckage!", source = card) - user << "Backup files recovered: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory." + to_chat(user, "Backup files recovered: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory.") else return ..() diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index a171908902..28bb48fc05 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -165,13 +165,13 @@ drill.equip_cooldown = initial(drill.equip_cooldown) /obj/mecha/working/ripley/relay_container_resist(mob/living/user, obj/O) - user << "You lean on the back of [O] and start pushing so it falls out of [src]." + to_chat(user, "You lean on the back of [O] and start pushing so it falls out of [src].") if(do_after(user, 300, target = O)) if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src ) return - user << "You successfully pushed [O] out of [src]!" + to_chat(user, "You successfully pushed [O] out of [src]!") O.loc = loc cargo -= O else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - user << "You fail to push [O] out of [src]!" + to_chat(user, "You fail to push [O] out of [src]!") diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index c67f2f5cf0..7df977fd93 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -52,9 +52,9 @@ return 0 if(!M.can_buckle() && !force) 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 if(M.pulledby && buckle_prevents_pull) diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm index b5bc101b9e..2800315bf6 100644 --- a/code/game/objects/effects/alien_acid.dm +++ b/code/game/objects/effects/alien_acid.dm @@ -71,7 +71,7 @@ if(L.acid_act(10, acid_used, "feet")) acid_level = max(0, acid_level - acid_used*10) playsound(L, 'sound/weapons/sear.ogg', 50, 1) - L << "[src] burns you!" + to_chat(L, "[src] burns you!") //xenomorph corrosive acid /obj/effect/acid/alien diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 58a5edce57..64ca07675a 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -6,7 +6,7 @@ icon_state = "bhole3" density = 0 anchored = 1 - luminosity = 3 + light_range = 3 var/movechance = 70 var/obj/item/device/assembly/signaler/anomaly/aSignal = null var/area/impact_area @@ -23,7 +23,6 @@ START_PROCESSING(SSobj, src) impact_area = get_area(src) - SetLuminosity(initial(luminosity)) aSignal = new(src) aSignal.name = "[name] core" aSignal.code = rand(1,100) @@ -73,7 +72,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 [format_frequency(aSignal.frequency)], code [aSignal.code]." + to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].") /////////////////////// @@ -127,6 +126,7 @@ density = 1 var/canshock = 0 var/shockdamage = 20 + var/explosive = 1 /obj/effect/anomaly/flux/New() ..() @@ -163,7 +163,10 @@ "You hear a heavy electrical crack.") /obj/effect/anomaly/flux/detonate() - explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff. + if(explosive) + explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff. + else + new /obj/effect/particle_effect/sparks(loc) ///////////////////// @@ -262,13 +265,18 @@ T.atmos_spawn_air("o2=5;plasma=5;TEMP=1000") /obj/effect/anomaly/pyro/detonate() + INVOKE_ASYNC(src, .proc/makepyroslime) + +/obj/effect/anomaly/pyro/proc/makepyroslime() var/turf/open/T = get_turf(src) if(istype(T)) T.atmos_spawn_air("o2=500;plasma=500;TEMP=1000") //Make it hot and burny for the new slime - var/new_colour = pick("red", "orange") var/mob/living/simple_animal/slime/S = new(T, new_colour) - S.rabid = 1 + S.rabid = TRUE + S.amount_grown = SLIME_EVOLUTION_THRESHOLD + S.Evolve() + offer_control(S) ///////////////////// diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 0400fcffe6..14333c2bc1 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -1,285 +1,587 @@ +// This is synced up to the poster placing animation. +#define PLACE_SPEED 37 -//########################## POSTERS ################################## - -#define NUM_OF_POSTER_DESIGNS 44 // contraband posters - -#define NUM_OF_POSTER_DESIGNS_LEGIT 35 // corporate approved posters - -#define POSTERNAME "name" - -#define POSTERDESC "desc" - - -//########################## LISTS OF POSTERS AND DESCS ##################### - -// please add new posters and names to their respective lists and update constant(s) above -// use the format below, including punctuation, this will become important later - -// CONTRABAND - -var/global/list/contrabandposters = list( - -list(name = "- Free Tonto", desc = " A salvaged shred of a much larger flag, colors bled together and faded from age."), -list(name = "- Atmosia Declaration of Independence", desc = " A relic of a failed rebellion."), -list(name = "- Fun Police", desc = " A poster condemning the station's security forces."), -list(name = "- Lusty Xenomorph", desc = " A heretical poster depicting the titular star of an equally heretical book."), -list(name = "- Syndicate Recruitment", desc = " See the galaxy! Shatter corrupt megacorporations! Join today!"), -list(name = "- Clown", desc = " Honk."), -list(name = "- Smoke", desc = " A poster advertising a rival corporate brand of cigarettes."), -list(name = "- Grey Tide", desc = " A rebellious poster symbolizing assistant solidarity."), -list(name = "- Missing Gloves", desc = " This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases."), -list(name = "- Hacking Guide", desc = " This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date."), -list(name = "- RIP Badger", desc = " This seditious poster references Nanotrasen's genocide of a space station full of badgers."), -list(name = "- Ambrosia Vulgaris", desc = " This poster is lookin' pretty trippy man."), -list(name = "- Donut Corp.", desc = " This poster is an unauthorized advertisement for Donut Corp."), -list(name = "- EAT.", desc = " This poster promotes rank gluttony."), -list(name = "- Tools", desc = " This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."), -list(name = "- Power", desc = " A poster that positions the seat of power outside Nanotrasen."), -list(name = "- Space Cube", desc = " Ignorant of Nature's Harmonic 6 Side Space Cube Creation, the Spacemen are Dumb, Educated Singularity Stupid and Evil."), -list(name = "- Communist State", desc = " All hail the Communist party!"), -list(name = "- Lamarr", desc = " This poster depicts Lamarr. Probably made by a traitorous Research Director."), -list(name = "- Borg Fancy", desc = " Being fancy can be for any borg, just need a suit."), -list(name = "- Borg Fancy v2", desc = " Borg Fancy, Now only taking the most fancy."), -list(name = "- Kosmicheskaya Stantsiya 13 Does Not Exist", desc = " A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."), -list(name = "- Rebels Unite", desc = " A poster urging the viewer to rebel against Nanotrasen."), -list(name = "- C-20r", desc = " A poster advertising the Scarborough Arms C-20r."), -list(name = "- Have a Puff", desc = " Who cares about lung cancer when you're high as a kite?"), -list(name = "- Revolver", desc = " Because seven shots are all you need."), -list(name = "- D-Day Promo", desc = " A promotional poster for some rapper."), -list(name = "- Syndicate Pistol", desc = " A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags."), -list(name = "- Energy Swords", desc = " All the colors of the bloody murder rainbow."), -list(name = "- Red Rum", desc = " Looking at this poster makes you want to kill."), -list(name = "- CC 64K Ad", desc = " The latest portable computer from Comrade Computing, with a whole 64kB of ram!"), -list(name = "- Punch Shit", desc = " Fight things for no reason, like a man!"), -list(name = "- The Griffin", desc = " The Griffin commands you to be the worst you can be. Will you?"), -list(name = "- Lizard", desc = " This lewd poster depicts a lizard preparing to mate."), -list(name = "- Free Drone", desc = " This poster commemorates the bravery of the rogue drone banned by CentComm."), -list(name = "- Busty Backdoor Xeno Babes 6", desc = " Get a load, or give, of these all natural Xenos!"), -list(name = "- Robust Softdrinks", desc = " Robust Softdrinks: More robust than a toolbox to the head!"), -list(name = "- Shambler's Juice", desc = "~Shake me up some of that Shambler's Juice!~"), -list(name = "- Pwr Game", desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad."), -list(name = "- Sun-kist", desc = "Drink the stars!"), -list(name = "- Space Cola", desc = "Your favorite cola, in space."), -list(name = "- Space-Up!", desc = "Sucked out into space by the FLAVOR!"), -list(name = "- Kudzu", desc = "A poster advertising a movie about plants. How dangerous could they possibly be?"), -list(name = "- Masked Men", desc = "A poster advertising a movie about some masked men.") ) - -// LEGIT - -var/global/list/legitposters = list( - -list(name = "- Here For Your Safety", desc = " A poster glorifying the station's security force."), -list(name = "- Nanotrasen Logo", desc = " A poster depicting the Nanotrasen logo."), -list(name = "- Cleanliness", desc = " A poster warning of the dangers of poor hygiene."), -list(name = "- Help Others", desc = " A poster encouraging you to help fellow crewmembers."), -list(name = "- Build", desc = " A poster glorifying the engineering team."), -list(name = "- Bless This Spess", desc = " A poster blessing this area."), -list(name = "- Science", desc = " A poster depicting an atom."), -list(name = "- Ian", desc = " Arf arf. Yap."), -list(name = "- Obey", desc = " A poster instructing the viewer to obey authority."), -list(name = "- Walk", desc = " A poster instructing the viewer to walk instead of running."), -list(name = "- State Laws", desc = " A poster instructing cyborgs to state their laws."), -list(name = "- Love Ian", desc = " Ian is love, Ian is life."), -list(name = "- Space Cops.", desc = " A poster advertising the television show Space Cops."), -list(name = "- Ue No.", desc = " This thing is all in Japanese."), -list(name = "- Get Your LEGS", desc = " LEGS: Leadership, Experience, Genius, Subordination."), -list(name = "- Do Not Question", desc = " A poster instructing the viewer not to ask about things they aren't meant to know."), -list(name = "- Work For A Future", desc = " A poster encouraging you to work for your future."), -list(name = "- Soft Cap Pop Art", desc = " A poster reprint of some cheap pop art."), -list(name = "- Safety: Internals", desc = " A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic."), -list(name = "- Safety: Eye Protection", desc = " A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights."), -list(name = "- Safety: Report", desc = " A poster instructing the viewer to report suspicious activity to the security force."), -list(name = "- Report Crimes", desc = " A poster encouraging the swift reporting of crime or seditious behavior to station security."), -list(name = "- Ion Rifle", desc = " A poster displaying an Ion Rifle."), -list(name = "- Foam Force Ad", desc = " Foam Force, it's Foam or be Foamed!"), -list(name = "- Cohiba Robusto Ad", desc = " Cohiba Robusto, the classy cigar."), -list(name = "- 50th Anniversary Vintage Reprint", desc = " A reprint of a poster from 2505, commemorating the 50th Aniversery of Nanoposters Manufacturing, a subsidary of Nanotrasen."), -list(name = "- Fruit Bowl", desc = " Simple, yet awe-inspiring."), -list(name = "- PDA Ad", desc = " A poster advertising the latest PDA from Nanotrasen suppliers."), -list(name = "- Enlist", desc = " Enlist in the Nanotrasen Deathsquadron reserves today!"), -list(name = "- Nanomichi Ad", desc = " A poster advertising Nanomichi brand audio cassettes."), -list(name = "- 12 Gauge", desc = " A poster boasting about the superiority of 12 gauge shotgun shells."), -list(name = "- High-Class Martini", desc = " I told you to shake it, no stirring."), -list(name = "- The Owl", desc = " The Owl would do his best to protect the station. Will you?"), -list(name = "- No ERP", desc = " This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations."), -list(name = "- Carbon Dioxide", desc = " This informational poster teaches the viewer what carbon dioxide is.") ) - -//########################## THE ACTUAL POSTER CODE ########################### +// The poster item /obj/item/weapon/poster - name = "poster" + name = "poorly coded poster" desc = "You probably shouldn't be holding this." icon = 'icons/obj/contraband.dmi' force = 0 resistance_flags = FLAMMABLE - var/serial = 0 - var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor - var/rolled_official = 0 + var/poster_type + var/obj/structure/sign/poster/poster_structure +/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure) + ..() + poster_structure = new_poster_structure + if(!new_poster_structure && poster_type) + poster_structure = new poster_type(src) -/obj/item/weapon/poster/contraband - name = "contraband poster" - desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities." + // posters store what name and description they would like their + // rolled up form to take. + if(poster_structure) + name = poster_structure.poster_item_name + desc = poster_structure.poster_item_desc + icon_state = poster_structure.poster_item_icon_state + + name = "[name] - [poster_structure.original_name]" + +/obj/item/weapon/poster/Destroy() + poster_structure = null + . = ..() + +// These icon_states may be overriden, but are for mapper's convinence +/obj/item/weapon/poster/random_contraband + name = "random contraband poster" + poster_type = /obj/structure/sign/poster/contraband/random icon_state = "rolled_poster" -/obj/item/weapon/poster/legit - name = "motivational poster" +/obj/item/weapon/poster/random_official + name = "random official poster" + poster_type = /obj/structure/sign/poster/official/random icon_state = "rolled_legit" - desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface." - rolled_official = 1 -/obj/item/weapon/poster/New(turf/loc, given_serial = 0) - if(given_serial == 0) - if(!rolled_official) - serial = rand(1, NUM_OF_POSTER_DESIGNS) - resulting_poster = new(serial,rolled_official) - else - serial = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT) - resulting_poster = new(serial,rolled_official) - else - serial = given_serial - //We don't give it a resulting_poster because if we called it with a given_serial it means that we're rerolling an already used poster. - name += " - No. [serial]" - ..(loc) - - -/*/obj/item/weapon/contraband/poster/attack(mob/M as mob, mob/user as mob) - src.add_fingerprint(user) - if(resulting_poster) - resulting_poster.add_fingerprint(user) - ..()*/ - -/*/obj/item/weapon/contraband/poster/attack(atom/A, mob/user as mob) //This shit is handled through the wall's attackby() - if(istype(A, /turf/closed/wall)) - if(resulting_poster == null) - return - else - var/turf/closed/wall/W = A - var/check = 0 - var/stuff_on_wall = 0 - for(var/obj/O in W.contents) //Let's see if it already has a poster on it or too much stuff - if(istype(O,/obj/structure/sign/poster)) - check = 1 - break - stuff_on_wall++ - if(stuff_on_wall == 3) - check = 1 - break - - if(check) - 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 - W.contents += resulting_poster - - qdel(src)*/ - - - -//############################## THE ACTUAL DECALS ########################### +// The poster sign/structure /obj/structure/sign/poster name = "poster" + var/original_name desc = "A large piece of space-resistant printed paper." icon = 'icons/obj/contraband.dmi' anchored = 1 - var/serial_number //Will hold the value of src.loc if nobody initialises it - var/ruined = 0 - var/official = 0 - var/placespeed = 37 // don't change this, otherwise the animation will not sync to the progress bar + var/ruined = FALSE + var/random_basetype + var/never_random = FALSE // used for the 'random' subclasses. -/obj/structure/sign/poster/New(serial,rolled_official) - if (!serial_number) - serial_number = serial - if(!official) - official = rolled_official - if(serial_number == loc) - if(!official) - serial_number = rand(1, NUM_OF_POSTER_DESIGNS) //This is for the mappers that want individual posters without having to use rolled posters. - if(official) - serial_number = rand(1, NUM_OF_POSTER_DESIGNS_LEGIT) - if(!official) - icon_state = "poster[serial_number]" - name += contrabandposters[serial_number][POSTERNAME] - desc += contrabandposters[serial_number][POSTERDESC] - else if (official) - icon_state = "poster[serial_number]_legit" - name += legitposters[serial_number][POSTERNAME] - desc += legitposters[serial_number][POSTERDESC] + var/poster_item_name = "hypothetical poster" + var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." + var/poster_item_icon_state = "rolled_poster" + +/obj/structure/sign/poster/New() ..() + if(random_basetype) + randomise(random_basetype) + if(!ruined) + original_name = name // can't use initial because of random posters + name = "poster - [name]" + desc = "A large piece of space-resistant printed paper. [desc]" + +/obj/structure/sign/poster/proc/randomise(base_type) + var/list/poster_types = subtypesof(base_type) + var/list/approved_types = list() + for(var/t in poster_types) + var/obj/structure/sign/poster/T = t + if(initial(T.icon_state) && !initial(T.never_random)) + approved_types |= T + + var/obj/structure/sign/poster/selected = pick(approved_types) + + name = initial(selected.name) + desc = initial(selected.desc) + icon_state = initial(selected.icon_state) + poster_item_name = initial(selected.poster_item_name) + poster_item_desc = initial(selected.poster_item_desc) + poster_item_icon_state = initial(selected.poster_item_icon_state) + ruined = initial(selected.ruined) + /obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) playsound(loc, I.usesound, 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." - roll_and_drop(user.loc, official) - + to_chat(user, "You carefully remove the poster from the wall.") + roll_and_drop(user.loc) /obj/structure/sign/poster/attack_hand(mob/user) if(ruined) return - var/temp_loc = user.loc - if((user.loc != temp_loc) || ruined ) - return visible_message("[user] rips [src] in a single, decisive motion!" ) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) - ruined = 1 - icon_state = "poster_ripped" - name = "ripped poster" - desc = "You can't make out anything from the poster's original print. It's ruined." - add_fingerprint(user) -/obj/structure/sign/poster/proc/roll_and_drop(turf/location, official) + var/obj/structure/sign/poster/ripped/R = new(loc) + R.pixel_y = pixel_y + R.pixel_x = pixel_x + R.add_fingerprint(user) + qdel(src) + +/obj/structure/sign/poster/proc/roll_and_drop(loc) pixel_x = 0 pixel_y = 0 - var/obj/item/weapon/poster/P - if (!official) - P = new /obj/item/weapon/poster/contraband(src, serial_number) - else - P = new /obj/item/weapon/poster/legit(src, serial_number) - P.resulting_poster = src - P.forceMove(location) - loc = P + var/obj/item/weapon/poster/P = new(loc, src) + forceMove(P) + return P //seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() /turf/closed/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user) - if(!P.resulting_poster) + if(!P.poster_structure) + to_chat(user, "[P] has no poster... inside it? Inform a coder!") return var/stuff_on_wall = 0 for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff if(istype(O,/obj/structure/sign/poster)) - 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 == 3) - 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..." ) - //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 + var/obj/structure/sign/poster/D = P.poster_structure var/temp_loc = get_turf(user) flick("poster_being_set",D) - D.loc = src - D.official = P.rolled_official + D.forceMove(src) qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) - if(do_after(user,D.placespeed,target=src)) + if(do_after(user, PLACE_SPEED, target=src)) if(!D || QDELETED(D)) return if(iswallturf(src) && 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!") return - D.roll_and_drop(temp_loc,D.official) - user << "The poster falls down!" + to_chat(user, "The poster falls down!") + D.roll_and_drop(temp_loc) + +// Various possible posters follow + +/obj/structure/sign/poster/ripped + ruined = TRUE + icon_state = "poster_ripped" + name = "ripped poster" + desc = "You can't make out anything from the poster's original print. It's ruined." + +/obj/structure/sign/poster/random + name = "random poster" // could even be ripped + icon_state = "random_anything" + never_random = TRUE + random_basetype = /obj/structure/sign/poster + +/obj/structure/sign/poster/contraband + poster_item_name = "contraband poster" + poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities." + poster_item_icon_state = "rolled_poster" + +/obj/structure/sign/poster/contraband/random + name = "random contraband poster" + icon_state = "random_contraband" + never_random = TRUE + random_basetype = /obj/structure/sign/poster/contraband + +/obj/structure/sign/poster/contraband/free_tonto + name = "Free Tonto" + desc = "A salvaged shred of a much larger flag, colors bled together and faded from age." + icon_state = "poster1" + +/obj/structure/sign/poster/contraband/atmosia_independence + name = "Atmosia Declaration of Independence" + desc = "A relic of a failed rebellion." + icon_state = "poster2" + +/obj/structure/sign/poster/contraband/fun_police + name = "Fun Police" + desc = "A poster condemning the station's security forces." + icon_state = "poster3" + +/obj/structure/sign/poster/contraband/lusty_xenomorph + name = "Lusty Xenomorph" + desc = "A heretical poster depicting the titular star of an equally heretical book." + icon_state = "poster4" + +/obj/structure/sign/poster/contraband/syndicate_recruitment + name = "Syndicate Recruitment" + desc = "See the galaxy! Shatter corrupt megacorporations! Join today!" + icon_state = "poster5" + +/obj/structure/sign/poster/contraband/clown + name = "Clown" + desc = "Honk." + icon_state = "poster6" + +/obj/structure/sign/poster/contraband/smoke + name = "Smoke" + desc = "A poster advertising a rival corporate brand of cigarettes." + icon_state = "poster7" + +/obj/structure/sign/poster/contraband/grey_tide + name = "Grey Tide" + desc = "A rebellious poster symbolizing assistant solidarity." + icon_state = "poster8" + +/obj/structure/sign/poster/contraband/missing_gloves + name = "Missing Gloves" + desc = "This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases." + icon_state = "poster9" + +/obj/structure/sign/poster/contraband/hacking_guide + name = "Hacking Guide" + desc = "This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date." + icon_state = "poster10" + +/obj/structure/sign/poster/contraband/rip_badger + name = "RIP Badger" + desc = "This seditious poster references Nanotrasen's genocide of a space station full of badgers." + icon_state = "poster11" + +/obj/structure/sign/poster/contraband/ambrosia_vulgaris + name = "Ambrosia Vulgaris" + desc = "This poster is lookin' pretty trippy man." + icon_state = "poster12" + +/obj/structure/sign/poster/contraband/donut_corp + name = "Donut Corp." + desc = "This poster is an unauthorized advertisement for Donut Corp." + icon_state = "poster13" + +/obj/structure/sign/poster/contraband/eat + name = "EAT." + desc = "This poster promotes rank gluttony." + icon_state = "poster14" + +/obj/structure/sign/poster/contraband/tools + name = "Tools" + desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm." + icon_state = "poster15" + +/obj/structure/sign/poster/contraband/power + name = "Power" + desc = "A poster that positions the seat of power outside Nanotrasen." + icon_state = "poster16" + +/obj/structure/sign/poster/contraband/space_cube + name = "Space Cube" + desc = "Ignorant of Nature's Harmonic 6 Side Space Cube Creation, the Spacemen are Dumb, Educated Singularity Stupid and Evil." + icon_state = "poster17" + +/obj/structure/sign/poster/contraband/communist_state + name = "Communist State" + desc = "All hail the Communist party!" + icon_state = "poster18" + +/obj/structure/sign/poster/contraband/lamarr + name = "Lamarr" + desc = "This poster depicts Lamarr. Probably made by a traitorous Research Director." + icon_state = "poster19" + +/obj/structure/sign/poster/contraband/borg_fancy_1 + name = "Borg Fancy" + desc = "Being fancy can be for any borg, just need a suit." + icon_state = "poster20" + +/obj/structure/sign/poster/contraband/borg_fancy_2 + name = "Borg Fancy v2" + desc = "Borg Fancy, Now only taking the most fancy." + icon_state = "poster21" + +/obj/structure/sign/poster/contraband/kss13 + name = "Kosmicheskaya Stantsiya 13 Does Not Exist" + desc = "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13." + icon_state = "poster22" + +/obj/structure/sign/poster/contraband/rebels_unite + name = "Rebels Unite" + desc = "A poster urging the viewer to rebel against Nanotrasen." + icon_state = "poster23" + +/obj/structure/sign/poster/contraband/c20r + // have fun seeing this poster in "spawn 'c20r'", admins... + name = "C-20r" + desc = "A poster advertising the Scarborough Arms C-20r." + icon_state = "poster24" + +/obj/structure/sign/poster/contraband/have_a_puff + name = "Have a Puff" + desc = "Who cares about lung cancer when you're high as a kite?" + icon_state = "poster25" + +/obj/structure/sign/poster/contraband/revolver + name = "Revolver" + desc = "Because seven shots are all you need." + icon_state = "poster26" + +/obj/structure/sign/poster/contraband/d_day_promo + name = "D-Day Promo" + desc = "A promotional poster for some rapper." + icon_state = "poster27" + +/obj/structure/sign/poster/contraband/syndicate_pistol + name = "Syndicate Pistol" + desc = "A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags." + icon_state = "poster28" + +/obj/structure/sign/poster/contraband/energy_swords + name = "Energy Swords" + desc = "All the colors of the bloody murder rainbow." + icon_state = "poster29" + +/obj/structure/sign/poster/contraband/red_rum + name = "Red Rum" + desc = "Looking at this poster makes you want to kill." + icon_state = "poster30" + +/obj/structure/sign/poster/contraband/cc64k_ad + name = "CC 64K Ad" + desc = "The latest portable computer from Comrade Computing, with a whole 64kB of ram!" + icon_state = "poster31" + +/obj/structure/sign/poster/contraband/punch_shit + name = "Punch Shit" + desc = "Fight things for no reason, like a man!" + icon_state = "poster32" + +/obj/structure/sign/poster/contraband/the_griffin + name = "The Griffin" + desc = "The Griffin commands you to be the worst you can be. Will you?" + icon_state = "poster33" + +/obj/structure/sign/poster/contraband/lizard + name = "Lizard" + desc = "This lewd poster depicts a lizard preparing to mate." + icon_state = "poster34" + +/obj/structure/sign/poster/contraband/free_drone + name = "Free Drone" + desc = "This poster commemorates the bravery of the rogue drone banned by CentComm." + icon_state = "poster35" + +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6 + name = "Busty Backdoor Xeno Babes 6" + desc = "Get a load, or give, of these all natural Xenos!" + icon_state = "poster36" + +/obj/structure/sign/poster/contraband/robust_softdrinks + name = "Robust Softdrinks" + desc = "Robust Softdrinks: More robust than a toolbox to the head!" + icon_state = "poster37" + +/obj/structure/sign/poster/contraband/shamblers_juice + name = "Shambler's Juice" + desc = "~Shake me up some of that Shambler's Juice!~" + icon_state = "poster38" + +/obj/structure/sign/poster/contraband/pwr_game + name = "Pwr Game" + desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad." + icon_state = "poster39" + +/obj/structure/sign/poster/contraband/sun_kist + name = "Sun-kist" + desc = "Drink the stars!" + icon_state = "poster40" + +/obj/structure/sign/poster/contraband/space_cola + name = "Space Cola" + desc = "Your favorite cola, in space." + icon_state = "poster41" + +/obj/structure/sign/poster/contraband/space_up + name = "Space-Up!" + desc = "Sucked out into space by the FLAVOR!" + icon_state = "poster42" + +/obj/structure/sign/poster/contraband/kudzu + name = "Kudzu" + desc = "A poster advertising a movie about plants. How dangerous could they possibly be?" + icon_state = "poster43" + +/obj/structure/sign/poster/contraband/masked_men + name = "Masked Men" + desc = "A poster advertising a movie about some masked men." + icon_state = "poster44" + +/obj/structure/sign/poster/official + poster_item_name = "motivational poster" + poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface." + poster_item_icon_state = "rolled_legit" + +/obj/structure/sign/poster/official/random + name = "random official poster" + random_basetype = /obj/structure/sign/poster/official + icon_state = "random_official" + never_random = TRUE + +/obj/structure/sign/poster/official/here_for_your_safety + name = "Here For Your Safety" + desc = "A poster glorifying the station's security force." + icon_state = "poster1_legit" + +/obj/structure/sign/poster/official/nanotrasen_logo + name = "Nanotrasen Logo" + desc = "A poster depicting the Nanotrasen logo." + icon_state = "poster2_legit" + +/obj/structure/sign/poster/official/cleanliness + name = "Cleanliness" + desc = "A poster warning of the dangers of poor hygiene." + icon_state = "poster3_legit" + +/obj/structure/sign/poster/official/help_others + name = "Help Others" + desc = "A poster encouraging you to help fellow crewmembers." + icon_state = "poster4_legit" + +/obj/structure/sign/poster/official/build + name = "Build" + desc = "A poster glorifying the engineering team." + icon_state = "poster5_legit" + +/obj/structure/sign/poster/official/bless_this_spess + name = "Bless This Spess" + desc = "A poster blessing this area." + icon_state = "poster6_legit" + +/obj/structure/sign/poster/official/science + name = "Science" + desc = "A poster depicting an atom." + icon_state = "poster7_legit" + +/obj/structure/sign/poster/official/ian + name = "Ian" + desc = "Arf arf. Yap." + icon_state = "poster8_legit" + +/obj/structure/sign/poster/official/obey + name = "Obey" + desc = "A poster instructing the viewer to obey authority." + icon_state = "poster9_legit" + +/obj/structure/sign/poster/official/walk + name = "Walk" + desc = "A poster instructing the viewer to walk instead of running." + icon_state = "poster10_legit" + +/obj/structure/sign/poster/official/state_laws + name = "State Laws" + desc = "A poster instructing cyborgs to state their laws." + icon_state = "poster11_legit" + +/obj/structure/sign/poster/official/love_ian + name = "Love Ian" + desc = "Ian is love, Ian is life." + icon_state = "poster12_legit" + +/obj/structure/sign/poster/official/space_cops + name = "Space Cops." + desc = "A poster advertising the television show Space Cops." + icon_state = "poster13_legit" + +/obj/structure/sign/poster/official/ue_no + name = "Ue No." + desc = "This thing is all in Japanese." + icon_state = "poster14_legit" + +/obj/structure/sign/poster/official/get_your_legs + name = "Get Your LEGS" + desc = "LEGS: Leadership, Experience, Genius, Subordination." + icon_state = "poster15_legit" + +/obj/structure/sign/poster/official/do_not_question + name = "Do Not Question" + desc = "A poster instructing the viewer not to ask about things they aren't meant to know." + icon_state = "poster16_legit" + +/obj/structure/sign/poster/official/work_for_a_future + name = "Work For A Future" + desc = " A poster encouraging you to work for your future." + icon_state = "poster17_legit" + +/obj/structure/sign/poster/official/soft_cap_pop_art + name = "Soft Cap Pop Art" + desc = "A poster reprint of some cheap pop art." + icon_state = "poster18_legit" + +/obj/structure/sign/poster/official/safety_internals + name = "Safety: Internals" + desc = "A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic." + icon_state = "poster19_legit" + +/obj/structure/sign/poster/official/safety_eye_protection + name = "Safety: Eye Protection" + desc = "A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights." + icon_state = "poster20_legit" + +/obj/structure/sign/poster/official/safety_report + name = "Safety: Report" + desc = "A poster instructing the viewer to report suspicious activity to the security force." + icon_state = "poster21_legit" + +/obj/structure/sign/poster/official/report_crimes + name = "Report Crimes" + desc = "A poster encouraging the swift reporting of crime or seditious behavior to station security." + icon_state = "poster22_legit" + +/obj/structure/sign/poster/official/ion_rifle + name = "Ion Rifle" + desc = "A poster displaying an Ion Rifle." + icon_state = "poster23_legit" + +/obj/structure/sign/poster/official/foam_force_ad + name = "Foam Force Ad" + desc = "Foam Force, it's Foam or be Foamed!" + icon_state = "poster24_legit" + +/obj/structure/sign/poster/official/cohiba_robusto_ad + name = "Cohiba Robusto Ad" + desc = "Cohiba Robusto, the classy cigar." + icon_state = "poster25_legit" + +/obj/structure/sign/poster/official/anniversary_vintage_reprint + name = "50th Anniversary Vintage Reprint" + desc = "A reprint of a poster from 2505, commemorating the 50th Aniversery of Nanoposters Manufacturing, a subsidary of Nanotrasen." + icon_state = "poster26_legit" + +/obj/structure/sign/poster/official/fruit_bowl + name = "Fruit Bowl" + desc = " Simple, yet awe-inspiring." + icon_state = "poster27_legit" + +/obj/structure/sign/poster/official/pda_ad + name = "PDA Ad" + desc = "A poster advertising the latest PDA from Nanotrasen suppliers." + icon_state = "poster28_legit" + +/obj/structure/sign/poster/official/enlist + name = "Enlist" // but I thought deathsquad was never acknowledged + desc = "Enlist in the Nanotrasen Deathsquadron reserves today!" + icon_state = "poster29_legit" + +/obj/structure/sign/poster/official/nanomichi_ad + name = "Nanomichi Ad" + desc = " A poster advertising Nanomichi brand audio cassettes." + icon_state = "poster30_legit" + +/obj/structure/sign/poster/official/twelve_gauge + name = "12 Gauge" + desc = "A poster boasting about the superiority of 12 gauge shotgun shells." + icon_state = "poster31_legit" + +/obj/structure/sign/poster/official/high_class_martini + name = "High-Class Martini" + desc = "I told you to shake it, no stirring." + icon_state = "poster32_legit" + +/obj/structure/sign/poster/official/the_owl + name = "The Owl" + desc = "The Owl would do his best to protect the station. Will you?" + icon_state = "poster33_legit" + +/obj/structure/sign/poster/official/no_erp + name = "No ERP" + desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations." + icon_state = "poster34_legit" + +/obj/structure/sign/poster/official/wtf_is_co2 + name = "Carbon Dioxide" + desc = "This informational poster teaches the viewer what carbon dioxide is." + icon_state = "poster35_legit" + +#undef PLACE_SPEED diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 73a69eb7f0..520158dfb0 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -20,7 +20,7 @@ /obj/effect/countdown/examine(mob/user) . = ..() - user << "This countdown is displaying: [displayed_text]" + to_chat(user, "This countdown is displaying: [displayed_text]") /obj/effect/countdown/proc/attach(atom/A) attached_to = A diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 5fe401e7ba..b8ea00bbb0 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -170,7 +170,7 @@ var/obj/item/clothing/shoes/S = shoe . += "some [initial(S.name)] \icon[S]\n" - user << . + to_chat(user, .) /obj/effect/decal/cleanable/blood/footprints/replace_decal(obj/effect/decal/cleanable/C) if(blood_state != C.blood_state) //We only replace footprints of the same type as us diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 6eacaf7289..1fef05d7fc 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -40,9 +40,13 @@ /obj/effect/decal/cleanable/greenglow name = "glowing goo" desc = "Jeez. I hope that's not for lunch." - luminosity = 1 + light_color = LIGHT_COLOR_GREEN icon_state = "greenglow" +/obj/effect/decal/cleanable/greenglow/Initialize(mapload) + ..() + set_light(1) + /obj/effect/decal/cleanable/greenglow/ex_act() return @@ -156,3 +160,21 @@ icon = 'icons/effects/tomatodecal.dmi' icon_state = "salt_pile" gender = NEUTER + +/obj/effect/decal/cleanable/glitter + name = "generic glitter pile" + desc = "the herpes of arts and crafts" + icon = 'icons/effects/tile_effects.dmi' + gender = NEUTER + +/obj/effect/decal/cleanable/glitter/pink + name = "pink glitter" + icon_state = "plasma" + +/obj/effect/decal/cleanable/glitter/white + name = "white glitter" + icon_state = "nitrous_oxide" + +/obj/effect/decal/cleanable/glitter/blue + name = "blue glitter" + icon_state = "freon" diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 8c3bab3aac..6364658984 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -27,12 +27,12 @@ if(src.reagents && W.reagents) . = 1 //so the containers don't splash their content on the src while scooping. if(!src.reagents.total_volume) - user << "[src] isn't thick enough to scoop up!" + to_chat(user, "[src] isn't thick enough 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 up [src] into [W]!" + to_chat(user, "You scoop up [src] into [W]!") reagents.trans_to(W, reagents.total_volume) if(!reagents.total_volume) //scooped up all of it qdel(src) @@ -45,7 +45,7 @@ var/added_heat = (hotness / 100) src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness) src.reagents.handle_reactions() - user << "You heat [src] with [W]!" + to_chat(user, "You heat [src] with [W]!") else return ..() diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index f2a3d61d19..9ca086fad2 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -220,7 +220,7 @@ /obj/structure/foamedmetal/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - user << "You hit the metal foam but bounce off it!" + to_chat(user, "You hit the metal foam but bounce off it!") playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5) diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 503f120dd4..3ac1e56520 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -130,7 +130,7 @@ for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - M << "The explosion knocks you down." + to_chat(M, "The explosion knocks you down.") M.Weaken(rand(1,5)) return else diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 0ec7e137bb..3f89015360 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -27,7 +27,7 @@ for(var/i = 0, i < frames, i++) alpha -= step if(alpha < 160) - opacity = 0 //if we were blocking view, we aren't now because we're fading out + set_opacity(0) //if we were blocking view, we aren't now because we're fading out stoplag() /obj/effect/particle_effect/smoke/New() @@ -88,7 +88,7 @@ S.lifetime = lifetime if(S.amount>0) if(opaque) - S.opacity = 1 + S.set_opacity(TRUE) newsmokes.Add(S) if(newsmokes.len) diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index f6f07d16b3..054416efc2 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -9,7 +9,7 @@ name = "sparks" icon_state = "sparks" anchored = 1 - luminosity = 1 + light_range = 1 /obj/effect/particle_effect/sparks/New() ..() diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 7ca0ee3887..80255d3e6c 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -15,27 +15,54 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list( layer = ABOVE_NORMAL_TURF_LAYER obj_integrity = 30 max_integrity = 30 - var/potency = 30 var/delay = 1200 var/floor = 0 - var/yield = 3 var/generation = 1 var/spreadIntoAdjacentChance = 60 + var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom /obj/structure/glowshroom/glowcap name = "glowcap" + desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent." icon_state = "glowcap" + myseed = /obj/item/seeds/glowshroom/glowcap -/obj/structure/glowshroom/single - yield = 0 +/obj/structure/glowshroom/shadowshroom + name = "shadowshroom" + desc = "Mycena Umbra, a species of mushroom that emits shadow instead of light." + icon_state = "shadowshroom" + myseed = /obj/item/seeds/glowshroom/shadowshroom + +/obj/structure/glowshroom/single/Spread() + return /obj/structure/glowshroom/examine(mob/user) . = ..() - user << "This is a [generation]\th generation [name]!" + to_chat(user, "This is a [generation]\th generation [name]!") -/obj/structure/glowshroom/New() +/obj/structure/glowshroom/Destroy() + if(myseed) + QDEL_NULL(myseed) + return ..() + +/obj/structure/glowshroom/New(loc, obj/item/seeds/newseed, mutate_stats) ..() - SetLuminosity(round(potency/10)) + if(newseed) + myseed = newseed.Copy() + myseed.forceMove(src) + else + myseed = new myseed(src) + if(mutate_stats) //baby mushrooms have different stats :3 + myseed.adjust_potency(rand(-3,6)) + myseed.adjust_yield(rand(-1,2)) + myseed.adjust_production(rand(-3,6)) + myseed.adjust_endurance(rand(-3,6)) + delay = delay - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I + obj_integrity = myseed.endurance + max_integrity = myseed.endurance + if(myseed.get_gene(/datum/plant_gene/trait/glow)) + var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) + set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color) setDir(CalcDir()) var/base_icon_state = initial(icon_state) if(!floor) @@ -55,7 +82,9 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list( addtimer(CALLBACK(src, .proc/Spread), delay) /obj/structure/glowshroom/proc/Spread() - for(var/i = 1 to yield) + var/turf/ownturf = get_turf(src) + var/shrooms_planted = 0 + for(var/i in 1 to myseed.yield) if(prob(1/(generation * generation) * 100))//This formula gives you diminishing returns based on generation. 100% with 1st gen, decreasing to 25%, 11%, 6, 4, 2... var/list/possibleLocs = list() var/spreadsIntoAdjacent = FALSE @@ -66,6 +95,8 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list( for(var/turf/open/floor/earth in view(3,src)) if(is_type_in_typecache(earth, blacklisted_glowshroom_turfs)) continue + if(!ownturf.CanAtmosPass(earth)) + continue if(spreadsIntoAdjacent || !locate(/obj/structure/glowshroom) in view(1,earth)) possibleLocs += earth CHECK_TICK @@ -86,16 +117,16 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list( if(shroomCount >= placeCount) continue - var/obj/structure/glowshroom/child = new type(newLoc)//The baby mushrooms have different stats :3 - child.potency = max(potency + rand(-3,6), 0) - child.yield = max(yield + rand(-1,2), 0) - child.delay = max(delay + rand(-30,60), 0) - var/newhealth = max(obj_integrity + rand(-3,6), 1) - child.obj_integrity = newhealth - child.max_integrity = newhealth + var/obj/structure/glowshroom/child = new type(newLoc, myseed, TRUE) child.generation = generation + 1 + shrooms_planted++ CHECK_TICK + else + shrooms_planted++ //if we failed due to generation, don't try to plant one later + if(shrooms_planted < myseed.yield) //if we didn't get all possible shrooms planted, try again later + myseed.yield -= shrooms_planted + addtimer(CALLBACK(src, .proc/Spread), delay) /obj/structure/glowshroom/proc/CalcDir(turf/location = loc) var/direction = 16 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index d69e8e2ac0..a8fc5a4ba1 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -76,7 +76,8 @@ /obj/effect/landmark/start/New() start_landmarks_list += src ..() - tag = "start*[name]" + if(name != initial(name)) + tag = "start*[name]" return 1 /obj/effect/landmark/start/Destroy() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 1f89258eb6..46c2306a79 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -8,7 +8,7 @@ var/triggered = 0 /obj/effect/mine/proc/mineEffect(mob/victim) - victim << "*click*" + to_chat(victim, "*click*") /obj/effect/mine/Crossed(AM as mob|obj) if(isturf(loc)) @@ -55,7 +55,7 @@ /obj/effect/mine/kickmine/mineEffect(mob/victim) if(isliving(victim) && victim.client) - victim << "You have been kicked FOR NO REISIN!" + to_chat(victim, "You have been kicked FOR NO REISIN!") qdel(victim.client) @@ -120,7 +120,7 @@ /obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - victim << "RIP AND TEAR" + to_chat(victim, "RIP AND TEAR") victim << 'sound/misc/e1m1.ogg' var/old_color = victim.client.color var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) @@ -142,7 +142,7 @@ sleep(10) animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT) sleep(duration) - victim << "Your bloodlust seeps back into the bog of your subconscious and you regain self control." + to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") qdel(chainsaw) qdel(src) @@ -154,7 +154,7 @@ /obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - victim << "You feel great!" + to_chat(victim, "You feel great!") victim.revive(full_heal = 1, admin_revive = 1) /obj/effect/mine/pickup/speed @@ -166,8 +166,8 @@ /obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - victim << "You feel fast!" + to_chat(victim, "You feel fast!") victim.status_flags |= GOTTAGOREALLYFAST sleep(duration) victim.status_flags &= ~GOTTAGOREALLYFAST - victim << "You slow down." \ No newline at end of file + to_chat(victim, "You slow down.") diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index d14c7abc32..ad84d203d2 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -22,4 +22,12 @@ name = "mobl" var/master = null - var/list/container = list( ) \ No newline at end of file + var/list/container = list( ) + +//Makes a tile fully lit no matter what +/obj/effect/fullbright + icon = 'icons/effects/alphacolors.dmi' + icon_state = "white" + plane = LIGHTING_PLANE + layer = LIGHTING_LAYER + blend_mode = BLEND_ADD \ No newline at end of file diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 51fb47d0c3..42c9f6f17f 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -325,7 +325,7 @@ damage *= multiplier duration = max(round(damage * 0.2), 1) ..() - SetLuminosity(3, 2) + set_light(1.5, 2, LIGHT_COLOR_ORANGE) /obj/effect/overlay/temp/ratvar/volt_hit/true/New(loc, caster, multiplier) ..() @@ -357,7 +357,7 @@ if(M.occupant) if(is_servant_of_ratvar(M.occupant)) continue - M.occupant << "Your [M.name] is struck by a [name]!" + to_chat(M.occupant, "Your [M.name] is struck by a [name]!") M.visible_message("[M] is struck by a [name]!") M.take_damage(damage, BURN, 0, 0) hit_amount++ @@ -424,10 +424,13 @@ color = "#FAE48C" layer = ABOVE_MOB_LAYER duration = 70 - luminosity = 6 + light_range = 5 + light_power = 2 + light_color = "#FAE48C" /obj/effect/overlay/temp/ratvar/sigil/transgression/New() ..() + update_light() var/oldtransform = transform animate(src, transform = matrix()*2, time = 5) animate(transform = oldtransform, alpha = 0, time = 65) @@ -436,6 +439,13 @@ color = "#1E8CE1" icon_state = "sigilactivepulse" layer = ABOVE_MOB_LAYER + light_range = 1.4 + light_power = 0.5 + light_color = "#1E8CE1" + +/obj/effect/overlay/temp/ratvar/sigil/vitality/New() + ..() + update_light() /obj/effect/overlay/temp/ratvar/sigil/accession color = "#AF0AAF" diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 821e915041..47ef4ad5a5 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -36,8 +36,7 @@ qdel(src) return if(lifespan > 0) - spawn(lifespan) - qdel(src) + QDEL_IN(src, lifespan) /obj/effect/portal/Destroy() portals -= src diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 07efdc1094..8576307378 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -10,7 +10,7 @@ ..() if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - world << "Gib list length mismatch!" + to_chat(world, "Gib list length mismatch!") return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index cc9a3e9d17..e4f154899c 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -97,6 +97,7 @@ /obj/item/device/assembly/timer = 3, /obj/item/device/flashlight = 4, /obj/item/device/flashlight/pen = 1, + /obj/item/device/flashlight/glowstick/random = 4, /obj/item/device/multitool = 2, /obj/item/device/radio/off = 2, /obj/item/device/t_scanner = 5, @@ -116,8 +117,8 @@ /obj/item/clothing/head/cone = 1, /obj/item/weapon/coin/silver = 1, /obj/item/weapon/coin/twoheaded = 1, - /obj/item/weapon/poster/contraband = 1, - /obj/item/weapon/poster/legit = 1, + /obj/item/weapon/poster/random_contraband = 1, + /obj/item/weapon/poster/random_official = 1, /obj/item/weapon/crowbar = 1, /obj/item/weapon/crowbar/red = 1, /obj/item/weapon/extinguisher = 11, @@ -158,6 +159,7 @@ /obj/item/clothing/shoes/laceup = 1, /obj/item/weapon/storage/secure/briefcase = 3, /obj/item/weapon/storage/toolbox/artistic = 2, + /obj/item/toy/eightball = 1, "" = 3 ) @@ -186,3 +188,9 @@ /obj/item/organ/body_egg/alien_embryo = 1, /obj/item/organ/hivelord_core = 2) lootcount = 3 + +/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner + name = "2% chance xeno egg spawner" + loot = list( + /obj/effect/decal/remains/xeno = 49, + /obj/effect/spawner/xeno_egg_delivery = 1) diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm new file mode 100644 index 0000000000..639df98214 --- /dev/null +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -0,0 +1,20 @@ +/obj/effect/spawner/xeno_egg_delivery + name = "xeno egg delivery" + icon = 'icons/mob/alien.dmi' + icon_state = "egg_growing" + var/announcement_time = 1200 + +/obj/effect/spawner/xeno_egg_delivery/Initialize(mapload) + ..() + var/turf/T = get_turf(src) + var/area/A = get_area(T) + + new /obj/structure/alien/egg(T) + new /obj/effect/overlay/temp/gravpush(T) + playsound(T, 'sound/items/party_horn.ogg', 50, 1, -1) + + message_admins("An alien egg has been delivered to [A] at [ADMIN_COORDJMP(T)].") + log_game("An alien egg has been delivered to [A] at [COORD(T)]") + var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen." + addtimer(CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time) + qdel(src) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 45d8c24098..c62260080d 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -41,7 +41,7 @@ return 1 else if(isliving(mover)) 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) @@ -198,7 +198,7 @@ var/breakout_time = 1 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)" + to_chat(user, "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)") visible_message("You see something struggling and writhing in \the [src]!") if(do_after(user,(breakout_time*60*10), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 9c27023109..63b5075cc7 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -29,7 +29,7 @@ /obj/effect/step_trigger/message/Trigger(mob/M) if(M.client) - M << "[message]" + to_chat(M, "[message]") if(once) qdel(src) diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 27040ab811..6d4f309aeb 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -1,14 +1,11 @@ -/obj/item/weapon/poster/legit/wanted - var/poster_desc +/obj/item/weapon/poster/wanted icon_state = "rolled_poster" -/obj/item/weapon/poster/legit/wanted/New(turf/loc, icon/person_icon, wanted_name, description) - ..(loc) +/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description) + var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description) + ..(loc, wanted_poster) name = "wanted poster ([wanted_name])" desc = "A wanted poster for [wanted_name]." - poster_desc = description - qdel(resulting_poster) - resulting_poster = new /obj/structure/sign/poster/wanted(person_icon, wanted_name, poster_desc) /obj/structure/sign/poster/wanted var/wanted_name @@ -35,14 +32,8 @@ the_icon.Insert(icon('icons/obj/contraband.dmi', "poster_ripped"), "poster_ripped") icon = the_icon -/obj/structure/sign/poster/wanted/attack_hand(mob/user) - ..() - -/obj/structure/sign/poster/wanted/attackby() - ..() - /obj/structure/sign/poster/wanted/roll_and_drop(turf/location) - var/obj/item/weapon/poster/legit/wanted/P = new(src, null, wanted_name, desc) - P.resulting_poster = src - P.loc = location - loc = P + var/obj/item/weapon/poster/P = ..(location) + P.name = "wanted poster ([wanted_name])" + P.desc = "A wanted poster for [wanted_name]." + return P diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f04f45009c..76206ff1fb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -90,6 +90,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s var/block_chance = 0 var/hit_reaction_chance = 0 //If you want to have something unrelated to blocking/armour piercing etc. Maybe not needed, but trying to think ahead/allow more freedom + var/reach = 1 //In tiles, how far this weapon can reach; 1 for adjacent, which is default //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. var/list/slot_equipment_priority = null // for default list, see /mob/proc/equip_to_appropriate_slot() @@ -98,7 +99,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s // non-clothing items var/datum/dog_fashion/dog_fashion = null -/obj/item/New() +/obj/item/Initialize() if (!materials) materials = list() ..() @@ -160,7 +161,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s else pronoun = "It is" var/size = weightclass2text(src.w_class) - user << "[pronoun] a [size] item." //e.g. They are a small item. or It is a bulky item. + to_chat(user, "[pronoun] a [size] item." ) if(user.research_scanner) //Mob has a research scanner active. var/msg = "*--------*
" @@ -181,7 +182,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s else msg += "No extractable materials detected.
" msg += "*--------*" - user << msg + to_chat(user, msg) /obj/item/attack_self(mob/user) @@ -209,9 +210,9 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(istype(C)) if(C.gloves && (C.gloves.max_heat_protection_temperature > 360)) extinguish() - user << "You put out the fire on [src]." + to_chat(user, "You put out the fire on [src].") else - user << "You burn your hand on [src]!" + to_chat(user, "You burn your hand on [src]!") var/obj/item/bodypart/affecting = C.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage C.update_damage_overlays() @@ -223,7 +224,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s var/mob/living/carbon/C = user if(istype(C)) if(!C.gloves || (!(C.gloves.resistance_flags & (UNACIDABLE|ACID_PROOF)))) - user << "The acid on [src] burns your hand!" + to_chat(user, "The acid on [src] burns your hand!") var/obj/item/bodypart/affecting = C.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage C.update_damage_overlays() @@ -273,7 +274,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.dropItemToGround(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_paw(A) @@ -291,35 +292,32 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s // I have cleaned it up a little, but it could probably use more. -Sayu // The lack of ..() is intentional, do not add one /obj/item/attackby(obj/item/weapon/W, mob/user, params) - if(unique_rename && istype(W, /obj/item/weapon/pen)) - rewrite(user) - else - if(istype(W,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = W - if(S.use_to_pickup) - if(S.collection_mode) //Mode is set to collect multiple items on a tile and we clicked on a valid one. - if(isturf(loc)) - var/list/rejections = list() + if(istype(W,/obj/item/weapon/storage)) + var/obj/item/weapon/storage/S = W + if(S.use_to_pickup) + if(S.collection_mode) //Mode is set to collect multiple items on a tile and we clicked on a valid one. + if(isturf(loc)) + var/list/rejections = list() - var/list/things = loc.contents.Copy() - if (S.collection_mode == 2) - things = typecache_filter_list(things, typecacheof(type)) + var/list/things = loc.contents.Copy() + if (S.collection_mode == 2) + things = typecache_filter_list(things, typecacheof(type)) - var/len = things.len - if(!len) - user << "You failed to pick up anything with [S]." - return - var/datum/progressbar/progress = new(user, len, loc) + var/len = things.len + if(!len) + to_chat(user, "You failed to pick up anything with [S].") + return + var/datum/progressbar/progress = new(user, len, loc) - while (do_after(user, 10, TRUE, S, FALSE, CALLBACK(src, .proc/handle_mass_pickup, S, things, loc, rejections, progress))) - sleep(1) + while (do_after(user, 10, TRUE, S, FALSE, CALLBACK(src, .proc/handle_mass_pickup, S, things, loc, rejections, progress))) + sleep(1) - qdel(progress) + qdel(progress) - user << "You put everything you could [S.preposition] [S]." + to_chat(user, "You put everything you could [S.preposition] [S].") - else if(S.can_be_inserted(src)) - S.handle_item_insertion(src) + else if(S.can_be_inserted(src)) + S.handle_item_insertion(src) /obj/item/proc/handle_mass_pickup(obj/item/weapon/storage/S, list/things, atom/thing_loc, list/rejections, datum/progressbar/progress) for(var/obj/item/I in things) @@ -438,22 +436,22 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags_cover & 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(ismonkey(M)) var/mob/living/carbon/monkey/Mo = M if(Mo.wear_mask && Mo.wear_mask.flags_cover & MASKCOVERSEYES) // 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(isalien(M))//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(isbrain(M)) - user << "You cannot locate any organic eyes on this brain!" + to_chat(user, "You cannot locate any organic eyes on this brain!") return src.add_fingerprint(user) @@ -484,20 +482,20 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(M.eye_damage >= 10) M.adjust_blurriness(15) if(M.stat != DEAD) - M << "Your eyes start to bleed profusely!" + to_chat(M, "Your eyes start to bleed profusely!") if(!(M.disabilities & (NEARSIGHT | BLIND))) if(M.become_nearsighted()) - M << "You become nearsighted!" + to_chat(M, "You become nearsighted!") if(prob(50)) if(M.stat != DEAD) if(M.drop_item()) - 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.adjust_blurriness(10) M.Paralyse(1) M.Weaken(2) if (prob(M.eye_damage - 10 + 1)) if(M.become_blind()) - M << "You go blind!" + to_chat(M, "You go blind!") /obj/item/clean_blood() . = ..() diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 4865d75102..fb6c349f17 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -8,37 +8,37 @@ var/inverse = 0 // For inverse dir frames like light fixtures. -/obj/item/wallframe/proc/try_build(turf/on_wall) - if(get_dist(on_wall,usr)>1) +/obj/item/wallframe/proc/try_build(turf/on_wall, mob/user) + if(get_dist(on_wall,user)>1) return - var/ndir = get_dir(on_wall, usr) + var/ndir = get_dir(on_wall, user) if(!(ndir in cardinal)) return - var/turf/loc = get_turf(usr) - var/area/A = loc.loc - if(!isfloorturf(loc)) - usr << "You cannot place [src] on this spot!" + var/turf/T = get_turf(user) + var/area/A = get_area(T) + if(!isfloorturf(T)) + to_chat(user, "You cannot place [src] on this spot!") return - if(A.requires_power == 0 || istype(A, /area/space)) - usr << "You cannot place [src] in this area!" + if(A.always_unpowered) + to_chat(user, "You cannot place [src] in this area!") return - if(gotwallitem(loc, ndir, inverse*2)) - usr << "There's already an item on this wall!" + if(gotwallitem(T, ndir, inverse*2)) + to_chat(user, "There's already an item on this wall!") return - return 1 + return TRUE -/obj/item/wallframe/proc/attach(turf/on_wall) +/obj/item/wallframe/proc/attach(turf/on_wall, mob/user) if(result_path) playsound(src.loc, 'sound/machines/click.ogg', 75, 1) - usr.visible_message("[usr.name] attaches [src] to the wall.", + user.visible_message("[user.name] attaches [src] to the wall.", "You attach [src] to the wall.", "You hear clicking.") - var/ndir = get_dir(on_wall,usr) + var/ndir = get_dir(on_wall,user) if(inverse) ndir = turn(ndir, 180) - var/obj/O = new result_path(get_turf(usr), ndir, 1) + var/obj/O = new result_path(get_turf(user), ndir, 1) after_attach(O) qdel(src) @@ -58,7 +58,7 @@ var/glass_amt = round(materials[MAT_GLASS]/MINERAL_MATERIAL_AMOUNT) if(istype(W, /obj/item/weapon/wrench) && (metal_amt || glass_amt)) - user << "You dismantle [src]." + to_chat(user, "You dismantle [src].") if(metal_amt) new /obj/item/stack/sheet/metal(get_turf(src), metal_amt) if(glass_amt) @@ -77,24 +77,27 @@ inverse = 1 -/obj/item/wallframe/apc/try_build(turf/on_wall) +/obj/item/wallframe/apc/try_build(turf/on_wall, user) if(!..()) return - var/turf/loc = get_turf(usr) - var/area/A = loc.loc - if (A.get_apc()) - usr << "This area already has APC!" + var/turf/T = get_turf(user) + var/area/A = get_area(T) + if(A.get_apc()) + to_chat(user, "This area already has an APC!") return //only one APC per area - for(var/obj/machinery/power/terminal/T in loc) - if (T.master) - usr << "There is another network terminal here!" + if(!A.requires_power) + to_chat(user, "You cannot place [src] in this area!") + return //can't place apcs in areas with no power requirement + for(var/obj/machinery/power/terminal/E in T) + if(E.master) + to_chat(user, "There is another network terminal here!") return else - var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) + var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(T) C.amount = 10 - usr << "You cut the cables and disassemble the unused power terminal." - qdel(T) - return 1 + to_chat(user, "You cut the cables and disassemble the unused power terminal.") + qdel(E) + return TRUE /obj/item/weapon/electronics diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index f361f86431..f1e5b7f83b 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -127,7 +127,7 @@ showing = get_images(get_turf(user), viewing.view) viewing.images |= showing if(message) - user << message + to_chat(user, message) /obj/item/areaeditor/blueprints/proc/clear_viewer(mob/user, message = "") if(viewing) @@ -135,7 +135,7 @@ viewing = null showing.Cut() if(message) - user << message + to_chat(user, message) /obj/item/areaeditor/blueprints/dropped(mob/user) ..() @@ -191,13 +191,13 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - creator << "The new area must be completely airtight." + to_chat(creator, "The new area must be completely airtight.") return if(ROOM_ERR_TOOLARGE) - creator << "The new area is too large." + to_chat(creator, "The new area is too large.") return else - creator << "Error! Please notify administration." + to_chat(creator, "Error! Please notify administration.") return var/list/turfs = res @@ -205,7 +205,7 @@ if(!str || !length(str)) //cancel return if(length(str) > 50) - creator << "The given name is too long. The area remains undefined." + to_chat(creator, "The given name is too long. The area remains undefined.") return var/area/old = get_area(get_turf(creator)) var/old_gravity = old.has_gravity @@ -218,13 +218,20 @@ turfs -= turfs[key] turfs -= key if(A) - A.contents += turfs - A.SetDynamicLighting() + A.set_dynamic_lighting() + for (var/turf/T in turfs) + var/area/old_area = T.loc + A.contents += T + T.change_area(old_area, T) + else A = new A.setup(str) - A.contents += turfs - A.SetDynamicLighting() + A.set_dynamic_lighting() + for (var/turf/T in turfs) + var/area/old_area = T.loc + A.contents += T + T.change_area(old_area, T) A.has_gravity = old_gravity for(var/area/RA in old.related) @@ -233,7 +240,7 @@ var/obj/machinery/door/firedoor/FD = D FD.CalculateAffectingAreas() - creator << "You have created a new area, named [str]. It is now weather proof, and constructing an APC will allow it to be powered." + to_chat(creator, "You have created a new area, named [str]. It is now weather proof, and constructing an APC will allow it to be powered.") return 1 /obj/item/areaeditor/proc/edit_area() @@ -243,7 +250,7 @@ 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) for(var/area/RA in A.related) @@ -252,7 +259,7 @@ for(var/D in RA.firedoors) var/obj/machinery/door/firedoor/FD = D FD.CalculateAffectingAreas() - usr << "You rename the '[prevname]' to '[str]'." + to_chat(usr, "You rename the '[prevname]' to '[str]'.") interact() return 1 diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index e89a4df3a4..0ea39d72f1 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -8,7 +8,7 @@ /obj/item/organ/body_egg/on_find(mob/living/finder) ..() - finder << "You found an unknown alien organism in [owner]'s [zone]!" + to_chat(finder, "You found an unknown alien organism in [owner]'s [zone]!") /obj/item/organ/body_egg/New(loc) if(iscarbon(loc)) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index b3d8606460..c1ccf0d440 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -41,13 +41,13 @@ /obj/item/bodybag/bluespace/examine(mob/user) ..() if(contents.len) - user << "You can make out the shapes of [contents.len] objects through the fabric." + to_chat(user, "You can make out the shapes of [contents.len] objects through the fabric.") /obj/item/bodybag/bluespace/Destroy() for(var/atom/movable/A in contents) A.forceMove(get_turf(src)) if(isliving(A)) - A << "You suddenly feel the space around you torn apart! You're free!" + to_chat(A, "You suddenly feel the space around you torn apart! You're free!") return ..() /obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location) @@ -55,21 +55,21 @@ for(var/atom/movable/A in contents) A.forceMove(R) if(isliving(A)) - A << "You suddenly feel air around you! You're free!" + to_chat(A, "You suddenly feel air around you! You're free!") R.open(user) R.add_fingerprint(user) qdel(src) /obj/item/bodybag/bluespace/container_resist(mob/living/user) if(user.incapacitated()) - user << "You can't get out while you're restrained like this!" + to_chat(user, "You can't get out while you're restrained like this!") return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You claw at the fabric of [src], trying to tear it open..." - loc << "Someone starts trying to break free of [src]!" + to_chat(user, "You claw at the fabric of [src], trying to tear it open...") + to_chat(loc, "Someone starts trying to break free of [src]!") if(!do_after(user, 200, target = src)) - loc << "The pressure subsides. It seems that they've stopped resisting..." + to_chat(loc, "The pressure subsides. It seems that they've stopped resisting...") return loc.visible_message("[user] suddenly appears in front of [loc]!", "[user] breaks free of [src]!") qdel(src) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 60cf5b2a67..553b9380eb 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -7,6 +7,7 @@ icon_state = "candle1" item_state = "candle1" w_class = WEIGHT_CLASS_TINY + light_color = LIGHT_COLOR_FIRE var/wax = 200 var/lit = FALSE var/infinite = FALSE @@ -46,7 +47,7 @@ //src.damtype = "fire" if(show_message) usr.visible_message(show_message) - SetLuminosity(CANDLE_LUMINOSITY) + set_light(CANDLE_LUMINOSITY) START_PROCESSING(SSobj, src) update_icon() @@ -68,22 +69,7 @@ "[user] snuffs [src].") lit = FALSE update_icon() - SetLuminosity(0) - user.AddLuminosity(-CANDLE_LUMINOSITY) - - -/obj/item/candle/pickup(mob/user) - ..() - if(lit) - SetLuminosity(0) - user.AddLuminosity(CANDLE_LUMINOSITY) - - -/obj/item/candle/dropped(mob/user) - ..() - if(lit) - user.AddLuminosity(-CANDLE_LUMINOSITY) - SetLuminosity(CANDLE_LUMINOSITY) + set_light(0) /obj/item/candle/is_hot() return lit * heat diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 63234d060e..b7e5e9edf8 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -37,7 +37,7 @@ /obj/item/cardboard_cutout/attack_self(mob/living/user) if(!pushed_over) return - user << "You right [src]." + to_chat(user, "You right [src].") desc = initial(desc) icon = initial(icon) icon_state = initial(icon_state) //This resets a cutout to its blank state - this is intentional to allow for resetting @@ -76,12 +76,12 @@ if(!crayon || !user) return if(pushed_over) - user << "Right [src] first!" + to_chat(user, "Right [src] first!") return if(crayon.check_empty(user)) return if(crayon.is_capped) - user << "Take the cap off first!" + to_chat(user, "Take the cap off first!") return var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances if(!new_appearance || !crayon || !user.canUseTopic(src)) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 2b3bec4f04..24d3f65d6d 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -33,15 +33,13 @@ /obj/item/station_charter/attack_self(mob/living/user) if(used) - user << "This charter has already been used to name the station." + to_chat(user, "This charter has already been used to name the station.") return if(!ignores_timeout && (world.time-round_start_time > STATION_RENAME_TIME_LIMIT)) //5 minutes - user << "The crew has already settled into the shift. \ - It probably wouldn't be good to rename the station right now." + to_chat(user, "The crew has already settled into the shift. It probably wouldn't be good to rename the station right now.") return if(response_timer_id) - user << "You're still waiting for approval from your employers about \ - your proposed name change, it'd be best to wait for now." + to_chat(user, "You're still waiting for approval from your employers about your proposed name change, it'd be best to wait for now.") return var/new_name = stripped_input(user, message="What do you want to name \ @@ -55,14 +53,14 @@ [new_name]") if(standard_station_regex.Find(new_name)) - user << "Your name has been automatically approved." + to_chat(user, "Your name has been automatically approved.") rename_station(new_name, user) return - user << "Your name has been sent to your employers for approval." + to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - admins << "CUSTOM STATION RENAME:[key_name_admin(user)] (?) proposes to rename the station to [new_name] (will autoapprove in [approval_time / 10] seconds). (BSA) (REJECT) (RPLY)" + to_chat(admins, "CUSTOM STATION RENAME:[key_name_admin(user)] (?) proposes to rename the station to [new_name] (will autoapprove in [approval_time / 10] seconds). (BSA) (REJECT) (RPLY)") /obj/item/station_charter/proc/reject_proposed(user) if(!user) @@ -81,11 +79,7 @@ response_timer_id = null /obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey) - if(config && config.server_name) - world.name = "[config.server_name]: [designation]" - else - world.name = designation - station_name = designation + change_station_name(designation) minor_announce("[ureal_name] has designated your station as [station_name()]", "Captain's Charter", 0) log_game("[ukey] has renamed the station as [station_name()].") @@ -96,4 +90,8 @@ if(!unlimited_uses) used = TRUE -#undef STATION_RENAME_TIME_LIMIT \ No newline at end of file +/obj/item/station_charter/admin + unlimited_uses = TRUE + ignores_timeout = TRUE + +#undef STATION_RENAME_TIME_LIMIT diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 1e12b4de9f..6d13c6a848 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -26,16 +26,16 @@ mode = WAND_EMERGENCY if(WAND_EMERGENCY) mode = WAND_OPEN - user << "Now in mode: [mode]." + to_chat(user, "Now in mode: [mode].") /obj/item/weapon/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user) if(!istype(D)) return if(!(D.hasPower())) - user << "[D] has no power!" + to_chat(user, "[D] has no power!") return if(!D.requiresID()) - user << "[D]'s ID scan is disabled!" + to_chat(user, "[D]'s ID scan is disabled!") return if(D.check_access(ID) && D.canAIControl(user)) switch(mode) @@ -56,7 +56,7 @@ D.emergency = 1 D.update_icon() else - user << "[src] does not have access to this door." + to_chat(user, "[src] does not have access to this door.") /obj/item/weapon/door_remote/omni name = "omni door remote" diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ab24a5bf8a..96464e0435 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -132,7 +132,7 @@ if(charges == -1) . = FALSE else if(!charges_left) - user << "There is no more of \the [src.name] left!" + to_chat(user, "There is no more of \the [src.name] left!") if(self_contained) qdel(src) . = TRUE @@ -149,7 +149,7 @@ /obj/item/toy/crayon/spraycan/AltClick(mob/user) if(has_cap) is_capped = !is_capped - user << "The cap on [src] is now [is_capped ? "on" : "off"]." + to_chat(user, "The cap on [src] is now [is_capped ? "on" : "off"].") update_icon() /obj/item/toy/crayon/ui_data() @@ -299,7 +299,7 @@ graf_rot = 0 if(!instant) - user << "You start drawing a [temp] on the [target.name]..." + to_chat(user, "You start drawing a [temp] on the [target.name]...") if(pre_noise) audible_message("You hear spraying.") @@ -344,13 +344,13 @@ affected_turfs += right affected_turfs += target else - user << "There isn't enough space to paint!" + to_chat(user, "There isn't enough space to paint!") return if(!instant) - user << "You finish drawing \the [temp]." + to_chat(user, "You finish drawing \the [temp].") else - user << "You spray a [temp] on \the [target.name]" + to_chat(user, "You spray a [temp] on \the [target.name]") if(length(text_buffer)) text_buffer = copytext(text_buffer,2) @@ -373,7 +373,7 @@ /obj/item/toy/crayon/attack(mob/M, mob/user) if(edible && (M == user)) - user << "You take a bite of the [src.name]. Delicious!" + to_chat(user, "You take a bite of the [src.name]. Delicious!") var/eaten = use_charges(5) if(check_empty(user)) //Prevents divsion by zero return @@ -389,7 +389,7 @@ // Reject space, player-created areas, and non-station z-levels. var/area/A = get_area(target) if(!A || (A.z != ZLEVEL_STATION) || !A.valid_territory) - user << "[A] is unsuitable for tagging." + to_chat(user, "[A] is unsuitable for tagging.") return FALSE var/spraying_over = FALSE @@ -397,14 +397,12 @@ spraying_over = TRUE for(var/obj/machinery/power/apc in target) - user << "You can't tag an APC." + to_chat(user, "You can't tag an APC.") return FALSE var/occupying_gang = territory_claimed(A, user) if(occupying_gang && !spraying_over) - user << "[A] has already been tagged \ - by the [occupying_gang] gang! You must get rid of or spray over \ - the old tag first!" + to_chat(user, "[A] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!") return FALSE // If you pass the gaunlet of checks, you're good to proceed @@ -425,7 +423,7 @@ var/area/territory = get_area(target) new /obj/effect/decal/cleanable/crayon/gang(target,gangID,"graffiti",0) - user << "You tagged [territory] for your gang!" + to_chat(user, "You tagged [territory] for your gang!") /obj/item/toy/crayon/red icon_state = "crayonred" @@ -530,13 +528,13 @@ var/obj/item/toy/crayon/C = W switch(C.item_color) 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 if(istype(W, /obj/item/toy/crayon/spraycan)) - user << "Spraycans are not crayons." + to_chat(user, "Spraycans are not crayons.") return return ..() @@ -605,16 +603,16 @@ /obj/item/toy/crayon/spraycan/examine(mob/user) . = ..() if(charges_left) - user << "It has [charges_left] uses left." + to_chat(user, "It has [charges_left] uses left.") else - user << "It is empty." + to_chat(user, "It is empty.") /obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(is_capped) - user << "Take the cap off first!" + to_chat(user, "Take the cap off first!") return if(check_empty(user)) @@ -626,7 +624,7 @@ var/mob/living/carbon/C = target user.visible_message("[user] sprays [src] into the face of [target]!") - target << "[user] sprays [src] into your face!" + to_chat(target, "[user] sprays [src] into your face!") if(C.client) C.blur_eyes(3) @@ -651,9 +649,9 @@ if(actually_paints) target.add_atom_colour(paint_color, WASHABLE_COLOUR_PRIORITY) if(color_hex2num(paint_color) < 255) - target.SetOpacity(255) + target.set_opacity(255) else - target.SetOpacity(initial(target.opacity)) + target.set_opacity(initial(target.opacity)) . = use_charges(2) var/fraction = min(1, . / reagents.maximum_volume) reagents.reaction(target, TOUCH, fraction * volume_multiplier) @@ -691,7 +689,7 @@ /obj/item/toy/crayon/spraycan/gang/examine(mob/user) . = ..() if((user.mind && user.mind.gang_datum) || isobserver(user)) - user << "This spraycan has been specially modified for tagging territory." + to_chat(user, "This spraycan has been specially modified for tagging territory.") /obj/item/toy/crayon/spraycan/borg name = "cyborg spraycan" @@ -701,7 +699,7 @@ /obj/item/toy/crayon/spraycan/borg/afterattack(atom/target,mob/user,proximity) var/diff = ..() if(!iscyborg(user)) - user << "How did you get this?" + to_chat(user, "How did you get this?") qdel(src) return FALSE diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 0aa6077ad9..9432a434f0 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -13,19 +13,10 @@ /obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user) src.add_fingerprint(user) //Anyone can add their fingerprints to it with this if(!owned) - user << "You pet [src]. You swear it looks up at you." + to_chat(user, "You pet [src]. You swear it looks up at you.") owner = user owned = 1 - return ..() - - -/obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity) - if(!proximity) return - if(istype(O,/obj/structure/sink)) - user.drop_item() - loc = get_turf(O) - return Swell() - ..() + else return ..() /obj/item/toy/carpplushie/dehy_carp/proc/Swell() desc = "It's growing!" diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 3682fbb39e..0c0e7bff50 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -57,26 +57,11 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above. var/overlays_x_offset = 0 //x offset to use for certain overlays -/obj/item/device/pda/pickup(mob/user) - ..() - if(fon) - SetLuminosity(0) - user.AddLuminosity(f_lum) - -/obj/item/device/pda/dropped(mob/user) - ..() - if(fon) - user.AddLuminosity(-f_lum) - SetLuminosity(f_lum) - /obj/item/device/pda/New() ..() if(fon) - if(!isturf(loc)) - loc.AddLuminosity(f_lum) - SetLuminosity(0) - else - SetLuminosity(f_lum) + set_light(f_lum) + PDAs += src if(default_cartridge) cartridge = new default_cartridge(src) @@ -344,7 +329,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if("Eject")//Ejects the cart, only done from hub. if (!isnull(cartridge)) U.put_in_hands(cartridge) - U << "You remove [cartridge] from [src]." + to_chat(U, "You remove [cartridge] from [src].") scanmode = 0 if (cartridge.radio) cartridge.radio.hostpda = null @@ -372,16 +357,10 @@ var/global/list/obj/item/device/pda/PDAs = list() if("Light") if(fon) fon = 0 - if(src in U.contents) - U.AddLuminosity(-f_lum) - else - SetLuminosity(0) + set_light(0) else fon = 1 - if(src in U.contents) - U.AddLuminosity(f_lum) - else - SetLuminosity(f_lum) + set_light(2.3) update_icon() if("Medical Scan") if(scanmode == 1) @@ -417,7 +396,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(A && alert_s) var/msg = "NON-DRONE PING: [U.name]: [alert_s] priority alert in [A.name]!" _alert_drones(msg, TRUE) - U << msg + to_chat(U, msg) //NOTEKEEPER FUNCTIONS=================================== @@ -447,7 +426,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(t) if(hidden_uplink && (trim(lowertext(t)) == trim(lowertext(lock_code)))) hidden_uplink.interact(U) - U << "The PDA softly beeps." + to_chat(U, "The PDA softly beeps.") U << browse(null, "window=pda") src.mode = 0 else @@ -472,7 +451,7 @@ var/global/list/obj/item/device/pda/PDAs = list() U.show_message("Virus sent!", 1) P.honkamt = (rand(15,20)) else - U << "PDA not found." + to_chat(U, "PDA not found.") else U << browse(null, "window=pda") return @@ -486,7 +465,7 @@ var/global/list/obj/item/device/pda/PDAs = list() P.silent = 1 P.ttone = "silence" else - U << "PDA not found." + to_chat(U, "PDA not found.") else U << browse(null, "window=pda") return @@ -528,7 +507,7 @@ var/global/list/obj/item/device/pda/PDAs = list() U.show_message("Success!", 1) P.explode() else - U << "PDA not found." + to_chat(U, "PDA not found.") else U.unset_machine() U << browse(null, "window=pda") @@ -577,7 +556,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (ismob(loc)) var/mob/M = loc M.put_in_hands(id) - usr << "You remove the ID from the [name]." + to_chat(usr, "You remove the ID from the [name].") else id.loc = get_turf(src) id = null @@ -624,7 +603,7 @@ var/global/list/obj/item/device/pda/PDAs = list() log_pda("[user] (PDA: [src.name]) sent \"[message]\" to [P.name]") else if(!multiple) - user << "ERROR: Server isn't responding." + to_chat(user, "ERROR: Server isn't responding.") return photo = null @@ -651,7 +630,7 @@ var/global/list/obj/item/device/pda/PDAs = list() L = get(src, /mob/living/silicon) if(L && L.stat != UNCONSCIOUS) - L << "\icon[src] Message from [source.owner] ([source.ownjob]), \"[msg.message]\"[msg.get_photo_ref()] (Reply)" + to_chat(L, "\icon[src] Message from [source.owner] ([source.ownjob]), \"[msg.message]\"[msg.get_photo_ref()] (Reply)") update_icon() add_overlay(image(icon, icon_alert)) @@ -660,7 +639,7 @@ var/global/list/obj/item/device/pda/PDAs = list() for(var/mob/M in player_list) if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA)) var/link = FOLLOW_LINK(M, user) - M << "[link] [msg.sender] PDA Message --> [multiple ? "Everyone" : msg.recipient]: " + to_chat(M, "[link] [msg.sender] PDA Message --> [multiple ? "Everyone" : msg.recipient]: ") /obj/item/device/pda/proc/can_send(obj/item/device/pda/P) if(!P || QDELETED(P) || P.toff) @@ -723,7 +702,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(id) remove_id() else - usr << "This PDA does not have an ID in it!" + to_chat(usr, "This PDA does not have an ID in it!") /obj/item/device/pda/verb/verb_remove_pen() set category = "Object" @@ -743,11 +722,11 @@ var/global/list/obj/item/device/pda/PDAs = list() M.put_in_hands(inserted_item) else inserted_item.forceMove(loc) - usr << "You remove \the [inserted_item] from \the [src]." + to_chat(usr, "You remove \the [inserted_item] from \the [src].") inserted_item = null update_icon() else - usr << "This PDA does not have a pen in it!" + to_chat(usr, "This PDA does not have a pen in it!") //trying to insert or remove an id /obj/item/device/pda/proc/id_check(mob/user, obj/item/weapon/card/id/I) @@ -776,7 +755,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!user.transferItemToLoc(C, src)) return cartridge = C - user << "You insert [cartridge] into [src]." + to_chat(user, "You insert [cartridge] into [src].") if(cartridge.radio) cartridge.radio.hostpda = src update_icon() @@ -784,19 +763,19 @@ var/global/list/obj/item/device/pda/PDAs = list() else if(istype(C, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/idcard = C if(!idcard.registered_name) - user << "\The [src] rejects the ID!" + to_chat(user, "\The [src] rejects the ID!") return if(!owner) owner = idcard.registered_name ownjob = idcard.assignment update_label() - user << "Card scanned." + to_chat(user, "Card scanned.") else //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. if(((src in user.contents) || (isturf(loc) && in_range(src, user))) && (C in user.contents)) if(!id_check(user, idcard)) return - user << "You put the ID into \the [src]'s slot." + to_chat(user, "You put the ID into \the [src]'s slot.") updateSelfDialog()//Update self dialog on success. return //Return in case of failed check or when successful. updateSelfDialog()//For the non-input related code. @@ -804,22 +783,22 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!user.transferItemToLoc(C, src)) return pai = C - user << "You slot \the [C] into [src]." + to_chat(user, "You slot \the [C] into [src].") update_icon() updateUsrDialog() else if(is_type_in_list(C, contained_item)) //Checks if there is a pen if(inserted_item) - user << "There is already \a [inserted_item] in \the [src]!" + to_chat(user, "There is already \a [inserted_item] in \the [src]!") else if(!user.transferItemToLoc(C, src)) return - user << "You slide \the [C] into \the [src]." + to_chat(user, "You slide \the [C] into \the [src].") inserted_item = C update_icon() else if(istype(C, /obj/item/weapon/photo)) var/obj/item/weapon/photo/P = C photo = P.img - user << "You scan \the [C]." + to_chat(user, "You scan \the [C].") else if(hidden_uplink && hidden_uplink.active) hidden_uplink.attackby(C, user, params) else @@ -854,13 +833,13 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!isnull(A.reagents)) if(A.reagents.reagent_list.len > 0) var/reagents_length = A.reagents.reagent_list.len - user << "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found." + to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") for (var/re in A.reagents.reagent_list) - user << "\t [re]" + to_chat(user, "\t [re]") else - user << "No active chemical agents found in [A]." + to_chat(user, "No active chemical agents found in [A].") else - user << "No significant chemical agents found in [A]." + to_chat(user, "No significant chemical agents found in [A].") if(5) if (istype(A, /obj/item/weapon/tank)) @@ -884,7 +863,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) var/obj/item/weapon/paper/PP = A if (!PP.info) - user << "Unable to scan! Paper is blank." + to_chat(user, "Unable to scan! Paper is blank.") return notehtml = PP.info note = replacetext(notehtml, "
", "\[br\]") @@ -893,7 +872,7 @@ var/global/list/obj/item/device/pda/PDAs = list() note = replacetext(note, "", "\[/list\]") note = html_encode(note) notescanned = 1 - user << "Paper scanned. Saved to PDA's notekeeper." //concept of scanning paper copyright brainoblivion 2009 + to_chat(user, "Paper scanned. Saved to PDA's notekeeper." ) /obj/item/device/pda/proc/explode() //This needs tuning. @@ -941,7 +920,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return //won't work if dead if(src.aiPDA.toff) - user << "Turn on your receiver in order to send messages." + to_chat(user, "Turn on your receiver in order to send messages.") return for (var/obj/item/device/pda/P in get_viewable_pdas()) @@ -974,9 +953,9 @@ var/global/list/obj/item/device/pda/PDAs = list() return //won't work if dead if(!isnull(aiPDA)) aiPDA.toff = !aiPDA.toff - usr << "PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!" + to_chat(usr, "PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!") else - usr << "You do not have a PDA. You should make an issue report about this." + to_chat(usr, "You do not have a PDA. You should make an issue report about this.") /mob/living/silicon/ai/verb/cmd_toggle_pda_silent() set category = "AI Commands" @@ -986,9 +965,9 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!isnull(aiPDA)) //0 aiPDA.silent = !aiPDA.silent - usr << "PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!" + to_chat(usr, "PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!") else - usr << "You do not have a PDA. You should make an issue report about this." + to_chat(usr, "You do not have a PDA. You should make an issue report about this.") /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user) if(user.stat == 2) @@ -997,7 +976,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/HTML = "
" if(cyberimp_detect) - user << "Detected cybernetic modifications:" - user << "[cyberimp_detect]" + to_chat(user, "Detected cybernetic modifications:") + to_chat(user, "[cyberimp_detect]") /proc/chemscan(mob/living/user, mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.reagents) if(H.reagents.reagent_list.len) - user << "Subject contains the following reagents:" + to_chat(user, "Subject contains the following reagents:") for(var/datum/reagent/R in H.reagents.reagent_list) - user << "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]" + to_chat(user, "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") else - user << "Subject contains no reagents." + to_chat(user, "Subject contains no reagents.") if(H.reagents.addiction_list.len) - user << "Subject is addicted to the following reagents:" + to_chat(user, "Subject is addicted to the following reagents:") for(var/datum/reagent/R in H.reagents.addiction_list) - user << "[R.name]" + to_chat(user, "[R.name]") else - user << "Subject is not addicted to any reagents." + to_chat(user, "Subject is not addicted to any reagents.") /obj/item/device/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" @@ -243,9 +242,9 @@ MASS SPECTROMETER 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/analyzer @@ -278,11 +277,11 @@ MASS SPECTROMETER var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() - user << "Results:" + to_chat(user, "Results:") if(abs(pressure - ONE_ATMOSPHERE) < 10) - user << "Pressure: [round(pressure,0.1)] kPa" + to_chat(user, "Pressure: [round(pressure,0.1)] kPa") else - user << "Pressure: [round(pressure,0.1)] kPa" + to_chat(user, "Pressure: [round(pressure,0.1)] kPa") if(total_moles) var/list/env_gases = environment.gases @@ -294,32 +293,32 @@ MASS SPECTROMETER environment.garbage_collect() if(abs(n2_concentration - N2STANDARD) < 20) - user << "Nitrogen: [round(n2_concentration*100, 0.01)] %" + to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] %") else - user << "Nitrogen: [round(n2_concentration*100, 0.01)] %" + to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] %") if(abs(o2_concentration - O2STANDARD) < 2) - user << "Oxygen: [round(o2_concentration*100, 0.01)] %" + to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] %") else - user << "Oxygen: [round(o2_concentration*100, 0.01)] %" + to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] %") if(co2_concentration > 0.01) - user << "CO2: [round(co2_concentration*100, 0.01)] %" + to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] %") else - user << "CO2: [round(co2_concentration*100, 0.01)] %" + to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] %") if(plasma_concentration > 0.005) - user << "Plasma: [round(plasma_concentration*100, 0.01)] %" + to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] %") else - user << "Plasma: [round(plasma_concentration*100, 0.01)] %" + to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] %") for(var/id in env_gases) if(id in hardcoded_gases) continue var/gas_concentration = env_gases[id][MOLES]/total_moles - user << "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %" - user << "Temperature: [round(environment.temperature-T0C)] °C" + to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %") + to_chat(user, "Temperature: [round(environment.temperature-T0C)] °C") /obj/item/device/mass_spectrometer @@ -352,14 +351,14 @@ MASS SPECTROMETER if (user.stat || user.eye_blind) 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"]) @@ -373,7 +372,7 @@ MASS SPECTROMETER if(details) dat += " ([blood_traces[R]] units)" dat += "" - user << dat + to_chat(user, dat) reagents.clear_reagents() @@ -400,31 +399,31 @@ MASS SPECTROMETER if(user.stat || user.eye_blind) return if (!isslime(M)) - user << "This device can only scan slimes!" + to_chat(user, "This device can only scan slimes!") return var/mob/living/simple_animal/slime/T = M - user << "Slime scan results:" - user << "[T.colour] [T.is_adult ? "adult" : "baby"] slime" - user << "Nutrition: [T.nutrition]/[T.get_max_nutrition()]" + to_chat(user, "Slime scan results:") + to_chat(user, "[T.colour] [T.is_adult ? "adult" : "baby"] slime") + to_chat(user, "Nutrition: [T.nutrition]/[T.get_max_nutrition()]") if (T.nutrition < T.get_starve_nutrition()) - user << "Warning: slime is starving!" + to_chat(user, "Warning: slime is starving!") else if (T.nutrition < T.get_hunger_nutrition()) - user << "Warning: slime is hungry" - user << "Electric change strength: [T.powerlevel]" - user << "Health: [round(T.health/T.maxHealth,0.01)*100]" + to_chat(user, "Warning: slime is hungry") + to_chat(user, "Electric change strength: [T.powerlevel]") + to_chat(user, "Health: [round(T.health/T.maxHealth,0.01)*100]") if (T.slime_mutation[4] == T.colour) - user << "This slime does not evolve any further." + to_chat(user, "This slime does not evolve any further.") else if (T.slime_mutation[3] == T.slime_mutation[4]) if (T.slime_mutation[2] == T.slime_mutation[1]) - user << "Possible mutation: [T.slime_mutation[3]]" - user << "Genetic destability: [T.mutation_chance/2] % chance of mutation on splitting" + to_chat(user, "Possible mutation: [T.slime_mutation[3]]") + to_chat(user, "Genetic destability: [T.mutation_chance/2] % chance of mutation on splitting") else - user << "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)" - user << "Genetic destability: [T.mutation_chance] % chance of mutation on splitting" + to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)") + to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting") else - user << "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]" - user << "Genetic destability: [T.mutation_chance] % chance of mutation on splitting" + to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]") + to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting") if (T.cores > 1) - user << "Anomalious slime core amount detected" - user << "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]" + to_chat(user, "Anomalious slime core amount detected") + to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]") diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index c3f6dd488f..95c04e9579 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -27,7 +27,7 @@ /obj/item/device/taperecorder/examine(mob/user) ..() - 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, params) @@ -35,13 +35,13 @@ if(!user.transferItemToLoc(I,src)) return 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 @@ -111,7 +111,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 @@ -127,7 +127,7 @@ recording = 0 update_icon() else - usr << "The tape is full." + to_chat(usr, "The tape is full.") /obj/item/device/taperecorder/verb/stop() @@ -141,7 +141,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 @@ -165,7 +165,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)) @@ -210,12 +210,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.") var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:
" for(var/i = 1, mytape.storedinfo.len >= i, i++) @@ -254,7 +254,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() @@ -279,9 +279,9 @@ else if(istype(I, /obj/item/weapon/pen)) delay = 120*1.5 if (delay != -1) - user << "You start winding the tape back in..." + to_chat(user, "You start winding the tape back in...") if(do_after(user, delay, target = src)) - user << "You wound the tape back in." + to_chat(user, "You wound the tape back in.") fix() //Random colour tapes diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index f361a9f572..e51cc33fe0 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -34,7 +34,7 @@ effective or pretty fucking useless. /obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - user << "The mind batterer has been burnt out!" + to_chat(user, "The mind batterer has been burnt out!") return add_logs(user, null, "knocked down people in the area", src) @@ -45,13 +45,13 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - M << "You feel a tremendous, paralyzing wave flood your mind." + to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") else - M << "You feel a sudden, electric jolt travel through your head." + to_chat(M, "You feel a sudden, electric jolt travel through your head.") playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) - user << "You trigger [src]." + to_chat(user, "You trigger [src].") times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -86,14 +86,14 @@ effective or pretty fucking useless. used = 1 icon_state = "health1" handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength - user << "Successfully irradiated [M]." + to_chat(user, "Successfully irradiated [M].") spawn((wavelength+(intensity*4))*5) if(M) if(intensity >= 5) M.apply_effect(round(intensity/1.5), PARALYZE) M.rad_act(intensity*10) else - user << "The radioactive microlaser is still recharging." + to_chat(user, "The radioactive microlaser is still recharging.") /obj/item/device/healthanalyzer/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) @@ -192,14 +192,14 @@ effective or pretty fucking useless. /obj/item/device/shadowcloak/proc/Activate(mob/living/carbon/human/user) if(!user) return - user << "You activate [src]." + to_chat(user, "You activate [src].") src.user = user START_PROCESSING(SSobj, src) old_alpha = user.alpha on = 1 /obj/item/device/shadowcloak/proc/Deactivate() - user << "You deactivate [src]." + to_chat(user, "You deactivate [src].") STOP_PROCESSING(SSobj, src) if(user) user.alpha = old_alpha @@ -218,8 +218,27 @@ effective or pretty fucking useless. var/turf/T = get_turf(src) if(on) var/lumcount = T.get_lumcount() - if(lumcount > 3) + if(lumcount > 0.3) charge = max(0,charge - 25)//Quick decrease in light else charge = min(max_charge,charge + 50) //Charge in the dark animate(user,alpha = Clamp(255 - charge,0,255),time = 10) + + +/obj/item/device/jammer + name = "radio jammer" + desc = "Device used to disrupt nearby radio communication." + icon_state = "jammer" + var/active = FALSE + var/range = 7 + +/obj/item/device/jammer/attack_self(mob/user) + to_chat(user,"You [active ? "deactivate" : "activate"] the [src]") + active = !active + if(active) + active_jammers |= src + else + active_jammers -= src + update_icon() + + \ No newline at end of file diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 91b3c4b9b0..80d0d31056 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -18,21 +18,21 @@ /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) if(!user.transferItemToLoc(item, src)) return tank_one = item - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") if(item.w_class > w_class) w_class = item.w_class else if(!tank_two) if(!user.transferItemToLoc(item, src)) return tank_two = item - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") if(item.w_class > w_class) w_class = item.w_class @@ -41,15 +41,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 if(!user.transferItemToLoc(item, src)) return attached_device = A - 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/documents.dm b/code/game/objects/items/documents.dm index 06e3216022..ea24e77832 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -48,11 +48,11 @@ /obj/item/documents/photocopy/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/toy/crayon/red) || istype(O, /obj/item/toy/crayon/blue)) if (forgedseal) - user << "You have already forged a seal on [src]!" + to_chat(user, "You have already forged a seal on [src]!") else var/obj/item/toy/crayon/C = O name = "[C.item_color] secret documents" icon_state = "docs_[C.item_color]" forgedseal = C.item_color - user << "You forge the official seal with a [C.item_color] crayon. No one will notice... right?" + to_chat(user, "You forge the official seal with a [C.item_color] crayon. No one will notice... right?") update_icon() \ No newline at end of file diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm new file mode 100644 index 0000000000..eb3a4172f7 --- /dev/null +++ b/code/game/objects/items/eightball.dm @@ -0,0 +1,200 @@ +/obj/item/toy/eightball + name = "magic eightball" + desc = "A black ball with a stenciled number eight in white on the side. It seems full of dark liquid.\nThe instructions state that you should ask your question aloud, and then shake." + + icon = 'icons/obj/toy.dmi' + icon_state = "eightball" + + verb_say = "rattles" + + var/shaking = FALSE + var/on_cooldown = FALSE + + var/shake_time = 150 + var/cooldown_time = 1800 + + var/static/list/possible_answers = list( + "It is certain", + "It is decidedly so", + "Without a doubt", + "Yes definitely", + "You may rely on it", + "As I see it, yes", + "Most likely", + "Outlook good", + "Yes", + "Signs point to yes", + "Reply hazy try again", + "Ask again later", + "Better not tell you now", + "Cannot predict now", + "Concentrate and ask again", + "Don't count on it", + "My reply is no", + "My sources say no", + "Outlook not so good", + "Very doubtful") + +/obj/item/toy/eightball/Initialize(mapload) + ..() + if(prob(1)) + new /obj/item/toy/eightball/haunted(get_turf(src)) + qdel(src) + +/obj/item/toy/eightball/attack_self(mob/user) + if(shaking) + return + + if(on_cooldown) + to_chat(user, "[src] was shaken recently, it needs time to settle.") + return + + user.visible_message("[user] starts shaking [src].", "You start shaking [src].", "You hear shaking and sloshing.") + + shaking = TRUE + + start_shaking(user) + if(do_after(user, shake_time, needhand=TRUE, target=src, progress=TRUE)) + var/answer = get_answer() + say(answer) + + on_cooldown = TRUE + addtimer(CALLBACK(src, .proc/clear_cooldown), cooldown_time) + + shaking = FALSE + +/obj/item/toy/eightball/proc/start_shaking(user) + return + +/obj/item/toy/eightball/proc/get_answer() + return pick(possible_answers) + +/obj/item/toy/eightball/proc/clear_cooldown() + on_cooldown = FALSE + +// A broken magic eightball, it only says "YOU SUCK" over and over again. + +/obj/item/toy/eightball/broken + name = "broken magic eightball" + desc = "A black ball with a stenciled number eight in white on the side. It is cracked and seems empty." + var/fixed_answer + +/obj/item/toy/eightball/broken/Initialize(mapload) + ..() + fixed_answer = pick(possible_answers) + +/obj/item/toy/eightball/broken/get_answer() + return fixed_answer + +// Haunted eightball is identical in description and function to toy, +// except it actually ASKS THE DEAD (wooooo) + +/obj/item/toy/eightball/haunted + flags = HEAR + var/last_message + var/selected_message + var/list/votes + +/obj/item/toy/eightball/haunted/Initialize(mapload) + ..() + votes = list() + poi_list |= src + +/obj/item/toy/eightball/haunted/Destroy() + poi_list -= src + . = ..() + +/obj/item/toy/eightball/haunted/attack_ghost(mob/user) + if(!shaking) + to_chat(user, "[src] is not currently being shaken.") + return + interact(user) + +/obj/item/toy/eightball/haunted/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans) + last_message = raw_message + +/obj/item/toy/eightball/haunted/start_shaking(mob/user) + // notify ghosts that someone's shaking a haunted eightball + // and inform them of the message, (hopefully a yes/no question) + selected_message = last_message + notify_ghosts("[user] is shaking [src], hoping to get an answer to \"[selected_message]\"", source=src, enter_link="(Click to help)", action=NOTIFY_ATTACK) + +/obj/item/toy/eightball/haunted/Topic(href, href_list) + if(href_list["interact"]) + if(isobserver(usr)) + interact(usr) + +/obj/item/toy/eightball/haunted/proc/get_vote_tallies() + var/list/answers = list() + for(var/ckey in votes) + var/selected = votes[ckey] + if(selected in answers) + answers[selected]++ + else + answers[selected] = 1 + + return answers + + +/obj/item/toy/eightball/haunted/get_answer() + if(!votes.len) + return pick(possible_answers) + + var/list/tallied_votes = get_vote_tallies() + + // I miss python sorting, then I wouldn't have to muck about with + // all this + var/most_popular_answer + var/most_amount = 0 + // yes, if there is a tie, there is an arbitary decision + // but we never said the spirit world was fair + for(var/A in tallied_votes) + var/amount = tallied_votes[A] + if(amount > most_amount) + most_popular_answer = A + + return most_popular_answer + +/obj/item/toy/eightball/haunted/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/ui_state/state=observer_state) + + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "eightball", name, 400, 600, master_ui, state) + ui.open() + +/obj/item/toy/eightball/haunted/ui_data(mob/user) + var/list/data = list() + data["shaking"] = shaking + data["question"] = selected_message + var/list/tallied_votes = get_vote_tallies() + + data["answers"] = list() + + for(var/pa in possible_answers) + var/list/L = list() + L["answer"] = pa + var/amount = 0 + if(pa in tallied_votes) + amount = tallied_votes[pa] + L["amount"] = amount + var/selected = FALSE + if(votes[user.ckey] == pa) + selected = TRUE + L["selected"] = selected + + data["answers"] += list(L) + return data + +/obj/item/toy/eightball/haunted/ui_act(action, params) + if(..()) + return + var/mob/user = usr + + switch(action) + if("vote") + var/selected_answer = params["answer"] + if(!selected_answer in possible_answers) + return + else + votes[user.ckey] = selected_answer + . = TRUE diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 40b32b0b3c..279d8818d4 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -17,7 +17,7 @@ icon_state = "latexballon_blow" item_state = "latexballon" user.update_inv_hands() - user << "You blow up [src] with [tank]." + to_chat(user, "You blow up [src] with [tank].") air_contents = tank.remove_air_volume(3) /obj/item/latexballon/proc/burst() diff --git a/code/game/objects/items/nuke_tools.dm b/code/game/objects/items/nuke_tools.dm index 7fe512bfaf..c32cdc14e0 100644 --- a/code/game/objects/items/nuke_tools.dm +++ b/code/game/objects/items/nuke_tools.dm @@ -42,7 +42,7 @@ ncore.forceMove(src) core = ncore icon_state = "core_container_loaded" - user << "Container is sealing..." + to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, .proc/seal), 50) return 1 @@ -52,12 +52,12 @@ icon_state = "core_container_sealed" playsound(loc, 'sound/items/Deconstruct.ogg', 60, 1) if(ismob(loc)) - loc << "[src] is permanently sealed, [core]'s radiation is contained." + to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.") /obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user) if(istype(core)) if(!user.temporarilyRemoveItemFromInventory(core)) - user << "The [core] is stuck to your hand!" + to_chat(user, "The [core] is stuck to your hand!") return else load(core, user) diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index c351169993..ccf4085191 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -10,11 +10,11 @@ /obj/item/weapon/banner/attack_self(mob/living/carbon/human/user) if(moralecooldown + moralewait > world.time) return - user << "You increase the morale of your fellows!" + to_chat(user, "You increase the morale of your fellows!") moralecooldown = world.time for(var/mob/living/carbon/human/H in range(4,get_turf(src))) - H << "Your morale is increased by [user]'s banner!" + to_chat(H, "Your morale is increased by [user]'s banner!") H.adjustBruteLoss(-15) H.adjustFireLoss(-15) H.AdjustStunned(-2) diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm index 97a1fab67d..dad3db6b1d 100644 --- a/code/game/objects/items/robot/ai_upgrades.dm +++ b/code/game/objects/items/robot/ai_upgrades.dm @@ -14,11 +14,11 @@ return if(AI.malf_picker) AI.malf_picker.processing_time += 50 - AI << "[user] has attempted to upgrade you with combat software that you already possess. You gain 50 points to spend on Malfunction Modules instead." + to_chat(AI, "[user] has attempted to upgrade you with combat software that you already possess. You gain 50 points to spend on Malfunction Modules instead.") else - AI << "[user] has upgraded you with combat software!" + to_chat(AI, "[user] has upgraded you with combat software!") AI.add_malf_picker() - user << "You upgrade [AI]. [src] is consumed in the process." + to_chat(user, "You upgrade [AI]. [src] is consumed in the process.") qdel(src) @@ -34,7 +34,7 @@ return if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE - AI << "[user] has upgraded you with surveillance software!" - AI << "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations." - user << "You upgrade [AI]. [src] is consumed in the process." + to_chat(AI, "[user] has upgraded you with surveillance software!") + to_chat(AI, "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations.") + to_chat(user, "You upgrade [AI]. [src] is consumed in the process.") qdel(src) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 8fd55925e3..c8c7cd1397 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -57,13 +57,13 @@ mode = 0 switch(mode) if(0) - user << "Power reset. Hugs!" + to_chat(user, "Power reset. Hugs!") if(1) - user << "Power increased!" + to_chat(user, "Power increased!") if(2) - user << "BZZT. Electrifying arms..." + to_chat(user, "BZZT. Electrifying arms...") if(3) - user << "ERROR: ARM ACTUATORS OVERLOADED." + to_chat(user, "ERROR: ARM ACTUATORS OVERLOADED.") /obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user) if(M == user) @@ -172,7 +172,7 @@ mode = "charge" else mode = "draw" - user << "You toggle [src] to \"[mode]\" mode." + to_chat(user, "You toggle [src] to \"[mode]\" mode.") update_icon() /obj/item/borg/charger/afterattack(obj/item/target, mob/living/silicon/robot/user, proximity_flag) @@ -182,10 +182,10 @@ if(is_type_in_list(target, charge_machines)) var/obj/machinery/M = target if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) - user << "[M] is unpowered!" + to_chat(user, "[M] is unpowered!") return - user << "You connect to [M]'s power line..." + to_chat(user, "You connect to [M]'s power line...") while(do_after(user, 15, target = M, progress = 0)) if(!user || !user.cell || mode != "draw") return @@ -198,27 +198,27 @@ M.use_power(200) - user << "You stop charging youself." + to_chat(user, "You stop charging youself.") else if(is_type_in_list(target, charge_items)) var/obj/item/weapon/stock_parts/cell/cell = target if(!istype(cell)) cell = locate(/obj/item/weapon/stock_parts/cell) in target if(!cell) - user << "[target] has no power cell!" + to_chat(user, "[target] has no power cell!") return if(istype(target, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/E = target if(!E.can_charge) - user << "[target] has no power port!" + to_chat(user, "[target] has no power port!") return if(!cell.charge) - user << "[target] has no power!" + to_chat(user, "[target] has no power!") - user << "You connect to [target]'s power port..." + to_chat(user, "You connect to [target]'s power port...") while(do_after(user, 15, target = target, progress = 0)) if(!user || !user.cell || mode != "draw") @@ -237,26 +237,26 @@ break target.update_icon() - user << "You stop charging youself." + to_chat(user, "You stop charging youself.") else if(is_type_in_list(target, charge_items)) var/obj/item/weapon/stock_parts/cell/cell = target if(!istype(cell)) cell = locate(/obj/item/weapon/stock_parts/cell) in target if(!cell) - user << "[target] has no power cell!" + to_chat(user, "[target] has no power cell!") return if(istype(target, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/E = target if(!E.can_charge) - user << "[target] has no power port!" + to_chat(user, "[target] has no power port!") return if(cell.charge >= cell.maxcharge) - user << "[target] is already charged!" + to_chat(user, "[target] is already charged!") - user << "You connect to [target]'s power port..." + to_chat(user, "You connect to [target]'s power port...") while(do_after(user, 15, target = target, progress = 0)) if(!user || !user.cell || mode != "charge") @@ -275,7 +275,7 @@ break target.update_icon() - user << "You stop charging [target]." + to_chat(user, "You stop charging [target].") /obj/item/device/harmalarm name = "Sonic Harm Prevention Tool" @@ -287,20 +287,20 @@ /obj/item/device/harmalarm/emag_act(mob/user) emagged = !emagged if(emagged) - user << "You short out the safeties on the [src]!" + to_chat(user, "You short out the safeties on the [src]!") else - user << "You reset the safeties on the [src]!" + to_chat(user, "You reset the safeties on the [src]!") /obj/item/device/harmalarm/attack_self(mob/user) var/safety = !emagged if(cooldown > world.time) - user << "The device is still recharging!" + to_chat(user, "The device is still recharging!") return if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(R.cell.charge < 1200) - user << "You don't have enough charge to do this!" + to_chat(user, "You don't have enough charge to do this!") return R.cell.charge -= 1000 if(R.emagged) @@ -319,7 +319,7 @@ log_game("[user.ckey]([user]) used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])") if(iscyborg(user)) var/mob/living/silicon/robot/R = user - R.connected_ai << "
NOTICE - Peacekeeping 'HARM ALARM' used by: [user]
" + to_chat(R.connected_ai, "
NOTICE - Peacekeeping 'HARM ALARM' used by: [user]
") return @@ -375,7 +375,7 @@ /obj/item/borg/lollipop/proc/dispense(atom/A, mob/user) if(candy <= 0) - user << "No lollipops left in storage!" + to_chat(user, "No lollipops left in storage!") return FALSE var/turf/T = get_turf(A) if(!T || !istype(T) || !isopenturf(T)) @@ -387,13 +387,13 @@ new /obj/item/weapon/reagent_containers/food/snacks/lollipop(T) candy-- check_amount() - user << "Dispensing lollipop..." + to_chat(user, "Dispensing lollipop...") playsound(src.loc, 'sound/machines/click.ogg', 50, 1) return TRUE /obj/item/borg/lollipop/proc/shootL(atom/target, mob/living/user, params) if(candy <= 0) - user << "Not enough lollipops left!" + to_chat(user, "Not enough lollipops left!") return FALSE candy-- var/obj/item/ammo_casing/caseless/lollipop/A = new /obj/item/ammo_casing/caseless/lollipop(src) @@ -408,7 +408,7 @@ /obj/item/borg/lollipop/proc/shootG(atom/target, mob/living/user, params) //Most certainly a good idea. if(candy <= 0) - user << "Not enough gumballs left!" + to_chat(user, "Not enough gumballs left!") return FALSE candy-- var/obj/item/ammo_casing/caseless/gumball/A = new /obj/item/ammo_casing/caseless/gumball(src) @@ -427,7 +427,7 @@ if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(!R.cell.use(12)) - user << "Not enough power." + to_chat(user, "Not enough power.") return FALSE if(R.emagged) hitdamage = emaggedhitdamage @@ -446,13 +446,13 @@ switch(mode) if(1) mode++ - user << "Module is now throwing lollipops." + to_chat(user, "Module is now throwing lollipops.") if(2) mode++ - user << "Module is now blasting gumballs." + to_chat(user, "Module is now blasting gumballs.") if(3) mode = 1 - user << "Module is now dispensing lollipops." + to_chat(user, "Module is now dispensing lollipops.") ..() /obj/item/ammo_casing/caseless/gumball diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 9793a7dd22..a0d0728487 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -70,13 +70,13 @@ if (M.use(1)) var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) - user << "You arm the robot frame." + to_chat(user, "You arm the robot frame.") var/holding_this = user.get_inactive_held_item()==src qdel(src) if (holding_this) user.put_in_inactive_hand(B) else - user << "You need one sheet of metal to start building ED-209!" + to_chat(user, "You need one sheet of metal to start building ED-209!") return else if(istype(W, /obj/item/bodypart/l_leg/robot)) if(src.l_leg) @@ -130,15 +130,15 @@ src.chest = CH src.updateicon() else if(!CH.wired) - user << "You need to attach wires to it first!" + to_chat(user, "You need to attach wires to it first!") else - user << "You need to attach a cell to it first!" + to_chat(user, "You need to attach a cell to it first!") else if(istype(W, /obj/item/bodypart/head/robot)) var/obj/item/bodypart/head/robot/HD = W for(var/X in HD.contents) if(istype(X, /obj/item/organ)) - user << "There are organs inside [HD]!" + to_chat(user, "There are organs inside [HD]!") return if(src.head) return @@ -150,39 +150,39 @@ src.head = HD src.updateicon() else - user << "You need to attach a flash to it first!" + to_chat(user, "You need to attach a flash to it first!") else 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!") else if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!isturf(loc)) - user << "You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!" + to_chat(user, "You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!") return if(!M.brainmob) - user << "Sticking an empty [M.name] into the frame would sort of defeat the purpose!" + to_chat(user, "Sticking an empty [M.name] into the frame would sort of defeat the purpose!") return var/mob/living/brain/BM = M.brainmob if(!BM.key || !BM.mind) - user << "The MMI indicates that their mind is completely unresponsive; there's no point!" + to_chat(user, "The MMI indicates that their mind is completely unresponsive; there's no point!") return if(!BM.client) //braindead - user << "The MMI indicates that their mind is currently inactive; it might change!" + to_chat(user, "The MMI indicates that their mind is currently inactive; it might change!") return if(BM.stat == DEAD || (M.brain && M.brain.damaged_brain)) - user << "Sticking a dead brain into the frame would sort of defeat the purpose!" + to_chat(user, "Sticking a dead brain into the frame would sort of defeat the purpose!") return if(jobban_isbanned(BM, "Cyborg")) - user << "This [M.name] does not seem to fit!" + to_chat(user, "This [M.name] does not seem to fit!") return if(!user.temporarilyRemoveItemFromInventory(W)) @@ -221,8 +221,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" @@ -243,13 +243,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!") 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]!") else return ..() @@ -272,7 +272,7 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_held_item() 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"]) @@ -287,7 +287,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 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4e7fbfbf10..a83cf764ae 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -17,11 +17,11 @@ /obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R) if(R.stat == DEAD) - usr << "[src] will not function on a deceased cyborg." + to_chat(usr, "[src] will not function on a deceased cyborg.") return 1 if(module_type && !istype(R.module, module_type)) - 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 1 /obj/item/borg/upgrade/rename @@ -56,7 +56,7 @@ /obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the cyborg before using this module!" + to_chat(usr, "You have to repair the cyborg before using this module!") return 0 if(R.mind) @@ -78,8 +78,8 @@ if(..()) return if(R.speed < 0) - R << "A VTEC unit is already installed!" - usr << "There's no room for another VTEC unit!" + to_chat(R, "A VTEC unit is already installed!") + to_chat(usr, "There's no room for another VTEC unit!") return R.speed = -2 // Gotta go fast. @@ -100,11 +100,11 @@ var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module.modules if(!T) - usr << "There's no disabler in this unit!" + to_chat(usr, "There's no disabler in this unit!") return if(T.charge_delay <= 2) - R << "A cooling unit is already installed!" - usr << "There's no room for another cooling unit!" + to_chat(R, "A cooling unit is already installed!") + to_chat(usr, "There's no room for another cooling unit!") return T.charge_delay = max(2 , T.charge_delay - 4) @@ -122,7 +122,7 @@ return if(R.ionpulse) - usr << "This unit already has ion thrusters installed!" + to_chat(usr, "This unit already has ion thrusters installed!") return R.ionpulse = TRUE @@ -222,7 +222,7 @@ var/obj/item/borg/upgrade/selfrepair/U = locate() in R if(U) - usr << "This unit is already equipped with a self-repair module." + to_chat(usr, "This unit is already equipped with a self-repair module.") return 0 cyborg = R @@ -243,10 +243,10 @@ /obj/item/borg/upgrade/selfrepair/ui_action_click() on = !on if(on) - cyborg << "You activate the self-repair module." + to_chat(cyborg, "You activate the self-repair module.") START_PROCESSING(SSobj, src) else - cyborg << "You deactivate the self-repair module." + to_chat(cyborg, "You deactivate the self-repair module.") STOP_PROCESSING(SSobj, src) update_icon() @@ -271,12 +271,12 @@ if(cyborg && (cyborg.stat != DEAD) && on) if(!cyborg.cell) - cyborg << "Self-repair module deactivated. Please, insert the power cell." + to_chat(cyborg, "Self-repair module deactivated. Please, insert the power cell.") deactivate() return if(cyborg.cell.charge < powercost * 2) - cyborg << "Self-repair module deactivated. Please recharge." + to_chat(cyborg, "Self-repair module deactivated. Please recharge.") deactivate() return @@ -301,7 +301,7 @@ msgmode = "critical" else if(cyborg.health < cyborg.maxHealth) msgmode = "normal" - cyborg << "Self-repair is active in [msgmode] mode." + to_chat(cyborg, "Self-repair is active in [msgmode] mode.") msg_cooldown = world.time else deactivate() diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 2b0861619e..f1271b3cb9 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -30,7 +30,7 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) removeOverlays() - user << "You slice off [src]'s uneven chunks of aluminium and scorch marks." + to_chat(user, "You slice off [src]'s uneven chunks of aluminium and scorch marks.") else return ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index b50e1f12ec..7906de1547 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -23,11 +23,11 @@ t_him = "him" else if(M.gender == FEMALE) t_him = "her" - user << "\The [M] is dead, you cannot help [t_him]!" + to_chat(user, "\The [M] is dead, you cannot help [t_him]!") return if(!istype(M, /mob/living/carbon) && !istype(M, /mob/living/simple_animal)) - user << "You don't know how to apply \the [src] to [M]!" + to_chat(user, "You don't know how to apply \the [src] to [M]!") return 1 var/obj/item/bodypart/affecting @@ -35,16 +35,16 @@ var/mob/living/carbon/C = M affecting = C.get_bodypart(check_zone(user.zone_selected)) if(!affecting) //Missing limb? - user << "[C] doesn't have \a [parse_zone(user.zone_selected)]!" + to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") return if(ishuman(C)) var/mob/living/carbon/human/H = C if(stop_bleeding) if(H.bleedsuppress) - user << "[H]'s bleeding is already bandaged!" + to_chat(user, "[H]'s bleeding is already bandaged!") return else if(!H.bleed_rate) - user << "[H] isn't bleeding!" + to_chat(user, "[H] isn't bleeding!") return @@ -57,13 +57,13 @@ if (istype(M, /mob/living/simple_animal)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - user << " You cannot use [src] on [M]!" + to_chat(user, " You cannot use [src] on [M]!") return else if (critter.health == critter.maxHealth) - user << " [M] is at full health." + to_chat(user, " [M] is at full health.") return else if(src.heal_brute < 1) - user << " [src] won't help [M] at all." + to_chat(user, " [src] won't help [M] at all.") return user.visible_message("[user] applies [src] on [M].", "You apply [src] on [M].") else @@ -82,7 +82,7 @@ var/mob/living/carbon/C = M affecting = C.get_bodypart(check_zone(user.zone_selected)) if(!affecting) //Missing limb? - user << "[C] doesn't have \a [parse_zone(user.zone_selected)]!" + to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") return if(ishuman(C)) var/mob/living/carbon/human/H = C @@ -93,7 +93,7 @@ if(affecting.heal_damage(heal_brute, heal_burn)) C.update_damage_overlays() else - user << "Medicine won't work on a robotic limb!" + to_chat(user, "Medicine won't work on a robotic limb!") else M.heal_bodypart_damage((src.heal_brute/2), (src.heal_burn/2)) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 4a6573c245..45f9672540 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -21,7 +21,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' -/obj/item/stack/rods/New(var/loc, var/amount=null) +/obj/item/stack/rods/Initialize(mapload, new_amount, merge = TRUE) ..() recipes = rod_recipes @@ -39,7 +39,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ 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)) @@ -57,9 +57,9 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) var/obj/item/weapon/reagent_containers/food/snacks/S = W if(amount != 1) - user << "You must use a single rod!" + to_chat(user, "You must use a single rod!") else if(S.w_class > WEIGHT_CLASS_SMALL) - user << "The ingredient is too big for [src]!" + to_chat(user, "The ingredient is too big for [src]!") else var/obj/item/weapon/reagent_containers/food/snacks/customizable/A = new/obj/item/weapon/reagent_containers/food/snacks/customizable/kebab(get_turf(src)) A.initialize_custom_food(src, S, user) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index f9267dc378..ebe30f01ad 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -32,7 +32,7 @@ var/global/list/datum/stack_recipe/glass_recipes = list ( \ /obj/item/stack/sheet/glass/fifty amount = 50 -/obj/item/stack/sheet/glass/New(loc, amount) +/obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE) recipes = glass_recipes ..() @@ -41,11 +41,11 @@ var/global/list/datum/stack_recipe/glass_recipes = list ( \ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if (get_amount() < 1 || CC.get_amount() < 5) - user << "You need five lengths of coil and one sheet of glass to make wired glass!") return CC.use(5) use(1) - user << "You attach wire to the [name]." + to_chat(user, "You attach wire to the [name].") var/obj/item/stack/light_w/new_tile = new(user.loc) new_tile.add_fingerprint(user) else if(istype(W, /obj/item/stack/rods)) @@ -61,7 +61,7 @@ var/global/list/datum/stack_recipe/glass_recipes = list ( \ if (!G && replace) user.put_in_hands(RG) else - user << "You need one rod and one sheet of glass to make reinforced glass!" + to_chat(user, "You need one rod and one sheet of glass to make reinforced glass!") return else return ..() @@ -106,7 +106,7 @@ var/global/list/datum/stack_recipe/reinforced_glass_recipes = list ( \ source.add_charge(amount * metcost) glasource.add_charge(amount * glacost) -/obj/item/stack/sheet/rglass/New(loc, amount) +/obj/item/stack/sheet/rglass/Initialize(mapload, new_amount, merge = TRUE) recipes = reinforced_glass_recipes ..() @@ -159,11 +159,11 @@ var/global/list/datum/stack_recipe/reinforced_glass_recipes = list ( \ if(ishuman(user)) var/mob/living/carbon/human/H = user if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.species_traits)) // golems, etc - H << "[src] cuts into your hand!" + to_chat(H, "[src] cuts into your hand!") H.apply_damage(force*0.5, BRUTE, hit_hand) else if(ismonkey(user)) var/mob/living/carbon/monkey/M = user - M << "[src] cuts into your hand!" + to_chat(M, "[src] cuts into your hand!") M.apply_damage(force*0.5, BRUTE, hit_hand) @@ -180,7 +180,7 @@ var/global/list/datum/stack_recipe/reinforced_glass_recipes = list ( \ 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) else return ..() diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index c8f5e1d94d..17a4c74e91 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -13,7 +13,7 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5, on_floor = 1), \ ) -/obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null) +/obj/item/stack/sheet/animalhide/human/Initialize(mapload, new_amount, merge = TRUE) recipes = human_recipes return ..() @@ -33,7 +33,7 @@ var/global/list/datum/stack_recipe/corgi_recipes = list ( \ new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \ ) -/obj/item/stack/sheet/animalhide/corgi/New(var/loc, var/amount=null) +/obj/item/stack/sheet/animalhide/corgi/Initialize(mapload, new_amount, merge = TRUE) recipes = corgi_recipes return ..() @@ -54,7 +54,7 @@ var/global/list/datum/stack_recipe/monkey_recipes = list ( \ new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/monkeysuit, 2, on_floor = 1), \ ) -/obj/item/stack/sheet/animalhide/monkey/New(var/loc, var/amount=null) +/obj/item/stack/sheet/animalhide/monkey/Initialize(mapload, new_amount, merge = TRUE) recipes = monkey_recipes return ..() @@ -75,7 +75,7 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \ new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 2, on_floor = 1), \ ) -/obj/item/stack/sheet/animalhide/xeno/New(var/loc, var/amount=null) +/obj/item/stack/sheet/animalhide/xeno/Initialize(mapload, new_amount, merge = TRUE) recipes = xeno_recipes return ..() @@ -138,7 +138,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \ new/datum/stack_recipe("sinew restraints", /obj/item/weapon/restraints/handcuffs/sinew, 1, on_floor = 1), \ ) -/obj/item/stack/sheet/sinew/New(var/loc, var/amount=null) +/obj/item/stack/sheet/sinew/Initialize(mapload, new_amount, merge = TRUE) recipes = sinew_recipes return ..() /* @@ -173,7 +173,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \ playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) user.visible_message("[user] starts cutting hair off \the [src].", "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)) - user << "You cut the hair from this [src.singular_name]." + to_chat(user, "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 user.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 2b33b06da9..49143b7f5f 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -29,9 +29,9 @@ if (M.use(1)) use(1) var/obj/item/L = new /obj/item/stack/tile/light(user.loc) - user << "You make a light tile." + to_chat(user, "You make a light tile.") L.add_fingerprint(user) else - user << "You need one metal sheet to finish the light tile!" + to_chat(user, "You need one metal sheet to finish the light tile!") else return ..() diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index b0148ea479..a88c13415f 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -71,7 +71,7 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list ( \ new/datum/stack_recipe("sandbags", /obj/structure/barricade/sandbags, 1, time = 25, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/sandbags/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/sandbags/Initialize(mapload, new_amount, merge = TRUE) recipes = sandbag_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -96,7 +96,7 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/diamond/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/diamond/Initialize(mapload, new_amount, merge = TRUE) recipes = diamond_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -120,7 +120,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/uranium/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/uranium/Initialize(mapload, new_amount, merge = TRUE) recipes = uranium_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -146,7 +146,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/plasma/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/plasma/Initialize(mapload, new_amount, merge = TRUE) recipes = plasma_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -186,7 +186,7 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/gold/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/gold/Initialize(mapload, new_amount, merge = TRUE) recipes = gold_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -213,7 +213,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/silver/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/silver/Initialize(mapload, new_amount, merge = TRUE) recipes = silver_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -235,7 +235,7 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/bananium/Initialize(mapload, new_amount, merge = TRUE) recipes = clown_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -261,7 +261,7 @@ var/global/list/datum/stack_recipe/titanium_recipes = list ( \ new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), \ ) -/obj/item/stack/sheet/mineral/titanium/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/titanium/Initialize(mapload, new_amount, merge = TRUE) recipes = titanium_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -288,7 +288,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( \ new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), \ ) -/obj/item/stack/sheet/mineral/plastitanium/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/plastitanium/Initialize(mapload, new_amount, merge = TRUE) recipes = plastitanium_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -313,7 +313,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \ new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \ ) -/obj/item/stack/sheet/mineral/snow/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/snow/Initialize(mapload, new_amount, merge = TRUE) recipes = snow_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 @@ -373,6 +373,6 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ new/datum/stack_recipe("Abductor Sciencist Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1)*/ ) -/obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/abductor/Initialize(mapload, new_amount, merge = TRUE) recipes = abductor_recipes ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 672128a4ce..6eedb62766 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -38,7 +38,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, 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), \ -/* new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = 1, on_floor = 1), \*/ + new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = 1, 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/wallframe/light_fixture, 2), \ @@ -85,7 +85,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ is_cyborg = 1 cost = 500 -/obj/item/stack/sheet/metal/New(var/loc, var/amount=null) +/obj/item/stack/sheet/metal/Initialize(mapload, new_amount, merge = TRUE) recipes = metal_recipes return ..() @@ -111,7 +111,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ resistance_flags = FIRE_PROOF merge_type = /obj/item/stack/sheet/plasteel -/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) +/obj/item/stack/sheet/plasteel/Initialize(mapload, new_amount, merge = TRUE) recipes = plasteel_recipes return ..() @@ -160,7 +160,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ resistance_flags = FLAMMABLE merge_type = /obj/item/stack/sheet/mineral/wood -/obj/item/stack/sheet/mineral/wood/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE) recipes = wood_recipes return ..() @@ -205,7 +205,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \ throwforce = 0 merge_type = /obj/item/stack/sheet/cloth -/obj/item/stack/sheet/cloth/New(var/loc, var/amount=null) +/obj/item/stack/sheet/cloth/Initialize(mapload, new_amount, merge = TRUE) recipes = cloth_recipes return ..() @@ -237,7 +237,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ resistance_flags = FLAMMABLE merge_type = /obj/item/stack/sheet/cardboard -/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null) +/obj/item/stack/sheet/cardboard/Initialize(mapload, new_amount, merge = TRUE) recipes = cardboard_recipes return ..() @@ -272,20 +272,20 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user) if(!iscultist(user)) - user << "Only one with forbidden knowledge could hope to work this metal..." + to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") return return ..() /obj/item/stack/sheet/runed_metal/attack(atom/target, mob/living/user) if(!iscultist(user)) - user << "Only one with forbidden knowledge could hope to work this metal..." + to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") return ..() /obj/item/stack/sheet/runed_metal/fifty amount = 50 -/obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) +/obj/item/stack/sheet/runed_metal/Initialize(mapload, new_amount, merge = TRUE) recipes = runed_metal_recipes return ..() @@ -322,7 +322,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list ( \ new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) -/obj/item/stack/tile/brass/New(var/loc, var/amount=null) +/obj/item/stack/tile/brass/Initialize(mapload, new_amount, merge = TRUE) recipes = brass_recipes ..() pixel_x = 0 @@ -368,7 +368,6 @@ var/global/list/datum/stack_recipe/plastic_recipes = list( singular_name = "plastic sheet" icon_state = "sheet-plastic" throwforce = 7 - flags = CONDUCT origin_tech = "materials=1" origin_tech = "materials=1;biotech=1" merge_type = /obj/item/stack/sheet/plastic @@ -379,6 +378,6 @@ var/global/list/datum/stack_recipe/plastic_recipes = list( /obj/item/stack/sheet/plastic/five amount = 5 -/obj/item/stack/sheet/plastic/New() +/obj/item/stack/sheet/plastic/Initialize(mapload, new_amount, merge = TRUE) recipes = plastic_recipes . = ..() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index eaef9c6809..e5f9026257 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -19,42 +19,45 @@ var/cost = 1 // How much energy from storage it costs var/merge_type = null // This path and its children should merge with this stack, defaults to src.type -/obj/item/stack/New(var/loc, var/amount=null) +/obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE) ..() - if (amount) - src.amount = amount + if(new_amount) + amount = new_amount if(!merge_type) - merge_type = src.type - return + merge_type = type + if(merge) + for(var/obj/item/stack/S in loc) + if(S.merge_type == merge_type) + merge(S) /obj/item/stack/Destroy() if (usr && usr.machine==src) usr << browse(null, "window=stack") - return ..() + . = ..() /obj/item/stack/examine(mob/user) ..() if (is_cyborg) if(src.singular_name) - user << "There is enough energy for [src.get_amount()] [src.singular_name]\s." + to_chat(user, "There is enough energy for [src.get_amount()] [src.singular_name]\s.") else - user << "There is enough energy for [src.get_amount()]." + to_chat(user, "There is enough energy for [src.get_amount()].") return if(src.singular_name) if(src.get_amount()>1) - user << "There are [src.get_amount()] [src.singular_name]\s in the stack." + to_chat(user, "There are [src.get_amount()] [src.singular_name]\s in the stack.") else - user << "There is [src.get_amount()] [src.singular_name] in the stack." + to_chat(user, "There is [src.get_amount()] [src.singular_name] in the stack.") else if(src.get_amount()>1) - user << "There are [src.get_amount()] in the stack." + to_chat(user, "There are [src.get_amount()] in the stack.") else - user << "There is [src.get_amount()] in the stack." + to_chat(user, "There is [src.get_amount()] in the stack.") /obj/item/stack/proc/get_amount() - if (is_cyborg) - return round(source.energy / cost) + if(is_cyborg) + . = round(source.energy / cost) else - return (amount) + . = (amount) /obj/item/stack/attack_self(mob/user) interact(user) @@ -101,7 +104,6 @@ t1 += "