") - new_ninja << "\blue \nYou are an elite mercenary assassin of the Spider Clan, [new_ninja.real_name]. The dreaded \red SPACE NINJA!\blue You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor. Remember your training! \nYour current mission is: \red [assign_mission]" + new_ninja.mind.store_memory("Mission: [assign_mission].
") + new_ninja << "\nYou are an elite mercenary assassin of the Spider Clan, [new_ninja.real_name]. The dreaded SPACE NINJA!You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor. Remember your training! \nYour current mission is: [assign_mission]" else if(xeno_list.len>3)//If there are more than three humanoid xenos on the station, time to get dangerous. //Here we want the ninja to murder all the queens. The other aliens don't really matter. @@ -374,11 +374,11 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp ninja_mind.objectives += ninja_objective var/directive = generate_ninja_directive(side) - new_ninja << "\blue \nYou are an elite mercenary assassin of the Spider Clan, [new_ninja.real_name]. The dreaded \red SPACE NINJA!\blue You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor. Remember your training (initialize your suit by right clicking on it)! \nYour current directive is: \red [directive]" - new_ninja.mind.store_memory("Directive: \red [directive]
") + new_ninja << "\nYou are an elite mercenary assassin of the Spider Clan, [new_ninja.real_name]. The dreaded SPACE NINJA!You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor. Remember your training (initialize your suit by right clicking on it)! \nYour current directive is: [directive]" + new_ninja.mind.store_memory("Directive: [directive]
") var/obj_count = 1 - new_ninja << "\blue Your current objectives:" + new_ninja << "Your current objectives:" for(var/datum/objective/objective in ninja_mind.objectives) new_ninja << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -483,7 +483,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. space_ninja_arrival(input, mission) - message_admins("\blue [key_name_admin(key)] has spawned [input] as a Space Ninja.\nTheir mission is: [mission]") + message_admins("[key_name_admin(key)] has spawned [input] as a Space Ninja.\nTheir mission is: [mission]") log_admin("[key] used Spawn Space Ninja.") return @@ -559,17 +559,17 @@ As such, it's hard-coded for now. No reason for it not to be, really. U:gloves.item_state = "s-ninjan" else if(U.mind.special_role!="Space Ninja") - U << "\red fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..." + U << "fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..." U.gib() return 0 if(!istype(U:head, /obj/item/clothing/head/helmet/space/space_ninja)) - U << "\red ERROR: 100113 \black UNABLE TO LOCATE HEAD GEAR\nABORTING..." + U << "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING..." return 0 if(!istype(U:shoes, /obj/item/clothing/shoes/space_ninja)) - U << "\red ERROR: 122011 \black UNABLE TO LOCATE FOOT GEAR\nABORTING..." + U << "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING..." return 0 if(!istype(U:gloves, /obj/item/clothing/gloves/space_ninja)) - U << "\red ERROR: 110223 \black UNABLE TO LOCATE HAND GEAR\nABORTING..." + U << "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING..." return 0 affecting = U @@ -704,7 +704,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. cancel_stealth() U << browse(null, "window=spideros") - U << "\red Do or Die, LET'S ROCK!!" + U << "Do or Die, LET'S ROCK!!" /obj/item/clothing/suit/space/space_ninja/proc/remove_kamikaze(mob/living/carbon/U) if(kamikaze) @@ -725,7 +725,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. U.incorporeal_move = 0 kamikaze = 0 k_unlock = 0 - U << "\blue Disengaging mode...\n\blackCODE NAME: \red KAMIKAZE" + U << "Disengaging mode...\n\blackCODE NAME: KAMIKAZE" //=======//AI VERBS//=======// @@ -781,13 +781,13 @@ spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to if(isturf(T) && T.is_plating()) attached = locate() in T if(!attached) - U << "\red Warning: no exposed cable available." + U << "Warning: no exposed cable available." else - U << "\blue Connecting to wire, stand still..." + U << "Connecting to wire, stand still..." if(do_after(U,50)&&!isnull(attached)) drain("WIRE",attached,U:wear_suit,src) else - U << "\red Procedure interrupted. Protocol terminated." + U << "Procedure interrupted. Protocol terminated." return I've tried a lot of stuff but adding verbs to the AI while inside an object, inside another object, did not want to work properly. diff --git a/code/game/gamemodes/events/spacevines.dm b/code/game/gamemodes/events/spacevines.dm index d095f19d564..a49039c5d6b 100644 --- a/code/game/gamemodes/events/spacevines.dm +++ b/code/game/gamemodes/events/spacevines.dm @@ -13,4 +13,4 @@ if(turfs.len) //Pick a turf to spawn at if we can var/turf/simulated/floor/T = pick(turfs) new/obj/effect/plant_controller(T) //spawn a controller at turf - message_admins("\blue Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])") + message_admins("Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])") diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 9746b90f14b..a14575344c6 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -193,10 +193,10 @@ var/extra = 4 suplink.uses += extra if(man.mind) man.mind.total_TC += extra - man << "\red We have received notice that enemy intelligence suspects you to be linked with us. We have thus invested significant resources to increase your uplink's capacity." + man << "We have received notice that enemy intelligence suspects you to be linked with us. We have thus invested significant resources to increase your uplink's capacity." else // Give them a warning! - man << "\red They are on to you!" + man << "They are on to you!" // Some poor people who were just in the wrong place at the wrong time.. else if(prob(10)) @@ -362,7 +362,7 @@ //Reports player logouts// ////////////////////////// proc/display_roundstart_logout_report() - var/msg = "\blue Roundstart logout report\n\n" + var/msg = "Roundstart logout report\n\n" for(var/mob/living/L in mob_list) if(L.ckey) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 9f79d585867..3ecb4e51e70 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -457,4 +457,67 @@ var/global/datum/controller/gameticker/ticker scoreboard() + if(bomberman_mode) + var/icon/bomberhead = icon('icons/obj/clothing/hats.dmi', "bomberman") + var/icon/bronze = icon('icons/obj/bomberman.dmi', "bronze") + var/icon/silver = icon('icons/obj/bomberman.dmi', "silver") + var/icon/gold = icon('icons/obj/bomberman.dmi', "gold") + var/icon/platinum = icon('icons/obj/bomberman.dmi', "platinum") + + var/list/bronze_tier = list() + for (var/mob/living/carbon/M in player_list) + if(locate(/obj/item/weapon/bomberman/) in M) + bronze_tier += M + var/list/silver_tier = list() + for (var/mob/M in bronze_tier) + if(M.z == map.zCentcomm) + silver_tier += M + bronze_tier -= M + var/list/gold_tier = list() + for (var/mob/M in silver_tier) + var/turf/T = get_turf(M) + if(istype(T.loc, /area/shuttle/escape/centcom)) + gold_tier += M + silver_tier -= M + var/list/platinum_tier = list() + for (var/mob/living/carbon/human/M in gold_tier) + if(istype(M.wear_suit, /obj/item/clothing/suit/space/bomberman) && istype(M.head, /obj/item/clothing/head/helmet/space/bomberman)) + var/obj/item/clothing/suit/space/bomberman/C1 = M.wear_suit + var/obj/item/clothing/head/helmet/space/bomberman/C2 = M.head + if(C1.never_removed && C2.never_removed) + platinum_tier += M + gold_tier -= M + + var/list/special_tier = list() + for (var/mob/living/silicon/robot/mommi/M in player_list) + if(istype(M.head_state, /obj/item/clothing/head/helmet/space/bomberman) && istype(M.tool_state, /obj/item/weapon/bomberman/)) + special_tier += M + + var/text = "\icon[bomberhead] Bomberman Mode Results \icon[bomberhead]" + if(!platinum_tier.len && !gold_tier.len && !silver_tier.len && !bronze_tier.len) + text += "
DRAW!" + if(platinum_tier.len) + text += "
\icon[platinum] Platinum Trophy (never removed his clothes, kept his bomb dispenser until the end, and escaped on the shuttle):" + for (var/mob/M in platinum_tier) + text += "
[M.real_name]" + if(gold_tier.len) + text += "
\icon[gold] Gold Trophy (kept his bomb dispenser until the end, and escaped on the shuttle):" + for (var/mob/M in gold_tier) + text += "
[M.real_name]" + if(silver_tier.len) + text += "
\icon[silver] Silver Trophy (kept his bomb dispenser until the end, and escaped in a pod):" + for (var/mob/M in silver_tier) + text += "
[M.real_name]" + if(bronze_tier.len) + text += "
\icon[bronze] Bronze Trophy (kept his bomb dispenser until the end):" + for (var/mob/M in bronze_tier) + text += "
[M.real_name]" + if(special_tier.len) + text += "
Special Mention to those adorable MoMMis:" + for (var/mob/M in special_tier) + text += "
[M]" + + + world << text + return 1 diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index f698ed7f90d..d737354d0d8 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -173,10 +173,10 @@ O.find_target() /datum/game_mode/heist/proc/greet_vox(const/datum/mind/raider) - raider.current << {"\blue You are a Vox Raider, fresh from the Shoal! + raider.current << {"You are a Vox Raider, fresh from the Shoal! The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to Tau Ceti and much of the unexplored galaxy. You and the crew have come to the Exodus for plunder, trade or both. Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious. -Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!"} +Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!"} var/obj_count = 0 @@ -230,7 +230,7 @@ Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to else win_msg += "The Vox Raiders were repelled!" - world << "\red [win_type] [win_group] victory!
[win_msg]" + world << "[win_type] [win_group] victory!
[win_msg]" feedback_set_details("round_end_result","heist - [win_type] [win_group]") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5a54626a89c..c9f1dc44ca4 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -48,7 +48,7 @@ rcd light flash thingy on matter drain for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 src.verbs -= /mob/living/silicon/ai/proc/fireproof_core - src << "\red Core fireproofed." + src << "Core fireproofed." /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret upgrade" @@ -105,7 +105,7 @@ rcd light flash thingy on matter drain if(overload.uses > 0) overload.uses -- for(var/mob/V in hearers(M, null)) - V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + V.show_message("You hear a loud electrical buzzing sound!", 2) spawn(50) explosion(get_turf(M), -1, 1, 2, 3) //C4 Radius + 1 Dest for the machine qdel(M) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 7f9f3c20356..2f187595dfa 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -50,7 +50,7 @@ Rebooting world in 5 seconds."} blackbox.save_all_data_to_sql() CallHook("Reboot",list()) if (watchdog.waiting) - world << "\blue Server will shut down for an automatic update in a few seconds." + world << "Server will shut down for an automatic update in a few seconds." watchdog.signal_ready() return sleep(50) diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index bd645759ad2..0ce49e6b83e 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -127,7 +127,7 @@ /datum/game_mode/proc/greet_meme(var/datum/mind/meme, var/you_are=1) if (you_are) - meme.current << "\red You are a meme!" + meme.current << "You are a meme!" var/obj_count = 1 for(var/datum/objective/objective in meme.objectives) @@ -161,10 +161,10 @@ var/count = 1 for(var/datum/objective/objective in meme.objectives) if(objective.check_completion()) - world << "Objective #[count]: [objective.explanation_text] \green Success" + world << "Objective #[count]: [objective.explanation_text] Success" feedback_add_details("meme_objective","[objective.type]|SUCCESS") else - world << "Objective #[count]: [objective.explanation_text] \red Failed" + world << "Objective #[count]: [objective.explanation_text] Failed" feedback_add_details("meme_objective","[objective.type]|FAIL") memewin = 0 count++ diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 46f26334cce..63e32e89437 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -196,7 +196,7 @@ /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) if (you_are) - syndicate.current << "\blue You are a [syndicate_name()] agent!" + syndicate.current << "You are a [syndicate_name()] agent!" var/obj_count = 1 for(var/datum/objective/objective in syndicate.objectives) syndicate.current << "Objective #[obj_count]: [objective.explanation_text]" @@ -236,7 +236,7 @@ if(istype(synd_mob.species, /datum/species/vox)) synd_mob.equip_or_collect(new /obj/item/clothing/mask/breath/vox(synd_mob), slot_wear_mask) synd_mob.equip_to_slot_or_del(new/obj/item/weapon/tank/nitrogen(synd_mob), slot_r_hand) - synd_mob << "\blue You are now running on nitrogen internals from the [slot_r_hand] in your right hand. Your species finds oxygen toxic, so you must breathe nitrogen (AKA N2) only." + synd_mob << "You are now running on nitrogen internals from the [slot_r_hand] in your right hand. Your species finds oxygen toxic, so you must breathe nitrogen (AKA N2) only." synd_mob.internal = synd_mob.get_item_by_slot(tank_slot) if (synd_mob.internals) synd_mob.internals.icon_state = "internal1" diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index de82ac75f11..5185905aefd 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -38,7 +38,7 @@ var/bomb_set /obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob) if (src.extended) if (istype(O, /obj/item/weapon/disk/nuclear)) - usr.drop_item(src) + usr.drop_item(O, src) src.auth = O src.add_fingerprint(user) return @@ -51,7 +51,7 @@ var/bomb_set var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + user << "You need more fuel to complete this task." return user.visible_message("[user] starts cutting loose the anchoring bolt covers on [src].", "You start cutting loose the anchoring bolt covers with [O]...") @@ -159,7 +159,7 @@ var/bomb_set set name = "Make Deployable" set src in oview(1) - if (!usr || usr.stat || usr.lying) return + if (!usr || usr.stat || usr.lying || (usr.status_flags & FAKEDEATH)) return if (!ishuman(usr)) usr << "You don't have the dexterity to do this!" return @@ -176,7 +176,7 @@ var/bomb_set if (!usr.canmove || usr.stat || usr.restrained()) return if (!ishuman(usr)) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 if (istype(src.loc, /turf)) usr.set_machine(src) @@ -188,7 +188,7 @@ var/bomb_set else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/disk/nuclear)) - usr.drop_item(src) + usr.drop_item(I, src) src.auth = I if (src.auth) if (href_list["type"]) @@ -319,7 +319,7 @@ var/bomb_set CallHook("Reboot",list()) if (watchdog.waiting) - world << "\blue Server will shut down for an automatic update in a few seconds." + world << "Server will shut down for an automatic update in a few seconds." watchdog.signal_ready() return sleep(300) @@ -327,7 +327,9 @@ var/bomb_set world.Reboot() return return - +/** + * NOTE: Don't change it to Destroy(). + */ /obj/item/weapon/disk/nuclear/Del() if(blobstart.len > 0) var/picked_turf = get_turf(pick(blobstart)) diff --git a/code/game/gamemodes/revolution/anti_revolution.dm b/code/game/gamemodes/revolution/anti_revolution.dm index 710b96e797e..bbac23b2e42 100644 --- a/code/game/gamemodes/revolution/anti_revolution.dm +++ b/code/game/gamemodes/revolution/anti_revolution.dm @@ -99,8 +99,8 @@ /datum/game_mode/proc/greet_head(var/datum/mind/head_mind, var/you_are=1) var/obj_count = 1 if (you_are) - head_mind.current << "\blue It looks like this shift CentComm has some special orders for you.. check your objectives." - head_mind.current << "\blue Note that you can ignore these objectives, but resisting NT's orders probably means demotion or worse." + head_mind.current << "It looks like this shift CentComm has some special orders for you.. check your objectives." + head_mind.current << "Note that you can ignore these objectives, but resisting NT's orders probably means demotion or worse." for(var/datum/objective/objective in head_mind.objectives) head_mind.current << "Objective #[obj_count]: [objective.explanation_text]" head_mind.special_role = "Corrupt Head" @@ -155,9 +155,9 @@ var/text = "" if(finished == 2) - world << "\red The heads of staff were relieved of their posts! The crew wins!" + world << " The heads of staff were relieved of their posts! The crew wins!" else if(finished == 1) - world << "\red The heads of staff managed to meet the goals set for them by CentComm!" + world << " The heads of staff managed to meet the goals set for them by CentComm!" @@ -219,4 +219,4 @@ src.verbs -= /mob/proc/ResignFromHeadPosition - src << "\red You resigned from your position, now you have the consequences." \ No newline at end of file + src << "You resigned from your position, now you have the consequences." \ No newline at end of file diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 74f13215971..f25526bfa4e 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -118,7 +118,7 @@ /datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + rev_mind.current << "You are a member of the revolutionaries' leadership!" for(var/datum/objective/objective in rev_mind.objectives) rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" rev_mind.special_role = "Head Revolutionary" @@ -198,7 +198,7 @@ return -4 revolutionaries += rev_mind - rev_mind.current << "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!" + 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.special_role = "Revolutionary" update_rev_icons_added(rev_mind) @@ -212,10 +212,10 @@ rev_mind.special_role = null if(beingborged) - rev_mind.current << "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now." + rev_mind.current << "The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now." else - rev_mind.current << "\red You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you..." + 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)) @@ -358,10 +358,10 @@ /datum/game_mode/revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads killed") - world << "\red The heads of staff were killed or abandoned the station! The revolutionaries win!" + world << " The heads of staff were killed or abandoned the station! The revolutionaries win!" else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "\red The heads of staff managed to stop the revolution!" + world << " The heads of staff managed to stop the revolution!" ..() return 1 diff --git a/code/game/gamemodes/revolution/rp-revolution.dm b/code/game/gamemodes/revolution/rp-revolution.dm index 7456e73403b..b794b2c6631 100644 --- a/code/game/gamemodes/revolution/rp-revolution.dm +++ b/code/game/gamemodes/revolution/rp-revolution.dm @@ -62,7 +62,7 @@ var/rev_number = 0 if(!revs_possible || !heads) - world << " \red Not enough players for RP revolution game mode. Restarting world in 5 seconds." + world << " Not enough players for RP revolution game mode. Restarting world in 5 seconds." sleep(50) world.Reboot() return @@ -88,7 +88,7 @@ for(var/datum/mind/rev_mind in head_revolutionaries) var/obj_count = 1 - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + rev_mind.current << "You are a member of the revolutionaries' leadership!" for(var/datum/objective/objective in rev_mind.objectives) rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -229,9 +229,9 @@ var/text = "" if(finished == 1) - world << "\red The heads of staff were relieved of their posts! The revolutionaries win!" + world << " The heads of staff were relieved of their posts! The revolutionaries win!" else if(finished == 2) - world << "\red The heads of staff managed to stop the revolution!" + world << " The heads of staff managed to stop the revolution!" world << "The head revolutionaries were: " for(var/datum/mind/rev_mind in head_revolutionaries) @@ -286,22 +286,22 @@ mob/living/carbon/human/proc set name = "Rev-Convert" if(((src.mind in ticker.mode:head_revolutionaries) || (src.mind in ticker.mode:revolutionaries))) if((M.mind in ticker.mode:head_revolutionaries) || (M.mind in ticker.mode:revolutionaries)) - src << "\red [M] is already be a revolutionary!" + src << "[M] is already be a revolutionary!" else if(src.mind in ticker.mode:get_unconvertables()) - src << "\red [M] cannot be a revolutionary!" + src << "[M] cannot be a revolutionary!" else if(world.time < M.mind.rev_cooldown) - src << "\red Wait five seconds before reconversion attempt." + src << "Wait five seconds before reconversion attempt." return - src << "\red Attempting to convert [M]..." + src << "Attempting to convert [M]..." log_admin("[src]([src.ckey]) attempted to convert [M].") - message_admins("\red [src]([src.ckey]) attempted to convert [M].") + message_admins("[src]([src.ckey]) attempted to convert [M].") var/choice = alert(M,"Asked by [src]: Do you want to join the revolution?","Align Thyself with the Revolution!","No!","Yes!") if(choice == "Yes!") ticker.mode:add_revolutionary(M.mind) - M << "\blue You join the revolution!" - src << "\blue [M] joins the revolution!" + M << "You join the revolution!" + src << "[M] joins the revolution!" else if(choice == "No!") - M << "\red You reject this traitorous cause!" - src << "\red [M] does not support the revolution!" + M << "You reject this traitorous cause!" + src << "[M] does not support the revolution!" M.mind.rev_cooldown = world.time+50 \ No newline at end of file diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 6a3f6edf6fa..02c808cf934 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -80,7 +80,7 @@ /datum/game_mode/revolution/rp_revolution/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + rev_mind.current << "You are a member of the revolutionaries' leadership!" for(var/datum/objective/objective in rev_mind.objectives) rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" rev_mind.special_role = "Head Revolutionary" @@ -108,7 +108,7 @@ if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) return 0 revolutionaries += rev_mind - rev_mind.current << "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill, capture or convert the heads to win the revolution!" + 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, capture or convert the heads to win the revolution!" rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) return 1 @@ -142,10 +142,10 @@ /datum/game_mode/revolution/rp_revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads overthrown") - world << "\red The heads of staff were overthrown! The revolutionaries win!" + world << " The heads of staff were overthrown! The revolutionaries win!" else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") - world << "\red The heads of staff managed to stop the revolution!" + world << " The heads of staff managed to stop the revolution!" ..() return 1 @@ -161,24 +161,24 @@ set category = "IC" if(((src.mind in ticker.mode:head_revolutionaries) || (src.mind in ticker.mode:revolutionaries))) if((M.mind in ticker.mode:head_revolutionaries) || (M.mind in ticker.mode:revolutionaries)) - src << "\red [M] is already be a revolutionary!" + src << "[M] is already be a revolutionary!" else if(!ticker.mode:is_convertible(M)) - src << "\red [M] is implanted with a loyalty implant - Remove it first!" + src << "[M] is implanted with a loyalty implant - Remove it first!" else if(world.time < M.mind.rev_cooldown) - src << "\red Wait five seconds before reconversion attempt." + src << "Wait five seconds before reconversion attempt." return - src << "\red Attempting to convert [M]..." + src << "Attempting to convert [M]..." log_admin("[src]([src.ckey]) attempted to convert [M].") - message_admins("\red [src]([src.ckey]) attempted to convert [M].") + message_admins("[src]([src.ckey]) attempted to convert [M].") var/choice = alert(M,"Asked by [src]: Do you want to join the revolution?","Align Thyself with the Revolution!","No!","Yes!") if(choice == "Yes!") ticker.mode:add_revolutionary(M.mind) - M << "\blue You join the revolution!" - src << "\blue [M] joins the revolution!" + M << "You join the revolution!" + src << "[M] joins the revolution!" else if(choice == "No!") - M << "\red You reject this traitorous cause!" - src << "\red [M] does not support the revolution!" + M << "You reject this traitorous cause!" + src << "[M] does not support the revolution!" M.mind.rev_cooldown = world.time+50 /datum/game_mode/revolution/rp_revolution/process() @@ -205,7 +205,7 @@ update_rev_icons_added(H.mind) H.verbs += /mob/living/carbon/human/proc/RevConvert - H << "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion." + H << "Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion." added_heads = 1 break @@ -251,4 +251,4 @@ rev_obj.target = M.mind rev_obj.explanation_text = "Assassinate, convert or capture [M.real_name], the [M.mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated." \ No newline at end of file + rev_mind.current << "A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated." \ No newline at end of file diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 4c5b48f47ab..5ae81d4903d 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -34,30 +34,29 @@ L += get_contents(D.wrapped) return L -/datum/theft_objective/proc/check_completion(var/datum/mind/owner) - if(!owner.current) - return 0 - var/list/all_items = list() - if(isliving(owner.current)) - all_items = owner.current.get_contents() - if(areas.len) - for(var/areatype in areas) - var/area/area = locate(areatype) - for(var/obj/O in area) - all_items += O - all_items += get_contents(O) - if(all_items.len) - for(var/obj/I in all_items) //Check for items - if(istype(I, typepath)) - //Stealing the cheap autoinjector doesn't count - if(istype(I, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) - continue - if(areas.len) - if(!is_type_in_list(get_area_master(I),areas)) - continue - return 1 - return 0 +/datum/theft_objective/proc/check_completion(datum/mind/owner) + if (owner && owner.current) + var/all_items = new/list() + if (isliving(owner.current)) + all_items += get_contents_in_object(owner.current) + + for (var/area_type in areas) + all_items += get_contents_in_object(locate(area_type), /obj) + + for (var/obj/O in all_items) + + if (istype(O, typepath)) + if (istype(O, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) // stealing the cheap autoinjector doesn't count + continue + + if (areas.len) + if (!is_type_in_list(get_area_master(O), areas)) + continue + + return 1 + + return 0 /datum/theft_objective/traitor/antique_laser_gun name = "the captain's antique laser gun" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 4d1691ad255..084daa978e7 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -162,14 +162,18 @@ /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) - traitor.current << "You are the traitor." - traitor.current << sound('sound/voice/syndicate intro.ogg') - var/obj_count = 1 - for(var/datum/objective/objective in traitor.objectives) - traitor.current << "Objective #[obj_count]: [objective.explanation_text]" - obj_count++ - return + traitor.current << {" + You are now a traitor! + "} + traitor.current << sound('sound/voice/syndicate intro.ogg') + + var/obj_count = 1 + + for (var/datum/objective/objective in traitor.objectives) + traitor.current << "Objective #[obj_count]: [objective.explanation_text]" + + obj_count++ /datum/game_mode/proc/finalize_traitor(var/datum/mind/traitor) if (istype(traitor.current, /mob/living/silicon)) @@ -201,12 +205,12 @@ //Begin code phrase. killer << "The Syndicate provided you with the following information on how to identify their agents:" if(prob(80)) - killer << "\red Code Phrase: \black [syndicate_code_phrase]" + killer << "Code Phrase: [syndicate_code_phrase]" killer.mind.store_memory("Code Phrase: [syndicate_code_phrase]") else killer << "Unfortunately, the Syndicate did not provide you with a code phrase." if(prob(80)) - killer << "\red Code Response: \black [syndicate_code_response]" + killer << "Code Response: [syndicate_code_response]" killer.mind.store_memory("Code Response: [syndicate_code_response]") else killer << "Unfortunately, the Syndicate did not provide you with a code response." @@ -321,12 +325,12 @@ if(!safety)//If they are not a rev. Can be added on to. traitor_mob << "The Syndicate provided you with the following information on how to identify other agents:" if(prob(80)) - traitor_mob << "\red Code Phrase: \black [syndicate_code_phrase]" + traitor_mob << "Code Phrase: [syndicate_code_phrase]" traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") else traitor_mob << "Unfortunetly, the Syndicate did not provide you with a code phrase." if(prob(80)) - traitor_mob << "\red Code Response: \black [syndicate_code_response]" + traitor_mob << "Code Response: [syndicate_code_response]" traitor_mob.mind.store_memory("Code Response: [syndicate_code_response]") else traitor_mob << "Unfortunately, the Syndicate did not provide you with a code response." @@ -400,4 +404,4 @@ traitor_mind.special_role = null update_traitor_icons_removed(traitor_mind) //world << "Removed [traitor_mind.current.name] from traitor shit" - traitor_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)" + traitor_mind.current << "The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)" diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index bfb529bb6b0..d90ad02005d 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -201,7 +201,7 @@ /datum/game_mode/proc/greet_vampire(var/datum/mind/vampire, var/you_are=1) var/dat if (you_are) - dat = "\red You are a Vampire! \black" + dat = "You are a Vampire!" dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} vampire.current << dat @@ -319,7 +319,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha bloodtotal = src.mind.vampire.bloodtotal bloodusable = src.mind.vampire.bloodusable if(!H.vessel.get_reagent_amount("blood")) - src << "\red They've got no blood left to give." + src << "They've got no blood left to give." break if(H.stat < 2) //alive blood = min(10, H.vessel.get_reagent_amount("blood"))// if they have less than 10 blood, give them the remnant else they get 10 blood @@ -365,7 +365,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha vamp.powers |= VAMP_BATS vamp.powers |= VAMP_SCREAM // Commented out until we can figured out a way to stop this from spamming. - //src << "\blue Your rejuvination abilities have improved and will now heal you over time when used." + //src << "Your rejuvination abilities have improved and will now heal you over time when used." // TIER 3.5 (/vg/) if(vamp.bloodtotal >= 250) @@ -503,7 +503,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha update_vampire_icons_removed(vampire_mind) vampire_mind.current.unsubLife(src) //world << "Removed [vampire_mind.current.name] from vampire shit" - vampire_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now." + vampire_mind.current << "The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now." /mob/living/carbon/human/proc/check_sun() diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index aab5bace0d9..d8731c4c1d8 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -180,7 +180,7 @@ var/mob/living/carbon/C = M.current.vampire_active(50, 0, 1) if(!C) return if(!M.current.vampire_can_reach(C, 1)) - M.current << "You cannot touch [C.name] from where you are standing!" + M.current << "You cannot touch [C.name] from where you are standing!" return M.current << "You stealthily infect [C.name] with your diseased touch." C.help_shake_act(M.current) // i use da colon @@ -213,7 +213,7 @@ var/datum/mind/M = usr.mind if(!M) return if(M.current.vampire_power(0, 1)) - M.current.visible_message("[M.current.name]'s eyes emit a blinding flash!") + M.current.visible_message("[M.current.name]'s eyes emit a blinding flash!") //M.vampire.bloodusable -= 10 M.current.verbs -= /client/proc/vampire_glare spawn(300) @@ -274,7 +274,7 @@ if(C == M.current) continue if(ishuman(C) && C:is_on_ears(/obj/item/clothing/ears/earmuffs)) continue if(!C.vampire_affected(M)) continue - C << "You hear a ear piercing shriek and your senses dull!" + C << "You hear a ear piercing shriek and your senses dull!" C.Weaken(8) C.ear_deaf = 20 C.stuttering = 20 diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 492d79de46c..a292c763ef8 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -35,7 +35,7 @@ if(charged == 1) new /obj/effect/rend(get_turf(usr)) charged = 0 - visible_message("[src] hums with power as [usr] deals a blow to reality itself!") + visible_message("[src] hums with power as [usr] deals a blow to reality itself!") else user << "The unearthly energies that powered the blade are now dormant." @@ -49,7 +49,7 @@ if(charged) new /obj/effect/rend/cow(get_turf(usr)) charged = 0 - visible_message("[src] hums with power as [usr] deals a blow to hunger itself!") + visible_message("[src] hums with power as [usr] deals a blow to hunger itself!") else user << "The unearthly energies that powered the blade are now dormant." @@ -70,7 +70,7 @@ /obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/nullrod)) - visible_message("[I] strikes a blow against \the [src], banishing it!") + visible_message("[I] strikes a blow against \the [src], banishing it!") spawn(1) del src return @@ -93,7 +93,7 @@ /obj/item/weapon/scrying/attack_self(mob/user as mob) user << "You can see...everything!" - visible_message("[usr] stares into [src], their eyes glazing over.") + visible_message("[usr] stares into [src], their eyes glazing over.") user.ghostize(1) return diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 8a1adffaecf..a799f9ca95a 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -10,7 +10,7 @@ /datum/game_mode/wizard/announce() world << "The current game mode is - Ragin' Mages!" - world << "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!" + world << "The Space Wizard Federation is pissed, help defeat all the space wizards!" /datum/game_mode/wizard/raginmages/post_setup() var/playercount = 0 @@ -23,7 +23,7 @@ /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" + wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" var/obj_count = 1 @@ -44,7 +44,7 @@ continue if(wizard.current.stat==1) if(wizard.current.health < 0) - wizard.current << "\red The Space Wizard Federation is upset with your performance and have terminated your employment." + wizard.current << "The Space Wizard Federation is upset with your performance and have terminated your employment." wizard.current.stat = 2 continue wizards_alive++ @@ -100,5 +100,5 @@ /datum/game_mode/wizard/raginmages/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" + 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) \ No newline at end of file diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 924871f7821..3f917aee032 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -110,4 +110,4 @@ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO - H << "\blue The walls suddenly disappear." + H << "The walls suddenly disappear." diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 8bff37a3a8b..de38ec39155 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -120,16 +120,16 @@ return if(C.imprinted != "empty") - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + U << "Capture failed!: The soul stone has already been imprinted with [C.imprinted]'s mind!" else if (T.stat == CONSCIOUS) - U << "\red Capture failed!: \black Kill or maim the victim first!" + U << "Capture failed!: Kill or maim the victim first!" else if(T.isInCrit() || T.stat == DEAD) if(T.client == null) - U << "\red Capture failed!: \black The soul has already fled it's mortal frame." + U << "Capture failed!: The soul has already fled it's mortal frame." else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + U << "Capture failed!: The soul stone is full! Use or free an existing soul to make room." else for(var/obj/item/W in T) T.drop_from_inventory(W) @@ -154,7 +154,7 @@ C.icon_state = "soulstone2" C.name = "Soul Stone: [S.real_name]" S << "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs." - U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." + U << "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone." U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." C.imprinted = "[S.name]" var/ref = "\ref[U.mind]" @@ -172,13 +172,13 @@ var/mob/living/simple_animal/shade/T = target var/obj/item/device/soulstone/C = src if (T.stat == DEAD) - U << "\red Capture failed!: \black The shade has already been banished!" + U << "Capture failed!: The shade has already been banished!" else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + U << "Capture failed!: The soul stone is full! Use or free an existing soul to make room." else if(T.name != C.imprinted) - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + U << "Capture failed!: The soul stone has already been imprinted with [C.imprinted]'s mind!" else T.loc = C //put shade in stone T.status_flags |= GODMODE @@ -186,7 +186,7 @@ T.health = T.maxHealth C.icon_state = "soulstone2" T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form" - U << "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone." + U << "Capture successful!: [T.name]'s has been recaptured and stored within the soul stone." if("CONSTRUCT") var/obj/structure/constructshell/T = target var/obj/item/device/soulstone/C = src @@ -252,7 +252,7 @@ ticker.mode.update_necro_icons_added(Z.mind) ticker.mode.risen.Add(Z.mind) else - U << "Creation failed!: \black The soul stone is empty! Go kill someone!" + U << "Creation failed!: The soul stone is empty! Go kill someone!" ticker.mode.update_all_necro_icons() if(deleteafter) for(var/atom/A in src)//we get rid of the empty shade once we've transferred its mind to the construct, so it isn't dropped on the floor when the soulstone is destroyed. diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index ff33d70e44f..4f08f8c7be7 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -71,13 +71,15 @@ This spell will curse a person to wear an unremovable horse mask (it has glue on the inside) and speak like a horse. It does not require wizard garb.
The French Curse (30)
This spell silences sombody adjacent to you, and curses them with an unremovable Mime costume.
+ Shoe Snatching Charm (15)
+ This spell will remove your victim's shoes and materialize them in your hands. This spell does not require robes to cast.
Flesh to Stone (60)
This spell will curse a person to immediately turn into an unmoving statue. The effect will eventually wear off if the statue is not destroyed.
Butt-Bot's Revenge (50)
Summon the power of the butt gods to remove the anus of your enemy.
[!istype(ticker.mode, /datum/game_mode/wizard/raginmages) ? "Summon Guns (One time use, global spell)
Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!
" : ""] Summon Chariot (1/1)
- Summon the most badass ride in all of wizardry. It can phase through walls, and is just badass.
+ Summon the most badass ride in all of wizardry.
Remove Clothes Requirement Warning: this takes away 2 spell choices.
Artefacts:
@@ -243,6 +245,10 @@ feedback_add_details("wizard_spell_learned","FC") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells H.add_spell(new/spell/targeted/frenchcurse) temp = "You have learned the french curse." + if("shoesnatch") + feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells + H.add_spell(new/spell/targeted/shoesnatch) + temp = "You have learned the shoe snatching charm." if("fleshtostone") feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells H.add_spell(new/spell/targeted/flesh_to_stone) @@ -312,7 +318,7 @@ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO - H << "\blue The walls suddenly disappear." + H << "The walls suddenly disappear." temp = "You have purchased a scrying orb, and gained x-ray vision." max_uses-- if("chariot") diff --git a/code/game/gamemodes/wizard/veilrender.dm b/code/game/gamemodes/wizard/veilrender.dm index 225158465fa..21d8d017822 100644 --- a/code/game/gamemodes/wizard/veilrender.dm +++ b/code/game/gamemodes/wizard/veilrender.dm @@ -33,7 +33,7 @@ if(charged == 1) new /obj/effect/rend(get_turf(usr)) charged = 0 - visible_message("\red [src] hums with power as [usr] deals a blow to reality itself!") + visible_message("[src] hums with power as [usr] deals a blow to reality itself!") else - user << "\red The unearthly energies that powered the blade are now dormant" + user << "The unearthly energies that powered the blade are now dormant" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 2881ee0d758..7249df9e549 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -23,7 +23,7 @@ /datum/game_mode/wizard/announce() world << "The current game mode is - Wizard!" - world << "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!" + world << "There is a SPACE WIZARD on the station. You can't let him achieve his objective!" /datum/game_mode/wizard/can_start()//This could be better, will likely have to recode it later @@ -50,7 +50,7 @@ wizard.special_role = "Wizard" wizard.original = wizard.current if(wizardstart.len == 0) - wizard.current << "\red A starting location for you could not be found, please report this bug!" + wizard.current << "A starting location for you could not be found, please report this bug!" return 0 return 1 @@ -146,7 +146,7 @@ /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" + wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" var/obj_count = 1 @@ -235,7 +235,7 @@ /datum/game_mode/wizard/declare_completion(var/ragin = 0) if(finished && !ragin) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" + 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!" ..() return 1 @@ -294,7 +294,7 @@ //To batch-remove wizard spells. Linked to mind.dm. /mob/proc/spellremove(var/mob/M as mob) for(var/spell/spell_to_remove in src.spell_list) - del(spell_to_remove) + remove_spell(spell_to_remove) // Does this clothing slot count as wizard garb? (Combines a few checks) /proc/is_wiz_garb(var/obj/item/clothing/C) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index da5359f35f6..d652b07fa6b 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -258,6 +258,8 @@ else H.equip_or_collect(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) + H.real_name = pick(clown_names) + H.rename_self("clown") return 1 @@ -299,6 +301,7 @@ H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) H.add_spell(new /spell/aoe_turf/conjure/forcewall/mime, "grey_spell_ready") H.miming = 1 + H.rename_self("mime") return 1 diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 7742c191d4a..f33119de47d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -17,7 +17,7 @@ var/global/datum/controller/occupations/job_master occupations = list() var/list/all_jobs = typesof(/datum/job) if(!all_jobs.len) - world << "\red \b Error setting up jobs, no job datums found" + world << "Error setting up jobs, no job datums found" return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -385,7 +385,7 @@ var/global/datum/controller/occupations/job_master H.mind.store_memory(remembered_info) spawn(0) - H << "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]" + H << "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]" var/alt_title = null if(H.mind) diff --git a/code/game/jobs/job_objective.dm b/code/game/jobs/job_objective.dm index 2720ec0cfd1..1e7be83ecba 100644 --- a/code/game/jobs/job_objective.dm +++ b/code/game/jobs/job_objective.dm @@ -100,7 +100,7 @@ var/hopobjectives = pick("Require that staff take a daily exercise regiment.", " var/assistantobjectives = pick("Get a haircut.", "Get a real job.", "Don't be a slob.", "Start your own business.", "Become a salesman.","Befriend a clown.", "Convince a mime to speak.") var/touristobjectives = pick("Take pictures of all the things. All of them.", "Befriend a clown.", "Convince a mime to speak.", "Get hired on the station.", "Become an assistant.", "Escape with your camera.") var/clownobjectives = pick("You are a mouse.", "Grunt ominously whenever possible.", "Epilepsy is fun, flicker lights whenever you can!", "Your name is Joe 6-pack.", "Refer to humans as puppies.", "Insult heads of staff on every request, while acquiescing.", "Advertise parties in your office, but don't deliver.", "Prevent non-dwarves from operating the power core.", "The ship needs elected officials.", "Only bearded people are human.", "Turn on the microphone on every intercom you see.", "Wrench is a lightbulb.", "Toolbox is a medkit.", "Everyone is wearing a pretty pink dress!", "The monkeys are plotting a hostile takeover of the ship. Inform the crew, and get them to take action against this", "Refer to the captain as \"Princess\" at all times.", "The crew must construct additional pylons.", "You must always lie.", "All answers must be in the form of a question.", "The station is an airplane.", "Happiness is mandatory.", "Today is laundry day.", "The word \"it\" is painful to you.", "You must act passive aggressively.", "Crew ranks have been reversed.", "It's Friday.", "It's backwards day.", "Give relationship advice to anyone who speaks to you.", "You are the ship psychologist. Give advice to the crew.", "You do not have to do anything for anyone unless they say \"please\"." ) - var/mimeobjectives = pick("...", "...", "...", "...", "...", "...", "\red The narrator appears to try gesturing your objective to you, but fails miserably.") + var/mimeobjectives = pick("...", "...", "...", "...", "...", "...", "The narrator appears to try gesturing your objective to you, but fails miserably.") var/chaplainobjectives = pick("Convert at least three other people to your religion..", "Hold a proper space burial.", "Build a shrine to your deity.", "Collect Ð18 in donations.", "Start a cult.", "Get someone to confess.", "Do your own radio show over the intercoms and accept calls.") //Civilian Jobs diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 2f5772b7ad2..4c4d92428b6 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -47,8 +47,8 @@ /obj/machinery/optable/attack_paw(mob/user as mob) if ((M_HULK in usr.mutations)) - usr << text("\blue You destroy the operating table.") - visible_message("\red [usr] destroys the operating table!") + usr << text("You destroy the operating table.") + visible_message("[usr] destroys the operating table!") src.density = 0 del(src) if (!( locate(/obj/machinery/optable, user.loc) )) @@ -60,8 +60,8 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if (M_HULK in usr.mutations) - usr << text("\blue You destroy the table.") - visible_message("\red [usr] destroys the operating table!") + usr << text("You destroy the table.") + visible_message("[usr] destroys the operating table!") src.density = 0 del(src) return @@ -79,7 +79,7 @@ if ((( istype(O, /obj/item/weapon) ) || user.get_active_hand() == O)) - user.drop_item() + user.drop_item(O) if (O.loc != src.loc) step(O, get_dir(O, src)) return @@ -106,7 +106,7 @@ L.client.eye = src L.resting = 1 L.loc = src.loc - visible_message("\red [L] has been laid on the operating table by [user].", 3) + visible_message("[L] has been laid on the operating table by [user].", 3) for(var/obj/OO in src) OO.loc = src.loc src.add_fingerprint(user) @@ -133,7 +133,7 @@ if (C == user) user.visible_message("[user] climbs on the operating table.","You climb on the operating table.") else - visible_message("\red [C] has been laid on the operating table by [user].", 3) + visible_message("[C] has been laid on the operating table by [user].", 3) if (C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src @@ -154,11 +154,11 @@ set category = "Object" set src in oview(1) - if(usr.stat || !ishuman(usr) || usr.buckled || usr.restrained()) + if(usr.stat || !ishuman(usr) || usr.buckled || usr.restrained() || (usr.status_flags & FAKEDEATH)) return if(src.victim) - usr << "\blue The table is already occupied!" + usr << "The table is already occupied!" return take_victim(usr,usr) @@ -170,5 +170,5 @@ del(W) return if(isrobot(user)) return - user.drop_item(src.loc) + user.drop_item(W, src.loc) return \ No newline at end of file diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 0f328a06c34..b5bd31ffa54 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -94,11 +94,11 @@ if (src.connected) if (src.connected.occupant) if (src.connected.occupant.stat == DEAD) - usr << "\red \b This person has no life for to preserve anymore. Take them to a department capable of reanimating them." + usr << "This person has no life for to preserve anymore. Take them to a department capable of reanimating them." else if(src.connected.occupant.health > 0 || href_list["chemical"] == "inaprovaline") src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"])) else - usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" + usr << "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" if (href_list["refresh"]) src.updateUsrDialog() src.add_fingerprint(usr) @@ -177,7 +177,7 @@ if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "\blue Subject cannot have abiotic items on." + user << "Subject cannot have abiotic items on." return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) @@ -190,7 +190,7 @@ if(do_after(user, 20)) if(src.occupant) - user << "\blue The sleeper is already occupied!" + user << "The sleeper is already occupied!" return if(!L || L.buckled) return @@ -202,7 +202,7 @@ src.icon_state = "sleeper_1" if(orient == "RIGHT") icon_state = "sleeper_1-r" - L << "\blue You feel cool air surround you. You go numb as your senses turn inward." + L << "You feel cool air surround you. You go numb as your senses turn inward." for(var/obj/OO in src) OO.loc = src.loc src.add_fingerprint(user) @@ -234,7 +234,7 @@ return if(G.affecting.buckled) return if(src.occupant) - user << "\blue The sleeper is already occupied!" + user << "The sleeper is already occupied!" return for(var/mob/living/carbon/slime/M in range(1,G.affecting)) @@ -246,7 +246,7 @@ if(do_after(user, 20)) if(src.occupant) - user << "\blue The sleeper is already occupied!" + user << "The sleeper is already occupied!" return if(!G || !G.affecting) return var/mob/M = G.affecting @@ -261,7 +261,7 @@ if(orient == "RIGHT") icon_state = "sleeper_1-r" - M << "\blue You feel cool air surround you. You go numb as your senses turn inward." + M << "You feel cool air surround you. You go numb as your senses turn inward." for(var/obj/O in src) O.loc = src.loc @@ -347,7 +347,7 @@ /obj/machinery/sleeper/proc/check(mob/living/user as mob) if(src.occupant) - user << text("\blue Occupant ([]) Statistics:", src.occupant) + user << text("Occupant ([]) Statistics:", src.occupant) var/t1 switch(src.occupant.stat) if(0.0) @@ -357,16 +357,16 @@ if(2.0) t1 = "*dead*" else - user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "\blue " : "\red "), src.occupant.health, t1) + user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "" : ""), src.occupant.health, t1) user << text("[]\t -Core Temperature: []°C ([]°F)
", (src.occupant.bodytemperature > 50 ? "" : ""), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67) - user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss()) - user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss()) - user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss()) - user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss()) - user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)" - user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5) + user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "" : ""), src.occupant.getBruteLoss()) + user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "" : ""), src.occupant.getOxyLoss()) + user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "" : ""), src.occupant.getToxLoss()) + user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "" : ""), src.occupant.getFireLoss()) + user << "Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)" + user << text("\t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5) else - user << "\blue There is no one inside!" + user << "There is no one inside!" return @@ -374,7 +374,7 @@ set name = "Eject Sleeper" set category = "Object" set src in oview(1) - if(usr.stat != 0) + if(usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return if(orient == "RIGHT") icon_state = "sleeper_0-r" @@ -388,13 +388,13 @@ set name = "Enter Sleeper" set category = "Object" set src in oview(1) - if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr))) + if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr)) || (usr.status_flags & FAKEDEATH)) return if(src.occupant) - usr << "\blue The sleeper is already occupied!" + usr << "The sleeper is already occupied!" return - if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other + if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting || (usr.status_flags & FAKEDEATH)) //are you cuffed, dying, lying, stunned or other return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) @@ -405,7 +405,7 @@ visible_message("[usr] starts climbing into the sleeper.", 3) if(do_after(usr, 20)) if(src.occupant) - usr << "\blue The sleeper is already occupied!" + usr << "The sleeper is already occupied!" return if(usr.buckled) return diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 872b9eac843..36615d760f0 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -83,7 +83,7 @@ set category = "Object" set name = "Eject Body Scanner" - if(usr.stat != 0) + if(usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return src.go_out() add_fingerprint(usr) @@ -94,7 +94,7 @@ set category = "Object" set name = "Enter Body Scanner" - if(usr.stat != 0) + if(usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return if(src.occupant) usr << "\The [src] is already occupied!" diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index a1263d3851e..63ee228658d 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -305,7 +305,7 @@ obj/machinery/access_button/update_icon() obj/machinery/access_button/attack_hand(mob/user) add_fingerprint(usr) if(!allowed(user)) - user << "\red Access Denied" + user << "Access Denied" else if(radio_connection) var/datum/signal/signal = new diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index bbcd2d17c73..e35f741a945 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -190,14 +190,14 @@ /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(iswelder(W) && src.destroyed) if(weld(W, user)) - user << "\blue You salvage whats left of \the [src]" + user << "You salvage whats left of \the [src]" var/obj/item/stack/sheet/metal/M = getFromPool(/obj/item/stack/sheet/metal, get_turf(src))//new /obj/item/stack/sheet/metal(src.loc) M.amount = 3 del src return if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) - visible_message("\red [user] hits the [src] with a [W]!") + visible_message("[user] hits the [src] with a [W]!") investigation_log(I_ATMOS, "was smacked with \a [W] by [key_name(user)]") src.health -= W.force src.add_fingerprint(user) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 6c3b7c6bb5c..f621a0835f5 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -88,7 +88,7 @@ if (src.holding) return var/obj/item/weapon/tank/T = W - user.drop_item(src) + user.drop_item(T, src) src.holding = T update_icon() return @@ -96,24 +96,24 @@ else if (istype(W, /obj/item/weapon/wrench)) if(connected_port) disconnect() - user << "\blue You disconnect [name] from the port." + user << "You disconnect [name] from the port." update_icon() return else var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - user << "\blue You connect [name] to the port." + user << "You connect [name] to the port." var/datum/gas/sleeping_agent/S = locate() in src.air_contents.trace_gases if(src.air_contents.toxins > 0 || (istype(S))) log_admin("[usr]([ckey(usr.key)]) connected a canister that contains \[[src.air_contents.toxins > 0 ? "Toxins" : ""] [istype(S) ? " N2O" : ""]\] to a connector_port at [loc.x], [loc.y], [loc.z]") update_icon() return else - user << "\blue [name] failed to connect to the port." + user << "[name] failed to connect to the port." return else - user << "\blue Nothing happens." + user << "Nothing happens." return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index c96a42e2cc4..2d7d8daa4ef 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -38,7 +38,7 @@ name = "[name] (ID [id])" attack_hand(var/mob/user as mob) - usr << "\blue You can't directly interact with this machine. Use the area atmos computer." + usr << "You can't directly interact with this machine. Use the area atmos computer." update_icon() src.overlays = 0 @@ -51,12 +51,12 @@ attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) if(on) - user << "\blue Turn it off first!" + user << "Turn it off first!" return anchored = !anchored playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You [anchored ? "wrench" : "unwrench"] \the [src]." + user << "You [anchored ? "wrench" : "unwrench"] \the [src]." return @@ -67,7 +67,7 @@ attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - user << "\blue The bolts are too tight for you to unscrew!" + user << "The bolts are too tight for you to unscrew!" return ..() diff --git a/code/game/machinery/bees_apiary.dm b/code/game/machinery/bees_apiary.dm index f82c268db4c..b2e4d5002bb 100644 --- a/code/game/machinery/bees_apiary.dm +++ b/code/game/machinery/bees_apiary.dm @@ -50,29 +50,29 @@ return if(istype(O, /obj/item/queen_bee)) if(health > 0) - user << "\red There is already a queen in there." + user << "There is already a queen in there." else health = 10 nutrilevel += 10 - user.drop_item() + user.drop_item(O) qdel(O) - user << "\blue You carefully insert the queen into [src], she gets busy making a hive." + user << "You carefully insert the queen into [src], she gets busy making a hive." bees_in_hive = 0 else if(istype(O, /obj/item/beezeez)) beezeez += 100 nutrilevel += 10 - user.drop_item() + user.drop_item(O) if(health > 0) - user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up." + user << "You insert [O] into [src]. A relaxed humming appears to pick up." else - user << "\blue You insert [O] into [src]. Now it just needs some bees." + user << "You insert [O] into [src]. Now it just needs some bees." qdel(O) else if(istype(O, /obj/item/weapon/minihoe)) if(health > 0) - user << "\red You begin to dislodge the apiary from the tray, the bees don't like that." + user << "You begin to dislodge the apiary from the tray, the bees don't like that." angry_swarm(user) else - user << "\blue You begin to dislodge the dead apiary from the tray." + user << "You begin to dislodge the dead apiary from the tray." if(do_after(user, 50)) var/obj/machinery/created_tray = new hydrotray_type(src.loc) created_tray.component_parts = list() @@ -84,30 +84,30 @@ I.loc = created_tray contents -= I new /obj/item/apiary(src.loc) - user << "\red You dislodge the apiary from the tray." + user << "You dislodge the apiary from the tray." qdel(src) else if(istype(O, /obj/item/weapon/bee_net)) var/obj/item/weapon/bee_net/N = O if(N.caught_bees > 0) - user << "\blue You empty the bees into the apiary." + user << "You empty the bees into the apiary." bees_in_hive += N.caught_bees N.caught_bees = 0 else - user << "\blue There are no more bees in the net." + user << "There are no more bees in the net." else if(istype(O, /obj/item/weapon/reagent_containers/glass)) var/obj/item/weapon/reagent_containers/glass/G = O if(harvestable_honey > 0) if(health > 0) - user << "\red You begin to harvest the honey. The bees don't seem to like it." + user << "You begin to harvest the honey. The bees don't seem to like it." angry_swarm(user) else - user << "\blue You begin to harvest the honey." + user << "You begin to harvest the honey." if(do_after(user,50)) G.reagents.add_reagent("honey",harvestable_honey) harvestable_honey = 0 - user << "\blue You successfully harvest the honey." + user << "You successfully harvest the honey." else - user << "\blue There is no honey left to harvest." + user << "There is no honey left to harvest." else angry_swarm(user) @@ -253,5 +253,5 @@ if(toxic > 0) H.reagents.add_reagent("toxin", toxic) - usr << "\blue You harvest the honeycomb from the hive. There is a wild buzzing!" + usr << "You harvest the honeycomb from the hive. There is a wild buzzing!" angry_swarm(usr) diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm index 3c9e185bc23..637bd16e65b 100644 --- a/code/game/machinery/bees_items.dm +++ b/code/game/machinery/bees_items.dm @@ -20,9 +20,9 @@ if(B.feral < 0) caught_bees += B.strength del(B) - user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.") + user.visible_message("[user] nets some bees.","You net up some of the becalmed bees.") else - user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.") + user.visible_message("[user] swings at some bees, they don't seem to like it.","You swing at some bees, they don't seem to like it.") B.feral = 5 B.target = user diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 8937e50d212..8dfb9daa64d 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -276,7 +276,7 @@ return 1 else if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red The biogenerator already occuped." + user << "The biogenerator already occuped." else if(panel_open) user << "The biogenerator's maintenance panel must be closed first." else @@ -285,42 +285,42 @@ beaker = O updateUsrDialog() else if(processing) - user << "\red The biogenerator is currently processing." + user << "The biogenerator is currently processing." else if(istype(O, /obj/item/weapon/storage/bag/plants)) var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 20) - user << "\red The biogenerator is already full! Activate it." + user << "The biogenerator is already full! Activate it." else var/obj/item/weapon/storage/bag/B = O for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) B.remove_from_storage(G,src) i++ if(i >= 20) - user << "\blue You fill the biogenerator to its capacity." + user << "You fill the biogenerator to its capacity." break if(i<20) - user << "\blue You empty the plant bag into the biogenerator." + user << "You empty the plant bag into the biogenerator." else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) - user << "\red You cannot put this in [src.name]" + user << "You cannot put this in [src.name]" else var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 20) - user << "\red The biogenerator is full! Activate it." + user << "The biogenerator is full! Activate it." else user.before_take_item(O) O.loc = src - user << "\blue You put [O.name] in [src.name]" + user << "You put [O.name] in [src.name]" update_icon() return /obj/machinery/biogenerator/crowbarDestroy(mob/user) if(beaker) - user << "\red A beaker is loaded, you cannot deconstruct \the [src]." + user << "A beaker is loaded, you cannot deconstruct \the [src]." return return ..() @@ -398,7 +398,7 @@ if (src.stat != 0) //NOPOWER etc return if(src.processing) - usr << "\red The biogenerator is in the process of working." + usr << "The biogenerator is in the process of working." return var/S = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents) diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 4cba70b8d45..c8d1418f255 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -92,7 +92,7 @@ else if(!prints_prosthetics && istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) visible_message("\The [src] processes \the [W].") stored_matter += 50 - user.drop_item() + user.drop_item(W) qdel(W) return // Steel for matter. @@ -100,7 +100,7 @@ var/obj/item/stack/sheet/metal/M = W visible_message("\The [src] processes \the [W].") stored_matter += M.amount * 10 - user.drop_item() + user.drop_item(M) returnToPool(M) return else if(istype(W, /obj/item/weapon/wrench)) diff --git a/code/game/machinery/bots/buttbot.dm b/code/game/machinery/bots/buttbot.dm index 5bbceda3f46..d4682566b49 100644 --- a/code/game/machinery/bots/buttbot.dm +++ b/code/game/machinery/bots/buttbot.dm @@ -67,7 +67,7 @@ Here it is: Buttbot. /obj/machinery/bot/buttbot/explode() src.on = 0 - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) playsound(get_turf(src), 'sound/effects/superfart.ogg', 50, 1) //A fitting end var/turf/Tsec = get_turf(src) new /obj/item/clothing/head/butt(Tsec) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index db82e601ce6..b011fa477ec 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -305,7 +305,7 @@ text("[src.oddbutton ? "Yes" : "No" /obj/machinery/bot/cleanbot/proc/clean(var/turf/target) anchored = 1 icon_state = "cleanbot-c" - visible_message("\red [src] begins to clean up the [target]") + visible_message("[src] begins to clean up the [target]") cleaning = 1 var/cleantime = 20 // 50 // 5 seconds is too long. var/list/cleansed=list() @@ -323,7 +323,7 @@ text("[src.oddbutton ? "Yes" : "No" /obj/machinery/bot/cleanbot/explode() src.on = 0 - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) @@ -342,7 +342,7 @@ text("[src.oddbutton ? "Yes" : "No" /obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) - user.drop_item() + user.drop_item(W) qdel(W) var/turf/T = get_turf(src.loc) var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index bfd72a047c2..770f9fbb613 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -231,7 +231,7 @@ Auto Patrol: []"}, if(user) user << "You short out [src]'s target assessment circuits." spawn(0) for(var/mob/O in hearers(src, null)) - O.show_message("\red [src] buzzes oddly!", 1) + O.show_message("[src] buzzes oddly!", 1) src.target = null if(user) src.oldtarget_name = user.name src.last_found = world.time @@ -320,7 +320,7 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) broadcast_security_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] suspect [target] in [location]", src) - visible_message("\red [src.target] has been stunned by [src]!") + visible_message("[src.target] has been stunned by [src]!") mode = SECBOT_PREP_ARREST src.anchored = 1 @@ -353,7 +353,7 @@ Auto Patrol: []"}, if (!src.target.handcuffed && !src.arrest_type) playsound(get_turf(src), 'sound/weapons/handcuffs.ogg', 30, 1, -2) mode = SECBOT_ARREST - visible_message("\red [src] is trying to put handcuffs on [src.target]!") + visible_message("[src] is trying to put handcuffs on [src.target]!") spawn(60) if (get_dist(src, src.target) <= 1) @@ -789,7 +789,7 @@ Auto Patrol: []"}, /obj/machinery/bot/ed209/explode() walk_to(src,0) - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec) @@ -934,7 +934,7 @@ Auto Patrol: []"}, switch(build_step) if(0,1) if( istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg) ) - user.drop_item() + user.drop_item(W) qdel(W) build_step++ user << "You add the robot leg to [src]." @@ -952,7 +952,7 @@ Auto Patrol: []"}, else if( istype(W, /obj/item/clothing/suit/bluetag) ) lasercolor = "b" if( lasercolor || istype(W, /obj/item/clothing/suit/armor/vest) ) - user.drop_item() + user.drop_item(W) qdel(W) build_step++ user << "You add the armor to [src]." @@ -969,7 +969,7 @@ Auto Patrol: []"}, user << "You welded the vest to [src]." if(4) if( istype(W, /obj/item/clothing/head/helmet) ) - user.drop_item() + user.drop_item(W) qdel(W) build_step++ user << "You add the helmet to [src]." @@ -979,7 +979,7 @@ Auto Patrol: []"}, if(5) if( isprox(W) ) - user.drop_item() + user.drop_item(W) qdel(W) build_step++ user << "You add the prox sensor to [src]." @@ -1019,7 +1019,7 @@ Auto Patrol: []"}, user << "You add [W] to [src]." src.item_state = "[lasercolor]ed209_taser" src.icon_state = "[lasercolor]ed209_taser" - user.drop_item() + user.drop_item(W) qdel(W) if(8) @@ -1039,7 +1039,7 @@ Auto Patrol: []"}, user << "You complete the ED-209." var/turf/T = get_turf(src) new /obj/machinery/bot/ed209(T,created_name,lasercolor) - user.drop_item() + user.drop_item(W) qdel(W) user.drop_from_inventory(src) qdel(src) diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm index f963304556a..02c23bace24 100644 --- a/code/game/machinery/bots/farmbot.dm +++ b/code/game/machinery/bots/farmbot.dm @@ -168,13 +168,13 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" src.updateUsrDialog() else - user << "\red Access denied." + user << "Access denied." else if (istype(W, /obj/item/weapon/reagent_containers/glass/fertilizer)) if ( get_total_ferts() >= Max_Fertilizers ) user << "The fertilizer storage is full!" return - user.drop_item(src) + user.drop_item(W, src) user << "You insert [W]." flick("farmbot_hatch",src) src.updateUsrDialog() @@ -185,10 +185,10 @@ /obj/machinery/bot/farmbot/Emag(mob/user as mob) ..() - if(user) user << "\red You short out [src]'s plant identifier circuits." + if(user) user << "You short out [src]'s plant identifier circuits." spawn(0) for(var/mob/O in hearers(src, null)) - O.show_message("\red [src] buzzes oddly!", 1) + O.show_message("[src] buzzes oddly!", 1) flick("farmbot_broke", src) src.emagged = 1 src.on = 1 @@ -200,7 +200,7 @@ /obj/machinery/bot/farmbot/explode() src.on = 0 - visible_message("\red [src] blows apart!", 1) + visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/weapon/minihoe(Tsec) @@ -394,7 +394,7 @@ spawn(0) fert.loc = src.loc fert.throw_at(target, 16, 3) - src.visible_message("\red [src] launches [fert.name] at [target.name]!") + src.visible_message("[src] launches [fert.name] at [target.name]!") flick("farmbot_broke", src) spawn (FARMBOT_EMAG_DELAY) mode = 0 @@ -428,13 +428,13 @@ mode = 0 if ( prob(30) ) // better luck next time little guy - src.visible_message("\red [src] swings wildly at [target] with a minihoe, missing completely!") + src.visible_message("[src] swings wildly at [target] with a minihoe, missing completely!") else // yayyy take that weeds~ var/attackVerb = pick("slashed", "sliced", "cut", "clawed") var /mob/living/carbon/human/human = target - src.visible_message("\red [src] [attackVerb] [human]!") + src.visible_message("[src] [attackVerb] [human]!") var/damage = 15 var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/datum/organ/external/affecting = human.get_organ(ran_zone(dam_zone)) @@ -462,7 +462,7 @@ if ( emagged ) // warning, humans are thirsty! var splashAmount = min(70,tank.reagents.total_volume) - src.visible_message("\red [src] splashes [target] with a bucket of water!") + src.visible_message("[src] splashes [target] with a bucket of water!") playsound(get_turf(src), 'sound/effects/slosh.ogg', 25, 1) if ( prob(50) ) tank.reagents.reaction(target, TOUCH) //splash the human! @@ -502,9 +502,9 @@ mode = FARMBOT_MODE_WAITING playsound(get_turf(src), 'sound/effects/slosh.ogg', 25, 1) - src.visible_message("\blue [src] starts filling it's tank from [target].") + src.visible_message("[src] starts filling it's tank from [target].") spawn(300) - src.visible_message("\blue [src] finishes filling it's tank.") + src.visible_message("[src] finishes filling it's tank.") src.mode = 0 tank.reagents.add_reagent("water", tank.reagents.maximum_volume - tank.reagents.total_volume ) playsound(get_turf(src), 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index d4e6620f8e0..ad0bdccd0ea 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -311,7 +311,7 @@ var/global/list/floorbot_targets=list() F.break_tile_to_plating() else F.ReplaceWithLattice() - visible_message("\red [src] makes an excited booping sound.") + visible_message("[src] makes an excited booping sound.") spawn(50) src.amount ++ src.anchored = 0 @@ -413,7 +413,7 @@ var/global/list/floorbot_targets=list() src.anchored = 1 src.icon_state = "floorbot-c" if(istype(target, /turf/space/)) - visible_message("\red [src] begins to repair the hole") + visible_message("[src] begins to repair the hole") var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel src.repairing = 1 spawn(50) @@ -427,7 +427,7 @@ var/global/list/floorbot_targets=list() else var/turf/simulated/floor/F = src.loc if(!F.broken && !F.burnt) - visible_message("\red [src] begins to improve the floor.") + visible_message("[src] begins to improve the floor.") src.repairing = 1 spawn(50) F.make_plasteel_floor() @@ -439,7 +439,7 @@ var/global/list/floorbot_targets=list() src.target = null else if(F.is_plating()) - visible_message("\red [src] begins to fix dents in the floor.") + visible_message("[src] begins to fix dents in the floor.") src.repairing = 1 spawn(20) src.repairing = 0 @@ -453,7 +453,7 @@ var/global/list/floorbot_targets=list() /obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T) if(!istype(T, /obj/item/stack/tile/plasteel)) return - visible_message("\red [src] begins to collect tiles.") + visible_message("[src] begins to collect tiles.") src.repairing = 1 spawn(20) if(isnull(T)) @@ -477,7 +477,7 @@ var/global/list/floorbot_targets=list() return if(M.amount < 1) return - visible_message("\red [src] begins to create tiles.") + visible_message("[src] begins to create tiles.") src.repairing = 1 spawn(20) if(!M || !get_turf(M)) @@ -671,7 +671,7 @@ var/global/list/floorbot_targets=list() /obj/machinery/bot/floorbot/explode() src.on = 0 - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 33798592686..6ec388f3f24 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -214,7 +214,7 @@ user << "There is already a beaker loaded." return - user.drop_item(src) + user.drop_item(W, src) src.reagent_glass = W user << "You insert [W]." src.updateUsrDialog() @@ -232,7 +232,7 @@ if(user) user << "You short out [src]'s reagent synthesis circuits." spawn(0) for(var/mob/O in hearers(src, null)) - O.show_message("\red [src] buzzes oddly!", 1) + O.show_message("[src] buzzes oddly!", 1) flick("medibot_spark", src) src.patient = null if(user) src.oldpatient = user @@ -443,7 +443,7 @@ return else src.icon_state = "medibots" - visible_message("\red [src] is trying to inject [src.patient]!") + visible_message("[src] is trying to inject [src.patient]!") spawn(30) if ((get_dist(src, src.patient) <= 1) && (src.on)) if((reagent_id == "internal_beaker") && (src.reagent_glass) && (src.reagent_glass.reagents.total_volume)) @@ -451,7 +451,7 @@ src.reagent_glass.reagents.reaction(src.patient, 2) else src.patient.reagents.add_reagent(reagent_id,src.injection_amount) - visible_message("\red [src] injects [src.patient] with the syringe!") + visible_message("[src] injects [src.patient] with the syringe!") src.icon_state = "medibot[src.on]" src.currently_healing = 0 @@ -475,7 +475,7 @@ /obj/machinery/bot/medbot/explode() src.on = 0 - visible_message("\red [src] blows apart!", 1) + visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/weapon/storage/firstaid(Tsec) @@ -589,7 +589,7 @@ switch(build_step) if(0) if(istype(W, /obj/item/device/healthanalyzer)) - user.drop_item() + user.drop_item(W) qdel(W) src.build_step++ user << "You add the health sensor to [src]." @@ -598,7 +598,7 @@ if(1) if(isprox(W)) - user.drop_item() + user.drop_item(W) qdel(W) src.build_step++ user << "You complete the Medibot! Beep boop." diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index c75f44221ed..8fc746c8e1b 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -113,30 +113,30 @@ var/global/mulebot_count = 0 /obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user) if(istype(I,/obj/item/weapon/card/emag)) locked = !locked - user << "\blue You [locked ? "lock" : "unlock"] the mulebot's controls!" + user << "You [locked ? "lock" : "unlock"] the mulebot's controls!" flick("mulebot-emagged", src) playsound(get_turf(src), 'sound/effects/sparks1.ogg', 100, 0) else if(istype(I, /obj/item/weapon/card/id)) if(toggle_lock(user)) - user << "\blue Controls [(locked ? "locked" : "unlocked")]." + user << "Controls [(locked ? "locked" : "unlocked")]." else if(istype(I,/obj/item/weapon/cell) && open && !cell) var/obj/item/weapon/cell/C = I - user.drop_item(src) + user.drop_item(C, src) cell = C updateDialog() else if(istype(I,/obj/item/weapon/screwdriver)) if(locked) - user << "\blue The maintenance hatch cannot be opened or closed while the controls are locked." + user << "The maintenance hatch cannot be opened or closed while the controls are locked." return open = !open if(open) - src.visible_message("[user] opens the maintenance hatch of [src]", "\blue You open [src]'s maintenance hatch.") + src.visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.") on = 0 icon_state="mulebot-hatch" else - src.visible_message("[user] closes the maintenance hatch of [src]", "\blue You close [src]'s maintenance hatch.") + src.visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.") icon_state = "mulebot0" updateDialog() @@ -144,15 +144,15 @@ var/global/mulebot_count = 0 if (src.health < maxhealth) src.health = min(maxhealth, src.health+25) user.visible_message( - "\red [user] repairs [src]!", - "\blue You repair [src]!" + "[user] repairs [src]!", + "You repair [src]!" ) else - user << "\blue [src] does not need a repair!" + user << "[src] does not need a repair!" else if(load && ismob(load)) // chance to knock off rider if(prob(1+I.force * 2)) unload(0) - user.visible_message("\red [user] knocks [load] off [src] with \the [I]!", "\red You knock [load] off [src] with \the [I]!") + user.visible_message("[user] knocks [load] off [src] with \the [I]!", "You knock [load] off [src] with \the [I]!") else user << "You hit [src] with \the [I] but to no effect." else @@ -175,7 +175,7 @@ var/global/mulebot_count = 0 if(prob(50) && !isnull(load)) unload(0) if(prob(25)) - src.visible_message("\red Something shorts out inside [src]!") + src.visible_message("Something shorts out inside [src]!") wires.RandomCut() ..() @@ -280,7 +280,7 @@ var/global/mulebot_count = 0 turn_off() else if (cell && !open) if (!turn_on()) - usr << "\red You can't switch on [src]." + usr << "You can't switch on [src]." return else return @@ -295,18 +295,18 @@ var/global/mulebot_count = 0 cell.add_fingerprint(usr) cell = null - usr.visible_message("\blue [usr] removes the power cell from [src].", "\blue You remove the power cell from [src].") + usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].") updateDialog() if("cellinsert") if(open && !cell) var/obj/item/weapon/cell/C = usr.get_active_hand() if(istype(C)) - usr.drop_item(src) + usr.drop_item(C, src) cell = C C.add_fingerprint(usr) - usr.visible_message("\blue [usr] inserts a power cell into [src].", "\blue You insert the power cell into [src].") + usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].") updateDialog() @@ -386,7 +386,7 @@ var/global/mulebot_count = 0 updateDialog() return 1 else - user << "\red Access denied." + user << "Access denied." return 0 // mousedrop a crate to load the bot @@ -728,9 +728,9 @@ var/global/mulebot_count = 0 var/mob/M = obs if(ismob(M)) if(istype(M,/mob/living/silicon/robot)) - src.visible_message("\red [src] bumps into [M]!") + src.visible_message("[src] bumps into [M]!") else - src.visible_message("\red [src] knocks over [M]!") + src.visible_message("[src] knocks over [M]!") M.stop_pulling() M.Stun(8) M.Weaken(5) @@ -744,7 +744,7 @@ var/global/mulebot_count = 0 // called from mob/living/carbon/human/Crossed() // when mulebot is in the same loc /obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H) - src.visible_message("\red [src] drives over [H]!") + src.visible_message("[src] drives over [H]!") playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5,15) @@ -760,7 +760,7 @@ var/global/mulebot_count = 0 currentBloodColor="#A10808" // For if species get different blood colors. /obj/machinery/bot/mulebot/proc/RunOverCreature(var/mob/living/H,var/bloodcolor) - src.visible_message("\red [src] drives over [H]!") + src.visible_message("[src] drives over [H]!") playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1) bloodiness += 4 currentBloodColor=bloodcolor // For if species get different blood colors. @@ -904,7 +904,7 @@ var/global/mulebot_count = 0 /obj/machinery/bot/mulebot/explode() - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/device/assembly/prox_sensor(Tsec) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index b94df494f13..0bec94b5893 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -191,9 +191,9 @@ Auto Patrol: []"}, if(emagged) user << "ERROR" if(open) - user << "\red Please close the access panel before locking it." + user << "Please close the access panel before locking it." else - user << "\red Access denied." + user << "Access denied." else ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. @@ -208,10 +208,10 @@ Auto Patrol: []"}, /obj/machinery/bot/secbot/Emag(mob/user as mob) ..() if(open && !locked) - if(user) user << "\red You short out [src]'s target assessment circuits." + if(user) user << "You short out [src]'s target assessment circuits." spawn(0) for(var/mob/O in hearers(src, null)) - O.show_message("\red [src] buzzes oddly!", 1) + O.show_message("[src] buzzes oddly!", 1) src.target = null if(user) src.oldtarget_name = user.name src.last_found = world.time @@ -279,7 +279,7 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) broadcast_security_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] suspect [target] in [location]", src) - //visible_message("\red [src.target] has been stunned by [src]!") + //visible_message("[src.target] has been stunned by [src]!") mode = SECBOT_PREP_ARREST src.anchored = 1 @@ -290,7 +290,7 @@ Auto Patrol: []"}, if(world.time > next_harm_time) next_harm_time = world.time + 15 playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1) - visible_message("\red [src] beats [src.target] with the stun baton!") + visible_message("[src] beats [src.target] with the stun baton!") src.icon_state = "secbot-c" spawn(2) src.icon_state = "secbot[src.on]" @@ -326,7 +326,7 @@ Auto Patrol: []"}, if(!C.handcuffed && !src.arrest_type) playsound(get_turf(src), 'sound/weapons/handcuffs.ogg', 30, 1, -2) mode = SECBOT_ARREST - visible_message("\red [src] is trying to put handcuffs on [src.target]!") + visible_message("[src] is trying to put handcuffs on [src.target]!") spawn(60) if(Adjacent(target)) @@ -759,7 +759,7 @@ Auto Patrol: []"}, /obj/machinery/bot/secbot/explode() walk_to(src,0) - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) @@ -817,7 +817,7 @@ Auto Patrol: []"}, user << "You weld a hole in [src]!" else if(isprox(W) && (src.build_step == 1)) - user.drop_item() + user.drop_item(W) src.build_step++ user << "You add the prox sensor to [src]!" src.overlays += image('icons/obj/aibots.dmi', "hs_eye") @@ -825,7 +825,7 @@ Auto Patrol: []"}, qdel(W) else if(((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2)) - user.drop_item() + user.drop_item(W) src.build_step++ user << "You add the robot arm to [src]!" src.name = "helmet/signaler/prox sensor/robot arm assembly" @@ -833,7 +833,7 @@ Auto Patrol: []"}, qdel(W) else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3)) - user.drop_item() + user.drop_item(W) src.build_step++ user << "You complete the Securitron! Beep boop." var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index e05c08905b6..ff4d54b37fb 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -122,7 +122,7 @@ if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. user << "You attach the [W] into the assembly inner circuits." upgrades += W - user.drop_item(src) + user.drop_item(W, src) return // Taking out upgrades diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 25949f1473d..940d51e4fea 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -149,11 +149,11 @@ if("Yes") var/nhref = "src=\ref[tobeopened];aiEnable=7" tobeopened.Topic(nhref, params2list(nhref), tobeopened, 1) - src << "\blue You've opened \the [tobeopened] for [target]." + src << "You've opened \the [tobeopened] for [target]." if("No") - src << "\red You deny the request." + src << "You deny the request." else - src << "\red You've failed to open an airlock for [target]" + src << "You've failed to open an airlock for [target]" return /mob/living/silicon/ai/proc/ai_actual_track(mob/living/target as mob) if(!istype(target)) return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index e146cdd9626..fa1f52685c3 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -78,14 +78,15 @@ user << "[src] blinks red as you try to insert the cell!" return - user.drop_item(src) + user.drop_item(W, src) charging = W user.visible_message("[user] inserts a cell into [src].", "You insert a cell into [src].") chargelevel = -1 updateicon() if(istype(W, /obj/item/weapon/card/emag) && !emagged) emagged = 1 //Congratulations, you've done it - user << "You hear fizzling and you notice a wire turning burning hot. Better not use it anymore" + user.visible_message("[user] swipes a card into \the [src]'s charging port.", \ + "You hear fizzling coming from \the [src] and a wire turns red hot as you swipe the electromagnetic card. Better not use it anymore.") return /obj/machinery/cell_charger/attack_hand(mob/user) @@ -96,6 +97,7 @@ s.start() spawn(15) explosion(src.loc, -1, 1, 3, adminlog = 0) //Overload + Destroy(src) //It exploded, rip return usr.put_in_hands(charging) charging.add_fingerprint(user) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f6f70f2d095..0700ed059ce 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -340,7 +340,7 @@ else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) user << "\The [src] processes \the [W]." biomass += 50 - user.drop_item() + user.drop_item(W) qdel(W) return else @@ -362,7 +362,7 @@ set category = "Object" set src in oview(1) - if (usr.stat != 0) + if (usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return src.go_out() add_fingerprint(usr) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 8c17edb6712..f9b8cbd9bd5 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -289,7 +289,7 @@ if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve return for(var/mob/M in range(3,src)) - M.show_message("\b ERROR. Recalibrating projetion apparatus.") + M.show_message("ERROR. Recalibrating projetion apparatus.") last_change = world.time return @@ -391,11 +391,11 @@ if(istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state
AI System Integrity Restorer
" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index f91b8f3b2b1..5d700573003 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -316,7 +316,7 @@ user << "You place the circuit board inside the frame." src.icon_state = "1" src.circuit = P - user.drop_item(src) + user.drop_item(B, src) else user << "This frame does not accept circuit boards of this type!" return 1 diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 4d7c9ca34b8..62e118b559d 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -31,7 +31,7 @@ /obj/machinery/computer/security/attack_hand(var/mob/user as mob) if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return if(stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/computer/camera_circuit.dm b/code/game/machinery/computer/camera_circuit.dm index 25311edf1a6..cdb79516107 100644 --- a/code/game/machinery/computer/camera_circuit.dm +++ b/code/game/machinery/computer/camera_circuit.dm @@ -45,13 +45,13 @@ else return authorised = 1 - user << "\blue You authorised the circuit network!" + user << "You authorised the circuit network!" updateDialog() else - user << "\blue You must select a camera network circuit!" + user << "You must select a camera network circuit!" else if(istype(I,/obj/item/weapon/screwdriver)) secured = !secured - user.visible_message("\blue The [src] can [secured ? "no longer" : "now"] be modified.") + user.visible_message("The [src] can [secured ? "no longer" : "now"] be modified.") updateBuildPath() return @@ -114,10 +114,10 @@ else return authorised = 1 - usr << "\blue You authorised the circuit network!" + usr << "You authorised the circuit network!" updateDialog() else - usr << "\blue You must select a camera network circuit!" + usr << "You must select a camera network circuit!" else if( href_list["removeauth"] ) authorised = 0 updateDialog() diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 2dabc09ec0e..e621cefe0a8 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -65,7 +65,7 @@ set name = "Eject ID Card" set src in oview(1) - if(!usr || usr.stat || usr.lying) return + if(!usr || usr.stat || usr.lying || (usr.status_flags & FAKEDEATH)) return if (!ishuman(usr)) usr << "You don't have the dexterity to do this!" @@ -92,10 +92,10 @@ return ..() if(!scan && access_change_ids in id_card.access) - user.drop_item(src) + user.drop_item(id_card, src) scan = id_card else if(!modify) - user.drop_item(src) + user.drop_item(id_card, src) modify = id_card nanomanager.update_uis(src) @@ -197,7 +197,7 @@ else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) - usr.drop_item(src) + usr.drop_item(I, src) modify = I if ("scan") @@ -213,7 +213,7 @@ else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) - usr.drop_item(src) + usr.drop_item(I, src) scan = I if("access") @@ -249,7 +249,7 @@ jobdatum = J break if(!jobdatum) - usr << "\red No log exists for this job: [t1]" + usr << "No log exists for this job: [t1]" return access = jobdatum.get_access() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index fae592d6607..f814107a91e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -61,7 +61,7 @@ /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) - user.drop_item(src) + user.drop_item(W, src) src.diskette = W user << "You insert [W]." src.updateUsrDialog() @@ -149,7 +149,7 @@ Back
- "}
// END AUTOFIX
for(var/datum/dna2/record/R in src.records)
- dat += "
- [R.dna.real_name && R.dna.real_name != "" ? R.dna.real_name : "Unknown"]
- " + dat += "
- [R.dna.real_name && R.dna.real_name != "" ? R.dna.real_name : "Unknown"] " if(3) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d585c674b6e..76d06f40458 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -68,7 +68,7 @@ var/shuttle_call/shuttle_calls[0] return 1 if (!(src.z in list(STATION_Z,CENTCOMM_Z))) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return usr.set_machine(src) @@ -262,13 +262,13 @@ var/shuttle_call/shuttle_calls[0] if("MessageCentcomm") if(src.authenticated==2) if(centcomm_message_cooldown) - usr << "\red Arrays recycling. Please stand by." + usr << "Arrays recycling. Please stand by." return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Centcomm_announce(input, usr) - usr << "\blue Message transmitted." + usr << "Message transmitted." log_say("[key_name(usr)] (@[usr.x],[usr.y],[usr.z]) has sent a bluespace message to Centcomm: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -280,13 +280,13 @@ var/shuttle_call/shuttle_calls[0] if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) if(centcomm_message_cooldown) - usr << "\red Arrays recycling. Please stand by." + usr << "Arrays recycling. Please stand by." return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) - usr << "\blue Message transmitted." + usr << "Message transmitted." log_say("[key_name(usr)] (@[usr.x],[usr.y],[usr.z]) has sent a bluespace message to the syndicate: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -313,7 +313,7 @@ var/shuttle_call/shuttle_calls[0] return if (!(src.z in list(STATION_Z, CENTCOMM_Z))) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return ui_interact(user) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 3bad1b921c3..262d2dfb393 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -51,7 +51,7 @@ /obj/machinery/computer/crew/Topic(href, href_list) if(..()) return if (src.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return 0 if( href_list["close"] ) if(usr.machine == src) usr.unset_machine() diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index f9e7026c8c4..480534aacf0 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -15,14 +15,14 @@ set category = "Object" set name = "Access Computer's Internals" set src in oview(1) - if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon)) + if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon) || (usr.status_flags & FAKEDEATH)) return opened = !opened if(opened) - usr << "\blue The access panel is now open." + usr << "The access panel is now open." else - usr << "\blue The access panel is now closed." + usr << "The access panel is now closed." return proc/install_module(var/obj/item/weapon/aiModule/O, var/mob/user) @@ -61,11 +61,11 @@ if(R.lawupdate && (R.connected_ai == current)) R << "These are your laws now:" R.show_laws() - user << "\blue Upload complete. The AI's laws have been modified." + user << "Upload complete. The AI's laws have been modified." attackby(obj/item/weapon/O as obj, mob/user as mob) if (user.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return if(istype(O, /obj/item/weapon/aiModule)) if(install_module(O,user)) @@ -92,19 +92,19 @@ else var/obj/item/weapon/planning_frame/frame=O if(frame.modules.len>0) - user << "\blue You load \the [frame] into \the [src]..." + user << "You load \the [frame] into \the [src]..." if(do_after(user,50)) var/failed=0 for(var/i=1;i<=frame.modules.len;i++) var/obj/item/weapon/aiModule/M = frame.modules[i] - user << "\blue Running [M]..." + user << "Running [M]..." if(!install_module(M,user)) failed=1 break if(!failed) announce_law_changes(user) else - user << "\red It's empty, doofus." + user << "It's empty, doofus." else ..() @@ -142,7 +142,7 @@ proc/announce_law_changes() current << "These are your laws now:" current.show_laws() - usr << "\blue Upload complete. The robot's laws have been modified." + usr << "Upload complete. The robot's laws have been modified." proc/install_module(var/obj/item/weapon/aiModule/M,var/mob/user) if(stat & NOPOWER) @@ -181,7 +181,7 @@ if(isMoMMI(src.current)) var/mob/living/silicon/robot/mommi/mommi = src.current if(mommi.keeper) - user << "\red [src.current] is operating in KEEPER mode and cannot be accessed via control signals." + user << "[src.current] is operating in KEEPER mode and cannot be accessed via control signals." return ..() install_module(W,user) else if(istype(W, /obj/item/weapon/planning_frame)) @@ -208,19 +208,19 @@ else var/obj/item/weapon/planning_frame/frame=W if(frame.modules.len>0) - user << "\blue You load \the [frame] into \the [src]..." + user << "You load \the [frame] into \the [src]..." if(do_after(user,50)) var/failed=0 for(var/i=1;i<=frame.modules.len;i++) var/obj/item/weapon/aiModule/M = frame.modules[i] - user << "\blue Running [M]..." + user << "Running [M]..." if(!install_module(M,user)) failed=1 break if(!failed) announce_law_changes() else - user << "\red It's empty, doofus." + user << "It's empty, doofus." else return ..() diff --git a/code/game/machinery/computer/lockdown.dm b/code/game/machinery/computer/lockdown.dm index 261751d3692..82a3061b3ed 100644 --- a/code/game/machinery/computer/lockdown.dm +++ b/code/game/machinery/computer/lockdown.dm @@ -104,7 +104,7 @@ t += "
" + t += "No networks connected.
" t += "Refresh
" t += "Close
" user << browse(t, "window=lockdown;size=550x600") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 05e3c4ccf92..ca5ed087ccb 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -160,7 +160,7 @@ else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) - usr.drop_item(src) + usr.drop_item(I, src) src.scan = I else if (href_list["logout"]) src.authenticated = null diff --git a/code/game/machinery/computer/pda_terminal.dm b/code/game/machinery/computer/pda_terminal.dm index 05e3518127c..0af228dd5c0 100644 --- a/code/game/machinery/computer/pda_terminal.dm +++ b/code/game/machinery/computer/pda_terminal.dm @@ -65,7 +65,7 @@ return ..() if(!pda_device) - user.drop_item(src) + user.drop_item(user_pda, src) pda_device = user_pda update_icon() @@ -130,7 +130,7 @@ else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/device/pda)) - usr.drop_item(src) + usr.drop_item(I, src) pda_device = I update_icon() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 791e69e583b..b14931419ec 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -153,7 +153,7 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + user << "Access Denied" return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3d72871c79f..5ba06376235 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -110,7 +110,7 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "\green You hear a voice in your head saying: '[warning]'" + R << "You hear a voice in your head saying: '[warning]'" src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index e5f24f50b99..acfa76eaaa1 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -35,15 +35,15 @@ var/prison_shuttle_timeleft = 0 emag(mob/user as mob) emagged = 1 - user << "\blue You disable the lock." + user << "You disable the lock." return attack_hand(var/mob/user as mob) if(!src.allowed(user) && (!emagged)) - user << "\red Access Denied." + user << "Access Denied." return if(prison_break) - user << "\red Unable to locate shuttle." + user << "Unable to locate shuttle." return if(..()) return @@ -72,11 +72,11 @@ var/prison_shuttle_timeleft = 0 if (href_list["sendtodock"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + usr << "The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." src.temp += "Shuttle sent.
OK" src.updateUsrDialog() prison_shuttle_moving_to_prison = 1 @@ -86,11 +86,11 @@ var/prison_shuttle_timeleft = 0 else if (href_list["sendtostation"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + usr << "The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." src.temp += "Shuttle sent.
OK" src.updateUsrDialog() prison_shuttle_moving_to_station = 1 @@ -158,7 +158,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return var/area/start_location = locate(/area/shuttle/prison/prison) @@ -187,7 +187,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return var/area/start_location = locate(/area/shuttle/prison/station) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index f07b2727021..bcc554e7dd7 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -32,7 +32,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return user.set_machine(src) var/dat @@ -130,14 +130,14 @@ if (istype(I)) if(src.check_access(I)) if (!status) - message_admins("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!") - log_game("\blue [key_name(usr)] has initiated the global cyborg killswitch!") + message_admins("[key_name_admin(usr)] has initiated the global cyborg killswitch!") + log_game("[key_name(usr)] has initiated the global cyborg killswitch!") src.status = 1 src.start_sequence() src.temp = null else - usr << "\red Access Denied." + usr << "Access Denied." else if (href_list["stop"]) src.temp = {" @@ -175,11 +175,11 @@ R.ResetSecurityCodes() else - message_admins("\blue [key_name_admin(usr)] detonated [R.name]!") - log_game("\blue [key_name_admin(usr)] detonated [R.name]!") + message_admins("[key_name_admin(usr)] detonated [R.name]!") + log_game("[key_name_admin(usr)] detonated [R.name]!") R.self_destruct() else - usr << "\red Access Denied." + usr << "Access Denied." else if (href_list["stopbot"]) if(src.allowed(usr)) @@ -188,7 +188,7 @@ var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm") if(R && istype(R)) - message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") + message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") R.canmove = !R.canmove if (R.lockcharge) @@ -201,7 +201,7 @@ R << "You have been locked down!" else - usr << "\red Access Denied." + usr << "Access Denied." else if (href_list["magbot"]) if(src.allowed(usr)) @@ -212,7 +212,7 @@ var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm") if(R && istype(R)) -// message_admins("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!") +// message_admins("[key_name_admin(usr)] emagged [R.name] using robotic console!") log_game("[key_name(usr)] emagged [R.name] using robotic console!") R.SetEmagged(2) if(R.mind.special_role) diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index 45f80bcfcfd..d4cfbbffcc3 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -53,7 +53,7 @@ /obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + user << "Access Denied" return user.set_machine(src) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 7bb5ff5ce48..604279e9e10 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -26,7 +26,7 @@ /obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob) if(istype(O, /obj/item/weapon/card/id) && !scan) - usr.drop_item(src) + usr.drop_item(O, src) scan = O user << "You insert [O]." ..() @@ -43,7 +43,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return var/dat @@ -239,7 +239,7 @@ What a mess.*/ else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) - usr.drop_item(src) + usr.drop_item(I, src) scan = I if("Log Out") diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 6d97b472774..9eaa913a902 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -38,11 +38,11 @@ if (src.auth_need - src.authorized.len > 0) message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[user.ckey] has authorized early shuttle launch") - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + world << "Alert: Shuttle launch time shortened to 10 seconds!" emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -51,10 +51,10 @@ if("Repeal") src.authorized -= W:registered_name - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) if("Abort") - world << "\blue All authorizations to shortening time for shuttle launch have been revoked!" + world << "All authorizations to shortening time for shuttle launch have been revoked!" src.authorized.len = 0 src.authorized = list( ) return @@ -65,7 +65,7 @@ if(emergency_shuttle.location == 1) switch(choice) if("Launch") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + world << "Alert: Shuttle launch time shortened to 10 seconds!" emergency_shuttle.settimeleft( 10 ) emagged = 1 return 1 diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index fd93c5dac5b..0c52037af29 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -41,7 +41,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return var/dat diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 24a2b84d27d..97b12311b0f 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -82,7 +82,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived at Central Command. Operation has ended!" + M << "You have arrived at Central Command. Operation has ended!" specops_shuttle_at_station = 0 @@ -129,7 +129,7 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "The Special Operations shuttle is unable to leave." return //Begin Marauder launchpad. @@ -224,7 +224,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name]. Commence operation!" for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -247,16 +247,16 @@ var/specops_shuttle_timeleft = 0 return attack_hand(user) /obj/machinery/computer/specops_shuttle/emag(mob/user as mob) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + user << "The electronic systems in this console are far too advanced for your primitive hacking peripherals." return /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return if (sent_strike_team == 0 && send_emergency_team == 0) - usr << "\red The strike team has not yet deployed." + usr << "The strike team has not yet deployed." return if(..()) @@ -287,14 +287,14 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\blue Central Command will not allow the Special Operations shuttle to return yet." + usr << "Central Command will not allow the Special Operations shuttle to return yet." if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) - usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" - usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" + usr << "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" + usr << "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" return - usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.
OK" updateUsrDialog() @@ -308,10 +308,10 @@ var/specops_shuttle_timeleft = 0 if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "The Special Operations shuttle is unable to leave." return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.
OK" updateUsrDialog() @@ -394,7 +394,7 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "The Special Operations shuttle is unable to leave." return //Begin Marauder launchpad. @@ -489,7 +489,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name]. Commence operation!" /proc/specops_can_move() if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0 @@ -506,17 +506,17 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + user << "The electronic systems in this console are far too advanced for your primitive hacking peripherals." else return attack_hand(user) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return // if (sent_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// usr << "The strike team has not yet deployed." // return if(..()) @@ -545,17 +545,17 @@ var/specops_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return - usr << "\blue Central Command will not allow the Special Operations shuttle to return." + usr << "Central Command will not allow the Special Operations shuttle to return." return else if (href_list["sendtostation"]) if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "The Special Operations shuttle is unable to leave." return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.
OK" updateUsrDialog() diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index a92afb28d45..30b7d356f0a 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -143,9 +143,9 @@ td.cost.toomuch { updateUsrDialog() return if(!centcomm_store.PlaceOrder(usr,itemID)) - usr << "\red Unable to charge your account." + usr << "Unable to charge your account." else - usr << "\blue You've successfully purchased the item. It should be in your hands or on the floor." + usr << "You've successfully purchased the item. It should be in your hands or on the floor." src.updateUsrDialog() return diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index 317d4bd4349..9fa8cce30ef 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -53,7 +53,7 @@ /obj/machinery/computer/syndicate_station/attack_hand(mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + user << "Access Denied" return user.set_machine(src) diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 11831d471a5..64485673611 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -60,7 +60,7 @@ var/syndicate_elite_shuttle_timeleft = 0 if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!syndicate_elite_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + usr << "The Syndicate Elite shuttle is unable to leave." return sleep(600) @@ -168,7 +168,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name]. Commence operation!" /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -182,16 +182,16 @@ var/syndicate_elite_shuttle_timeleft = 0 return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/emag(mob/user as mob) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + user << "The electronic systems in this console are far too advanced for your primitive hacking peripherals." return /obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return // if (sent_syndicate_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// usr << "The strike team has not yet deployed." // return if(..()) @@ -220,17 +220,17 @@ var/syndicate_elite_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return - usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return." + usr << "The Syndicate will not allow the Elite Squad shuttle to return." return else if (href_list["sendtostation"]) if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!specops_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + usr << "The Syndicate Elite shuttle is unable to leave." return - usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + usr << "The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." temp = "Shuttle departing.
OK" updateUsrDialog() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 5ac56676468..1211d991232 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -79,7 +79,7 @@ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) user << "You add the circuit board to the frame." circuit = P - user.drop_item(src) + user.drop_item(B, src) icon_state = "box_2" build_state = 3 components = list() @@ -183,7 +183,7 @@ break else user << "You do not have enough [P]!" - user.drop_item(src) + user.drop_item(P, src) components += P req_components[I]-- update_desc() diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index c0f6aac53dd..1b3c3fa56b5 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -1,3 +1,10 @@ +var/global/list/cryo_health_indicator = list( "full" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_full"),\ + "good" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_good"),\ + "average" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_average"),\ + "bad" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_bad"),\ + "worse" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_worse"),\ + "crit" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_crit"),\ + "dead" = image("icon" = 'icons/obj/cryogenics.dmi', "icon_state" = "moverlay_dead")) /obj/machinery/atmospherics/unary/cryo_cell name = "cryo cell" icon = 'icons/obj/cryogenics.dmi' @@ -91,6 +98,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() + update_icon() if(!node) return if(!on) @@ -262,7 +270,7 @@ user << "A beaker is already loaded into the machine." return beaker = G - user.drop_item(src) + user.drop_item(G, src) user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!") if(..()) return @@ -284,8 +292,31 @@ return /obj/machinery/atmospherics/unary/cryo_cell/update_icon() + overlays.len = 0 if(on) if(occupant) + if(occupant.stat == DEAD || !occupant.has_brain()) + overlays += cryo_health_indicator["dead"] + else + if(occupant.health >= occupant.maxHealth) + overlays += cryo_health_indicator["full"] + else + if(occupant.health < config.health_threshold_crit) + overlays += cryo_health_indicator["crit"] + else + switch((occupant.health / occupant.maxHealth) * 100) // Get a ratio of health to work with + if(100 to INFINITY) // No idea how we got here with the check above... + overlays += cryo_health_indicator["full"] + if(75 to 100) + overlays += cryo_health_indicator["good"] + if(50 to 75) + overlays += cryo_health_indicator["average"] + if(25 to 50) + overlays += cryo_health_indicator["bad"] + if(1 to 25) + overlays += cryo_health_indicator["worse"] + else //Shouldn't ever happen. + overlays += cryo_health_indicator["dead"] icon_state = "cell-occupied" return icon_state = "cell-on" @@ -393,7 +424,7 @@ set category = "Object" set src in oview(1) if(usr == occupant)//If the user is inside the tube... - if (usr.stat == 2)//and he's not dead.... + if (usr.stat == 2 || (usr.status_flags & FAKEDEATH))//and he's not dead.... return usr << "Release sequence activated. This will take two minutes." sleep(1200) @@ -401,7 +432,7 @@ return go_out()//and release him from the eternal prison. else - if (usr.stat != 0 || istype(usr, /mob/living/simple_animal)) + if (usr.stat != 0 || istype(usr, /mob/living/simple_animal) || (usr.status_flags & FAKEDEATH)) return go_out() add_fingerprint(usr) @@ -411,13 +442,13 @@ set name = "Move Inside" set category = "Object" set src in oview(1) - if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting || usr.buckled) //are you cuffed, dying, lying, stunned or other + if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting || usr.buckled || (usr.status_flags & FAKEDEATH)) //are you cuffed, dying, lying, stunned or other return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return - if (usr.stat != 0 || stat & (NOPOWER|BROKEN)) + if (usr.stat != 0 || stat & (NOPOWER|BROKEN) || (usr.status_flags & FAKEDEATH)) return put_mob(usr) return diff --git a/code/game/machinery/defibcharger.dm b/code/game/machinery/defibcharger.dm index ec0fc1077cc..9b3f7a95350 100644 --- a/code/game/machinery/defibcharger.dm +++ b/code/game/machinery/defibcharger.dm @@ -107,7 +107,7 @@ obj/machinery/recharger/defibcharger/wallcharger/attackby(obj/item/weapon/G as o if(a.power_equip == 0) user << "[src] blinks red as you try to insert [D]!" return - user.drop_item(src) + user.drop_item(G, src) charging = G use_power = 2 update_icon() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index fac37a9053d..59cecccccd1 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -68,11 +68,11 @@ for reference: attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/stack/sheet/wood)) if (src.health < src.maxhealth) - visible_message("\red [user] begins to repair the [src]!") + visible_message("[user] begins to repair the [src]!") if(do_after(user,20)) src.health = src.maxhealth W:use(1) - visible_message("\red [user] repairs the [src]!") + visible_message("[user] repairs the [src]!") return else return @@ -85,7 +85,7 @@ for reference: src.health -= W.force * 0.75 else if (src.health <= 0) - visible_message("\red The barricade is smashed apart!") + visible_message("The barricade is smashed apart!") new /obj/item/stack/sheet/wood(get_turf(src, 5)) del(src) ..() @@ -93,13 +93,13 @@ for reference: ex_act(severity) switch(severity) if(1.0) - visible_message("\red The barricade is blown apart!") + visible_message("The barricade is blown apart!") qdel(src) return if(2.0) src.health -= 25 if (src.health <= 0) - visible_message("\red The barricade is blown apart!") + visible_message("The barricade is blown apart!") new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) @@ -107,7 +107,7 @@ for reference: return meteorhit() - visible_message("\red The barricade is smashed apart!") + visible_message("The barricade is smashed apart!") new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) @@ -117,7 +117,7 @@ for reference: blob_act() src.health -= 25 if (src.health <= 0) - visible_message("\red The blob eats through the barricade!") + visible_message("The blob eats through the barricade!") del(src) return @@ -173,7 +173,7 @@ for reference: var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return else if (src.emagged == 1) src.emagged = 2 @@ -181,7 +181,7 @@ for reference: var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return /obj/machinery/deployable/barrier/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -202,7 +202,7 @@ for reference: var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return return else if (istype(W, /obj/item/weapon/wrench)) @@ -210,12 +210,12 @@ for reference: src.health = src.maxhealth src.emagged = 0 src.req_access = list(access_security) - visible_message("\red [user] repairs the [src]!") + visible_message("[user] repairs the [src]!") return else if (src.emagged > 0) src.emagged = 0 src.req_access = list(access_security) - visible_message("\red [user] repairs the [src]!") + visible_message("[user] repairs the [src]!") return return else @@ -267,7 +267,7 @@ for reference: return 0 /obj/machinery/deployable/barrier/proc/explode() - visible_message("\red [src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) /* var/obj/item/stack/rods/ =*/ diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 5181e235de1..f97f91b178b 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -77,7 +77,7 @@ return if(!allowed(user) && (wires & 1)) - user << "\red Access Denied" + user << "Access Denied" flick("doorctrl-denied",src) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index cf3d055deca..34bf6730d68 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -299,7 +299,7 @@ About the new airlock wires panel: * An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires. * one wire from the ID scanner. Sending a pulse through this flashes the red light on the door (if the door has power). If you cut this wire, the door will stop recognizing valid IDs. (If the door has 0000 access, it still opens and closes, though) -* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be \red open, but bolts-raising will not work. Cutting these wires may electrocute the user. +* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be open, but bolts-raising will not work. Cutting these wires may electrocute the user. * one wire for door bolts. Sending a pulse through this drops door bolts (whether the door is powered or not) or raises them (if it is). Cutting this wire also drops the door bolts, and mending it does not raise them. If the wire is cut, trying to raise the door bolts will not work. * two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user. * one wire for opening the door. Sending a pulse through this while the door has power makes it open the door if no access is required. @@ -324,7 +324,7 @@ About the new airlock wires panel: else /*if(src.justzap)*/ return else if(user.hallucination > 50 && prob(10) && src.operating == 0) - user << "\red You feel a powerful shock course through your body!" + user << "You feel a powerful shock course through your body!" user.halloss += 10 user.stunned += 10 return @@ -705,14 +705,14 @@ About the new airlock wires panel: usr << "You've already disabled the IdScan feature." else if(isobserver(usr) && !canGhostWrite(usr,src,"disabled IDScan on")) - usr << "\red Nope." + usr << "Nope." return 0 src.aiDisabledIdScanner = 1 if(2) //disrupt main power if(src.secondsMainPowerLost == 0) if(isobserver(usr) && !canGhostWrite(usr,src,"disrupted main power on")) - usr << "\red Nope." + usr << "Nope." return 0 src.loseMainPower() else @@ -721,7 +721,7 @@ About the new airlock wires panel: //disrupt backup power if(src.secondsBackupPowerLost == 0) if(isobserver(usr) && !canGhostWrite(usr,src,"disrupted backup power on")) - usr << "\red Nope." + usr << "Nope." return 0 src.loseBackupPower() else @@ -732,7 +732,7 @@ About the new airlock wires panel: usr << "You can't drop the door bolts - The door bolt dropping wire has been cut." else if(src.locked!=1) if(isobserver(usr) && !canGhostWrite(usr,src,"dropped bolts on")) - usr << "\red Nope." + usr << "Nope." return 0 src.locked = 1 update_icon() @@ -742,12 +742,12 @@ About the new airlock wires panel: usr << text("Can't un-electrify the airlock - The electrification wire is cut.") else if(src.secondsElectrified==-1) if(isobserver(usr) && !canGhostWrite(usr,src,"electrified")) - usr << "\red Nope." + usr << "Nope." return 0 src.secondsElectrified = 0 else if(src.secondsElectrified>0) if(isobserver(usr) && !canGhostWrite(usr,src,"electrified")) - usr << "\red Nope." + usr << "Nope." return 0 src.secondsElectrified = 0 @@ -757,7 +757,7 @@ About the new airlock wires panel: usr << text("Control to door sensors is disabled.") else if (src.safe) if(isobserver(usr) && !canGhostWrite(usr,src,"disabled safeties on")) - usr << "\red Nope." + usr << "Nope." return 0 safe = 0 else @@ -771,7 +771,7 @@ About the new airlock wires panel: usr << text("Control to door timing circuitry has been severed.") else if (src.normalspeed) if(isobserver(usr) && !canGhostWrite(usr,src,"disrupted timing on")) - usr << "\red Nope." + usr << "Nope." return 0 normalspeed = 0 else @@ -785,12 +785,12 @@ About the new airlock wires panel: usr << text("The door bolts are down!") else if(!src.density) if(isobserver(usr) && !canGhostWrite(usr,src,"closed")) - usr << "\red Nope." + usr << "Nope." return 0 close() else if(isobserver(usr) && !canGhostWrite(usr,src,"opened")) - usr << "\red Nope." + usr << "Nope." return 0 open() @@ -800,7 +800,7 @@ About the new airlock wires panel: usr << text("Control to door bolt lights has been severed.
"}, if(anchored) // you can't turn a turret on/off if it's not anchored/secured on = !on // toggle on/off else - usr << "\red It has to be secured first!" + usr << "It has to be secured first!" updateUsrDialog() return @@ -288,10 +288,10 @@ Status: []
"}, /obj/machinery/porta_turret/emag(mob/user) if(!emagged) - user << "\red You short out [src]'s threat assessment circuits." + user << "You short out [src]'s threat assessment circuits." spawn(0) for(var/mob/O in hearers(src, null)) - O.show_message("\red [src] hums oddly...", 1) + O.show_message("[src] hums oddly...", 1) emagged = 1 src.on = 0 // turns off the turret temporarily sleep(60) // 6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit @@ -346,7 +346,7 @@ Status: []
"}, locked = !src.locked user << "Controls are now [locked ? "locked." : "unlocked."]" else - user << "\red Access denied." + user << "Access denied." else user.delayNextAttack(10) @@ -699,7 +699,7 @@ Status: []
"}, if(0) // first step if(istype(W, /obj/item/weapon/wrench) && !anchored) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue You secure the external bolts." + user << "You secure the external bolts." anchored = 1 build_step = 1 return @@ -716,7 +716,7 @@ Status: []
"}, if(1) if(istype(W, /obj/item/stack/sheet/metal)) if(W:amount>=2) // requires 2 metal sheets - user << "\blue You add some metal armor to the interior frame." + user << "You add some metal armor to the interior frame." build_step = 2 W:amount -= 2 icon_state = "turret_frame2" @@ -735,7 +735,7 @@ Status: []
"}, if(2) if(istype(W, /obj/item/weapon/wrench)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue You bolt the metal armor into place." + user << "You bolt the metal armor into place." build_step = 3 return @@ -743,7 +743,7 @@ Status: []
"}, var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + user << "You need more fuel to complete this task." return playsound(get_turf(src), pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) @@ -763,7 +763,7 @@ Status: []
"}, var/obj/item/weapon/gun/energy/E = W // typecasts the item to an energy gun installation = W.type // installation becomes W.type gun_charge = E.power_supply.charge // the gun's charge is stored in src.gun_charge - user << "\blue You add \the [W] to the turret." + user << "You add \the [W] to the turret." build_step = 4 qdel(W) // delete the gun :( return @@ -777,7 +777,7 @@ Status: []
"}, if(4) if(isprox(W)) build_step = 5 - user << "\blue You add the prox sensor to the turret." + user << "You add the prox sensor to the turret." qdel(W) return @@ -787,7 +787,7 @@ Status: []
"}, if(istype(W, /obj/item/weapon/screwdriver)) playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 100, 1) build_step = 6 - user << "\blue You close the internal access hatch." + user << "You close the internal access hatch." return // attack_hand() removes the prox sensor @@ -795,7 +795,7 @@ Status: []
"}, if(6) if(istype(W, /obj/item/stack/sheet/metal)) if(W:amount>=2) - user << "\blue You add some metal armor to the exterior frame." + user << "You add some metal armor to the exterior frame." build_step = 7 W:amount -= 2 if(W:amount <= 0) @@ -813,13 +813,13 @@ Status: []
"}, var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) return if (WT.get_fuel() < 5) - user << "\red You need more fuel to complete this task." + user << "You need more fuel to complete this task." playsound(get_turf(src), pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 30)) if(!src || !WT.remove_fuel(5, user)) return build_step = 8 - user << "\blue You weld the turret's armor down." + user << "You weld the turret's armor down." // The final step: create a full turret var/obj/machinery/porta_turret/Turret = new/obj/machinery/porta_turret(locate(x,y,z)) @@ -994,7 +994,7 @@ Status: []
"}, else Parent_Turret.on=1 else - usr << "\red It has to be secured first!" + usr << "It has to be secured first!" updateUsrDialog() return @@ -1018,10 +1018,10 @@ Status: []
"}, /obj/machinery/porta_turret_cover/attackby(obj/item/W as obj, mob/user as mob) if ((istype(W, /obj/item/weapon/card/emag)) && (!Parent_Turret.emagged)) - user << "\red You short out [Parent_Turret]'s threat assessment circuits." + user << "You short out [Parent_Turret]'s threat assessment circuits." spawn(0) for(var/mob/O in hearers(Parent_Turret, null)) - O.show_message("\red [Parent_Turret] hums oddly...", 1) + O.show_message("[Parent_Turret] hums oddly...", 1) Parent_Turret.emagged = 1 Parent_Turret.on = 0 sleep(40) @@ -1048,7 +1048,7 @@ Status: []
"}, user << "Controls are now [Parent_Turret.locked ? "locked." : "unlocked."]" updateUsrDialog() else - user << "\red Access denied." + user << "Access denied." else Parent_Turret.health -= W.force * 0.5 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d88eca077be..854dee09060 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -33,7 +33,7 @@ return if (istype(G, /obj/item/weapon/gun/energy/staff)) return - user.drop_item(src) + user.drop_item(G, src) charging = G use_power = 2 update_icon() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 4ef0279ca5d..d2838388de5 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -105,7 +105,7 @@ /obj/machinery/recharge_station/attackby(var/obj/item/W, var/mob/living/user) if(is_type_in_list(W, acceptable_upgradeables)) if(!(locate(W.type) in upgrade_holder)) - user.drop_item(src) + user.drop_item(W, src) upgrade_holder.Add(W) user << "You add \the [W] to \the [src]." return diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index 370e2f3843e..24218bfa89c 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -70,8 +70,8 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user) Black Marks:
"} for(var/A in marks) - text += "\red[A]
" - user << "\blue You feel a sting as the scanner extracts some of your blood." + text += "[A]
" + user << "You feel a sting as the scanner extracts some of your blood." var/turf/T = get_step(src,outputdir) var/obj/item/weapon/paper/print = new(T) print.name = "[mname] Report" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 8226b2290ec..01d415ed723 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -1,5 +1,4 @@ /******************** Requests Console ********************/ -/** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */ var/req_console_assistance = list() var/req_console_supplies = list() @@ -34,14 +33,14 @@ var/list/obj/machinery/requests_console/allConsoles = list() // 2 = req. supplies // 3 = relay information // 4 = write msg - not used - // 5 = choose priority - not used + // 5 = configure panel // 6 = sent successfully // 7 = sent unsuccessfully // 8 = view messages // 9 = authentication before sending // 10 = send announcement var/silent = 0 // set to 1 for it not to beep all the time -// var/hackState = 0 + var/hackState = 0 // 0 = not hacked // 1 = hacked var/announcementConsole = 0 @@ -69,9 +68,20 @@ var/list/obj/machinery/requests_console/allConsoles = list() icon_state = "req_comp0" /obj/machinery/requests_console/New() - name = "[department] Requests Console" allConsoles.Add(src) - //req_console_departments += department + set_department(department,departmentType) + return ..() + +/obj/machinery/requests_console/proc/set_department(var/name, var/D) + department = name + departmentType = D + name = "[department] Requests Console" + if("[department]" in req_console_assistance) + req_console_assistance -= department + if("[department]" in req_console_supplies) + req_console_supplies -= department + if("[department]" in req_console_information) + req_console_information -= department switch(departmentType) if(1) if(!("[department]" in req_console_assistance)) @@ -105,8 +115,6 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(!("[department]" in req_console_information)) req_console_information += department - return ..() - /obj/machinery/requests_console/attack_hand(user as mob) if(..(user)) return @@ -146,7 +154,23 @@ var/list/obj/machinery/requests_console/allConsoles = list() // dat += text(" or EXTREME)") dat += text(")
") dat += text("
Back
") - + if(5) //configure panel + dat += text("Configure Panel
") + if(announceAuth) + dat += text("Authentication accepted
") + else + dat += text("Swipe your card to authenticate yourself.
") + if (announceAuth) + dat += text("Configure department. Set to 0 to release internal locks for deconstruction.
") + dat += text("No Contact
") + dat += text("Assistance
") + dat += text("Supply
") + dat += text("Anonymous Tip Recipient
") + dat += text("Assistance + Supply
") + dat += text("Assistance + Tips
") + dat += text("Supply + Tips
") + dat += text("All
") + dat += text("
Back
") if(6) //sent successfully dat += text("Message sent
") dat += text("Continue
") @@ -199,6 +223,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() dat += text("Request Assistance
") dat += text("Request Supplies
") dat += text("Relay Anonymous Information
") + dat += text("Configure Panel
") if(announcementConsole) dat += text("Send station-wide announcement
") if (silent) @@ -323,7 +348,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() screen = 3 // if(4) //write message // screen = 4 - if(5) //choose priority + if(5) //configure screen = 5 if(6) //sent successfully screen = 6 @@ -350,6 +375,12 @@ var/list/obj/machinery/requests_console/allConsoles = list() if("1") silent = 1 else silent = 0 + switch( href_list["setDepartment"] ) + if(null) //skip + else + var/name = reject_bad_text(input(usr,"Name:","Name this department.","Public") as null|text) + set_department(name,text2num(href_list["setDepartment"])) + updateUsrDialog() return @@ -360,42 +391,54 @@ var/list/obj/machinery/requests_console/allConsoles = list() return "beeps, \"[text]\"" - //err... hacking code, which has no reason for existing... but anyway... it's supposed to unlock priority 3 messanging on that console (EXTREME priority...) the code for that actually exists. + //deconstruction and hacking /obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) - /* if (istype(O, /obj/item/weapon/crowbar)) if(open) open = 0 icon_state="req_comp0" else open = 1 - if(hackState == 0) + if(!hackState) icon_state="req_comp_open" - else if(hackState == 1) + else icon_state="req_comp_rewired" if (istype(O, /obj/item/weapon/screwdriver)) if(open) - if(hackState == 0) + if(!hackState) hackState = 1 icon_state="req_comp_rewired" - else if(hackState == 1) + else hackState = 0 icon_state="req_comp_open" else - user << "You can't do much with that."*/ - + user << "You can't do much with that." + if(iswrench(O) && open && !departmentType) + user.visible_message("[user] disassembles the [src]!", "You disassemble the [src]") + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 100, 1) + new /obj/item/stack/sheet/metal (src.loc,2) + qdel(src) + return if (istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/device/pda)) + if(screen == 5) + var/obj/item/weapon/card/id/ID = O.GetID() + if (hackState || ID.access.Find(access_engine_equip)) + announceAuth = 1 + else + announceAuth = 0 + user << "You are not authorized to configure this panel." + updateUsrDialog() if(screen == 9) var/obj/item/weapon/card/id/ID = O.GetID() msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" updateUsrDialog() if(screen == 10) var/obj/item/weapon/card/id/ID = O.GetID() - if (access_RC_announce in ID.access) + if (hackState || ID.access.Find(access_RC_announce)) announceAuth = 1 else announceAuth = 0 - user << "\red You are not authorized to send announcements." + user << "You are not authorized to send announcements." updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(screen == 9) diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index 59db8b75a05..7c53adb1107 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -60,7 +60,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob // Fruits and vegetables. if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown)) - user.drop_item() + user.drop_item(O) var/datum/seed/new_seed_type if(istype(O, /obj/item/weapon/grown)) @@ -93,7 +93,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob var/obj/item/F = O if(F.nonplant_seed_type) user << "You extract some seeds from the [F.name]." - user.drop_item() + user.drop_item(O) var/t_amount = 0 var/t_max = rand(1,4) while(t_amount < t_max) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 6f1220b2b62..f1880c88e8c 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -52,7 +52,7 @@ if (src.health <= 0) - visible_message("\blue The [src] dissapates") + visible_message("The [src] dissapates") del(src) return @@ -63,7 +63,7 @@ src.health -= max_health*0.75 //3/4 health as damage if(src.health <= 0) - visible_message("\blue The [src] dissapates") + visible_message("The [src] dissapates") del(src) return @@ -75,7 +75,7 @@ health -= Proj.damage ..() if(health <=0) - visible_message("\blue The [src] dissapates") + visible_message("The [src] dissapates") del(src) return opacity = 1 @@ -108,7 +108,7 @@ /obj/machinery/shield/hitby(AM as mob|obj) //Let everyone know we've been hit! - visible_message("\red [src] was hit by [AM].") + visible_message("[src] was hit by [AM].") //Super realistic, resource-intensive, real-time damage calculations. var/tforce = 0 @@ -124,7 +124,7 @@ //Handle the destruction of the shield if (src.health <= 0) - visible_message("\blue The [src] dissapates") + visible_message("The [src] dissapates") del(src) return @@ -246,14 +246,14 @@ return if (src.active) - user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \ - "\blue \icon[src] You deactivate the shield generator.", \ + user.visible_message("\icon[src] [user] deactivated the shield generator.", \ + "\icon[src] You deactivate the shield generator.", \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\blue \icon[src] [user] activated the shield generator.", \ - "\blue \icon[src] You activate the shield generator.", \ + user.visible_message("\icon[src] [user] activated the shield generator.", \ + "\icon[src] You activate the shield generator.", \ "You hear heavy droning.") src.shields_up() else @@ -284,14 +284,14 @@ if(istype(W, /obj/item/stack/cable_coil) && malfunction && panel_open) var/obj/item/stack/cable_coil/coil = W - user << "\blue You begin to replace the wires." + user << "You begin to replace the wires." //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage if(do_after(user, 30)) if(!src || !coil) return coil.use(1) health = max_health malfunction = 0 - user << "\blue You repair the [src]!" + user << "You repair the [src]!" update_icon() return @@ -300,7 +300,7 @@ src.locked = !src.locked user << "The controls are now [src.locked ? "locked." : "unlocked."]" else - user << "\red Access denied." + user << "Access denied." return @@ -367,13 +367,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(!anchored) - user << "\red The shield generator needs to be firmly secured to the floor first." + user << "The shield generator needs to be firmly secured to the floor first." return 1 if(src.locked && !istype(user, /mob/living/silicon)) - user << "\red The controls are locked!" + user << "The controls are locked!" return 1 if(power != 1) - user << "\red The shield generator needs to be powered by wire underneath." + user << "The shield generator needs to be powered by wire underneath." return 1 if(src.active) @@ -419,7 +419,7 @@ src.active = 2 if(src.active == 1) if(src.power == 0) - src.visible_message("\red The [src.name] shuts down due to lack of power!", \ + src.visible_message("The [src.name] shuts down due to lack of power!", \ "You hear heavy droning fade out") icon_state = "Shield_Gen" src.active = 0 @@ -494,11 +494,11 @@ src.locked = !src.locked user << "Controls are now [src.locked ? "locked." : "unlocked."]" else - user << "\red Access denied." + user << "Access denied." else src.add_fingerprint(user) - visible_message("\red The [src.name] has been hit with the [W.name] by [user.name]!") + visible_message("The [src.name] has been hit with the [W.name] by [user.name]!") /obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) var/obj/machinery/shieldwall/F diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index aecfa216506..87eea6c6b6d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -241,7 +241,7 @@ /obj/machinery/suit_storage_unit/Topic(href, href_list) //I fucking HATE this proc if(..()) return 1 - else + else usr.set_machine(src) if (href_list["toggleUV"]) src.toggleUV(usr) @@ -530,7 +530,7 @@ set category = "Object" set src in oview(1) - if (usr.stat != 0) + if (usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return src.eject_occupant(usr) add_fingerprint(usr) @@ -544,7 +544,7 @@ set category = "Object" set src in oview(1) - if (usr.stat != 0) + if (usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return if (!src.isopen) usr << "The unit's doors are shut." @@ -631,7 +631,7 @@ user << "The unit already contains a suit." return user << "You load the [S.name] into the storage compartment." - user.drop_item(src) + user.drop_item(S, src) src.SUIT = S src.update_icon() src.updateUsrDialog() @@ -644,7 +644,7 @@ user << "The unit already contains a helmet." return user << "You load the [H.name] into the storage compartment." - user.drop_item(src) + user.drop_item(H, src) src.HELMET = H src.update_icon() src.updateUsrDialog() @@ -657,7 +657,7 @@ user << "The unit already contains a mask." return user << "You load the [M.name] into the storage compartment." - user.drop_item(src) + user.drop_item(M, src) src.MASK = M src.update_icon() src.updateUsrDialog() @@ -670,7 +670,7 @@ user << "The unit already contains shoes." return user << "You load \the [M.name] into the storage compartment." - user.drop_item(src) + user.drop_item(M, src) src.BOOTS = M src.update_icon() src.updateUsrDialog() diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index b33685a12b2..fd54a913d96 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -124,14 +124,14 @@ proc/Activate(mob/user = null) if(!checkWirePower()) - if(user) user << "\blue The connected wire doesn't have enough current." + if(user) user << "The connected wire doesn't have enough current." return for(var/obj/machinery/singularity/singulo in world) if(singulo.z == z) singulo.target = src icon_state = "[icontype]1" active = 1 - if(user) user << "\blue You activate the beacon." + if(user) user << "You activate the beacon." proc/Deactivate(mob/user = null) @@ -140,7 +140,7 @@ singulo.target = null icon_state = "[icontype]0" active = 0 - if(user) user << "\blue You deactivate the beacon." + if(user) user << "You deactivate the beacon." attack_ai(mob/user as mob) @@ -151,20 +151,20 @@ if(stat & SCREWED) return active ? Deactivate(user) : Activate(user) else - user << "\red You need to screw the beacon to the floor first!" + user << "You need to screw the beacon to the floor first!" return attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/screwdriver)) if(active) - user << "\red You need to deactivate the beacon first!" + user << "You need to deactivate the beacon first!" return if(stat & SCREWED) stat &= ~SCREWED anchored = 0 - user << "\blue You unscrew the beacon from the floor." + user << "You unscrew the beacon from the floor." attached = null return else @@ -176,7 +176,7 @@ return stat |= SCREWED anchored = 1 - user << "\blue You screw the beacon to the floor and attach the cable." + user << "You screw the beacon to the floor and attach the cable." return ..() return diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index c9fd3765655..8c9c8fe025c 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -212,7 +212,7 @@ if(href_list["delete"]) if(!src.allowed(usr) && !emagged) - usr << "\red ACCESS DENIED." + usr << "ACCESS DENIED." return if(SelectedServer) @@ -252,5 +252,5 @@ if(!emagged) playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" return 1 \ No newline at end of file diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 96c175522bd..3a1babbb7df 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -52,7 +52,7 @@ user << "You insert the cables." A.amount -= 5 if(A.amount <= 0) - user.drop_item() + user.drop_item(A) returnToPool(A) construct_op -- stat &= ~BROKEN // the machine's not borked anymore! diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 888f41933a0..f8887efa675 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -147,6 +147,6 @@ if(!emagged) playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" return 1 return diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index de205ceb420..5641a9f2f5f 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -185,7 +185,7 @@ var/obj/item/weapon/card/id/I = C.get_active_hand() if(istype(I)) if(check_access(I)) - C.drop_item(src) + C.drop_item(I, src) auth = I create_log("has logged in.", usr) else @@ -201,7 +201,7 @@ return if(!auth && !issilicon(usr) && !emagged) - usr << "\red ACCESS DENIED." + usr << "ACCESS DENIED." return if(href_list["viewserver"]) @@ -291,7 +291,7 @@ if(!emagged) playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" src.updateUsrDialog() return 1 /obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index c1a4110ab3b..d2718e59385 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -39,14 +39,14 @@ if(istype(L, /obj/effect/landmark/) && istype(L.loc, /turf)) usr << "You insert the coordinates into the machine." usr << "A message flashes across the screen reminding the traveller that the nuclear authentication disk is to remain on the station at all times." - user.drop_item() + user.drop_item(I) qdel(I) /* FUCK YOU if(C.data == "Clown Land") //whoops for(var/mob/O in hearers(src, null)) - O.show_message("\red Incoming bluespace portal detected, unable to lock in.", 2) + O.show_message("Incoming bluespace portal detected, unable to lock in.", 2) for(var/obj/machinery/teleport/hub/H in range(1)) var/amount = rand(2,5) @@ -56,7 +56,7 @@ else */ for(var/mob/O in hearers(src, null)) - O.show_message("\blue Locked In", 2) + O.show_message("Locked In", 2) src.locked = L one_time_use = 1 @@ -110,7 +110,7 @@ var/desc = input("Please select a location to lock in.", "Locking Computer") in L src.locked = L[desc] for(var/mob/O in hearers(src, null)) - O.show_message("\blue Locked In", 2) + O.show_message("Locked In", 2) src.add_fingerprint(usr) return @@ -126,14 +126,6 @@ src.id = t return -/proc/find_loc(obj/R as obj) - if (!R) return null - var/turf/T = R.loc - while(!istype(T, /turf)) - T = T.loc - if(!T || istype(T, /area)) return null - return T - /obj/machinery/teleport name = "teleport" icon = 'icons/obj/stationobjs.dmi' @@ -202,7 +194,7 @@ return if (!com.locked) for(var/mob/O in hearers(src, null)) - O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") + O.show_message("Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") return if (istype(M, /atom/movable)) if(prob(5) && !accurate) //oh dear a problem, put em in deep space @@ -218,7 +210,7 @@ s.set_up(5, 1, src) s.start() for(var/mob/B in hearers(src, null)) - B.show_message("\blue Test fire completed.") + B.show_message("Test fire completed.") return /* /proc/do_teleport(atom/movable/M as mob|obj, atom/destination, precision) @@ -227,12 +219,12 @@ return if (istype(M, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite for(var/mob/O in viewers(M, null)) - O.show_message(text("\red The [] bounces off of the portal!", M.name), 1) + O.show_message(text("The [] bounces off of the portal!", M.name), 1) return if (istype(M, /mob/living)) var/mob/living/MM = M if(MM.check_contents_for(/obj/item/weapon/disk/nuclear)) - MM << "\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through." + MM << "Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through." return var/disky = 0 for (var/atom/O in M.contents) //I'm pretty sure this accounts for the maximum amount of container in container stacking. --NeoFite @@ -252,14 +244,14 @@ disky = 1 if (disky) for(var/mob/P in viewers(M, null)) - P.show_message(text("\red The [] bounces off of the portal!", M.name), 1) + P.show_message(text("The [] bounces off of the portal!", M.name), 1) return //Bags of Holding cause bluespace teleportation to go funky. --NeoFite if (istype(M, /mob/living)) var/mob/living/MM = M if(MM.check_contents_for(/obj/item/weapon/storage/backpack/holding)) - MM << "\red The Bluespace interface on your Bag of Holding interferes with the teleport!" + MM << "The Bluespace interface on your Bag of Holding interferes with the teleport!" precision = rand(1,100) if (istype(M, /obj/item/weapon/storage/backpack/holding)) precision = rand(1,100) @@ -373,7 +365,7 @@ obj/machinery/teleport/station/New() H.icon_state = "tele1" use_power(5000) for(var/mob/O in hearers(src, null)) - O.show_message("\blue Teleporter engaged!", 2) + O.show_message("Teleporter engaged!", 2) src.add_fingerprint(usr) src.engaged = 1 return @@ -389,7 +381,7 @@ obj/machinery/teleport/station/New() H.engaged = 0 H.icon_state = "tele0" for(var/mob/O in hearers(src, null)) - O.show_message("\blue Teleporter disengaged!", 2) + O.show_message("Teleporter disengaged!", 2) src.add_fingerprint(usr) src.engaged = 0 return @@ -407,7 +399,7 @@ obj/machinery/teleport/station/New() if (com && !active) active = 1 for(var/mob/O in hearers(src, null)) - O.show_message("\blue Test firing!", 2) + O.show_message("Test firing!", 2) com.teleport() use_power(5000) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 1a65376d103..4e6355b03dc 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -144,7 +144,7 @@ /obj/machinery/transformer/Topic(href, href_list) if(!isAI(usr)) - usr << "\red This machine is way above your pay-grade." + usr << "This machine is way above your pay-grade." return 0 if(!("act" in href_list)) return 0 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 13e9fb5a94f..2cd0a46c058 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -367,7 +367,7 @@ /obj/machinery/turretid/emag(mob/user) if(!emagged) - user << "\red You short out the turret controls' access analysis module." + user << "You short out the turret controls' access analysis module." emagged = 1 locked = 0 if(user.machine==src) @@ -438,14 +438,14 @@ /obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob) if(M.melee_damage_upper == 0) return if(!(stat & BROKEN)) - visible_message("\red [M] [M.attacktext] [src]!") + visible_message("[M] [M.attacktext] [src]!") M.attack_log += text("\[[time_stamp()]\] attacked [src.name]") //src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])") src.health -= M.melee_damage_upper if (src.health <= 0) src.die() else - M << "\red That object is useless to you." + M << "That object is useless to you." return @@ -454,12 +454,12 @@ /obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if(!(stat & BROKEN)) playsound(get_turf(src), 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("\red [] has slashed at []!", M, src) + visible_message("[] has slashed at []!", M, src) src.health -= 15 if (src.health <= 0) src.die() else - M << "\green That object is useless to you." + M << "That object is useless to you." return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c802d624cac..bf60649313b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -306,7 +306,7 @@ return else if(istype(W, /obj/item/weapon/coin) && premium.len > 0) if (isnull(coin)) - user.drop_item(src) + user.drop_item(W, src) coin = W user << "You insert a coin into [src]." else @@ -315,7 +315,7 @@ return else if(istype(W, /obj/item/voucher)) if(can_accept_voucher(W, user)) - user.drop_item(src) + user.drop_item(W, src) user << "You insert [W] into [src]." return voucher_act(W, user) else @@ -516,10 +516,10 @@ if(istype(usr,/mob/living/silicon/robot)) var/mob/living/silicon/robot/R = usr if(!(R.module && istype(R.module,/obj/item/weapon/robot_module/butler) ) && !isMoMMI(R)) - usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!" + usr << "The vending machine refuses to interface with you, as you are not in its target demographic!" return else - usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!" + usr << "The vending machine refuses to interface with you, as you are not in its target demographic!" return if(href_list["remove_coin"]) @@ -530,7 +530,7 @@ coin.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(coin) - usr << "\blue You remove the [coin] from the [src]" + usr << "You remove the [coin] from the [src]" coin = null usr.set_machine(src) @@ -539,7 +539,7 @@ //testing("vend: [href]") if (!allowed(usr) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH - usr << "\red Access denied." //Unless emagged of course + usr << "Access denied." //Unless emagged of course flick(src.icon_deny,src) return @@ -596,7 +596,7 @@ /obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user, by_voucher = 0) if (!allowed(user) && !emagged && wires.IsIndexCut(VENDING_WIRE_IDSCAN)) //For SECURE VENDING MACHINES YEAH - user << "\red Access denied." //Unless emagged of course + user << "Access denied." //Unless emagged of course flick(src.icon_deny,src) return src.vend_ready = 0 //One thing at a time!! @@ -719,7 +719,7 @@ return 0 spawn(0) throw_item.throw_at(target, 16, 3) - src.visible_message("\red [src] launches [throw_item.name] at [target.name]!") + src.visible_message("[src] launches [throw_item.name] at [target.name]!") return 1 /obj/machinery/vending/update_icon() @@ -1020,7 +1020,7 @@ usr << "You begin to insert \the [C] into \the [src]." if(do_after(user, 10)) usr << "You secure \the [C]!" - user.drop_item(src) + user.drop_item(C, src) _circuitboard=C playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0) build++ @@ -1225,7 +1225,7 @@ icon_state = "engivend" icon_deny = "engivend-deny" req_access_txt = "11" //Engineering Equipment access - products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/circuitboard/airlock = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/circuitboard/air_alarm = 10,/obj/item/weapon/intercom_electronics = 10,/obj/item/weapon/cell/high = 10) + products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/circuitboard/airlock = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/circuitboard/air_alarm = 10,/obj/item/weapon/intercom_electronics = 10,/obj/item/weapon/cell/high = 10, /obj/item/mounted/frame/newscaster = 10) contraband = list(/obj/item/weapon/cell/potato = 3) premium = list(/obj/item/weapon/storage/belt/utility = 3) @@ -1289,9 +1289,12 @@ /obj/item/clothing/suit/wizrobe/fake = 3,/obj/item/clothing/head/wizard/fake = 3,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 3, /obj/item/clothing/under/sexyclown = 3,/obj/item/clothing/mask/gas/sexymime = 3,/obj/item/clothing/under/sexymime = 3,/obj/item/clothing/suit/apron/overalls = 3, /obj/item/clothing/head/rabbitears = 3,/obj/item/clothing/head/lordadmiralhat = 3,/obj/item/clothing/suit/lordadmiral = 3,/obj/item/clothing/suit/doshjacket = 3,/obj/item/clothing/under/jester = 3, /obj/item/clothing/head/jesterhat = 3,/obj/item/clothing/shoes/jestershoes = 3, /obj/item/clothing/suit/kefkarobe = 3, - /obj/item/clothing/head/helmet/aviatorhelmet = 3,/obj/item/clothing/shoes/aviatorboots = 3, /obj/item/clothing/under/aviatoruniform = 3,/obj/item/clothing/head/libertyhat = 3,/obj/item/clothing/suit/libertycoat = 3, /obj/item/clothing/under/libertyshirt = 3, /obj/item/clothing/shoes/libertyshoes = 3) //Pretty much everything that had a chance to spawn. + /obj/item/clothing/head/helmet/aviatorhelmet = 3,/obj/item/clothing/shoes/aviatorboots = 3, /obj/item/clothing/under/aviatoruniform = 3,/obj/item/clothing/head/libertyhat = 3,/obj/item/clothing/suit/libertycoat = 3, /obj/item/clothing/under/libertyshirt = 3, /obj/item/clothing/shoes/libertyshoes = 3, + /obj/item/clothing/head/helmet/megahelmet = 3, /obj/item/clothing/under/mega = 3, /obj/item/clothing/gloves/megagloves = 3, /obj/item/clothing/shoes/megaboots =3, /obj/item/clothing/head/helmet/protohelmet = 3, /obj/item/clothing/under/proto =3, /obj/item/clothing/gloves/protogloves =3, /obj/item/clothing/shoes/protoboots =3, + /obj/item/clothing/under/roll = 3, /obj/item/clothing/head/maidhat =3, /obj/item/clothing/under/maid = 3, /obj/item/clothing/suit/maidapron = 3) //Pretty much everything that had a chance to spawn. contraband = list(/obj/item/clothing/suit/cardborg = 3,/obj/item/clothing/head/cardborg = 3,/obj/item/clothing/suit/judgerobe = 3,/obj/item/clothing/head/powdered_wig = 3) - premium = list(/obj/item/clothing/suit/hgpirate = 3, /obj/item/clothing/head/hgpiratecap = 3, /obj/item/clothing/head/helmet/roman = 3, /obj/item/clothing/head/helmet/roman/legionaire = 3, /obj/item/clothing/under/roman = 3, /obj/item/clothing/shoes/roman = 3, /obj/item/weapon/shield/riot/roman = 3,/obj/item/clothing/under/stilsuit = 3) + premium = list(/obj/item/clothing/suit/hgpirate = 3, /obj/item/clothing/head/hgpiratecap = 3, /obj/item/clothing/head/helmet/roman = 3, /obj/item/clothing/head/helmet/roman/legionaire = 3, /obj/item/clothing/under/roman = 3, /obj/item/clothing/shoes/roman = 3, /obj/item/weapon/shield/riot/roman = 3,/obj/item/clothing/under/stilsuit = 3, + /obj/item/clothing/head/helmet/breakhelmet = 3, /obj/item/clothing/head/helmet/joehelmet = 3, /obj/item/clothing/under/joe = 3, /obj/item/clothing/gloves/joegloves = 3, /obj/item/clothing/shoes/joeboots =3, /obj/item/weapon/shield/riot/proto = 3, /obj/item/weapon/shield/riot/joe = 3, /obj/item/clothing/under/darkholme = 3) pack = /obj/structure/vendomatpack/autodrobe diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index b80ec2da282..e61c59d80bd 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -216,7 +216,7 @@ else if(istype(W,/obj/item/toy/crayon) ||istype(W,/obj/item/weapon/stamp)) if( wash_state in list( 1, 3, 6 ) ) if(!crayon) - user.drop_item(src) + user.drop_item(W, src) crayon = W else if(istype(W,/obj/item/weapon/grab)) if( (wash_state == 1) && hacked) @@ -275,12 +275,12 @@ if(contents.len < 5) if ( wash_state in list(1, 3) ) - user.drop_item(src) + user.drop_item(W, src) wash_state = 3 else - user << "\blue You can't put the item in right now." + user << "You can't put the item in right now." else - user << "\blue The washing machine is full." + user << "The washing machine is full." update_icon() /obj/machinery/washing_machine/attack_hand(mob/user as mob) @@ -300,7 +300,7 @@ crayon = null wash_state = 1 if(5) - user << "\red The [src] is busy." + user << "The [src] is busy." if(6) wash_state = 7 if(7) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 6e1d3a0ac9b..1f648f0b39b 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -99,7 +99,7 @@ target:attackby(src,src.occupant) else if(prob(5)) target:dismantle_wall(1) - src.occupant_message("\blue You smash through the wall.") + src.occupant_message("You smash through the wall.") src.visible_message("[src.name] smashes through the wall") playsound(src, 'sound/weapons/smash.ogg', 50, 1) melee_can_hit = 0 diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 4e1ee55f102..f34ec0cd57f 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -57,8 +57,8 @@ M.take_overall_damage(dam_force) M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - occupant_message("\red You squeeze [target] with [src.name]. Something cracks.") - chassis.visible_message("\red [chassis] squeezes [target].") + occupant_message("You squeeze [target] with [src.name]. Something cracks.") + chassis.visible_message("[chassis] squeezes [target].") M.attack_log +="\[[time_stamp()]\] Mech Squeezed by [chassis.occupant.name] ([chassis.occupant.ckey]) with [src.name]" chassis.occupant.attack_log += "\[[time_stamp()]\] Mech Squeezed [M.name] ([M.ckey]) with [src.name]" log_attack("[chassis.occupant.name] ([chassis.occupant.ckey]) mech squeezed [M.name] ([M.ckey]) with [src.name]" ) @@ -222,7 +222,7 @@ if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1) var/obj/o = target o.reagents.trans_to(src, 200) - occupant_message("\blue Extinguisher refilled") + occupant_message("Extinguisher refilled") playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6) else if(src.reagents.total_volume > 0) @@ -561,7 +561,7 @@ return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) - user << "\red The [W] bounces off [chassis] armor." + user << "The [W] bounces off [chassis] armor." chassis.log_append_to_last("Armor saved.") else chassis.occupant_message("[user] hits [chassis] with [W].") @@ -612,7 +612,7 @@ if(!action_checks(src)) return chassis.dynbulletdamage(Proj) if(prob(chassis.deflect_chance*deflect_coeff)) - chassis.occupant_message("\blue The armor deflects incoming projectile.") + chassis.occupant_message("The armor deflects incoming projectile.") chassis.visible_message("The [chassis.name] armor deflects the projectile") chassis.log_append_to_last("Armor saved.") else @@ -628,7 +628,7 @@ if(!action_checks(A)) return chassis.dynhitby(A) if(prob(chassis.deflect_chance*deflect_coeff) || istype(A, /mob/living) || istype(A, /obj/item/mecha_parts/mecha_tracking)) - chassis.occupant_message("\blue The [A] bounces off the armor.") + chassis.occupant_message("The [A] bounces off the armor.") chassis.visible_message("The [A] bounces off the [chassis] armor") chassis.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) @@ -1071,11 +1071,11 @@ var/mob/living/M = target if(M.stat>1) return if(chassis.occupant.a_intent == I_HURT) - chassis.occupant_message("\red You obliterate [target] with [src.name], leaving blood and guts everywhere.") - chassis.visible_message("\red [chassis] destroys [target] in an unholy fury.") + chassis.occupant_message("You obliterate [target] with [src.name], leaving blood and guts everywhere.") + chassis.visible_message("[chassis] destroys [target] in an unholy fury.") if(chassis.occupant.a_intent == I_DISARM) - chassis.occupant_message("\red You tear [target]'s limbs off with [src.name].") - chassis.visible_message("\red [chassis] rips [target]'s arms off.") + chassis.occupant_message("You tear [target]'s limbs off with [src.name].") + chassis.visible_message("[chassis] rips [target]'s arms off.") else step_away(M,chassis) chassis.occupant_message("You smash into [target], sending them flying.") diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index f0480a8886a..bcace16b3f4 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -443,7 +443,7 @@ else src.log_append_to_last("Armor saved.") playsound(get_turf(src), 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\green Your claws had no effect!" + user << "Your claws had no effect!" src.occupant_message("The [user]'s claws are stopped by the armor.") visible_message("The [user] rebounds off [src.name]'s armor!") return @@ -591,18 +591,18 @@ src.take_damage(6) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(get_turf(src), 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\red You smash at the armored suit!" + user << "You smash at the armored suit!" for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\red The [user] smashes against [src.name]'s armor!", 1) + V.show_message("The [user] smashes against [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") playsound(get_turf(src), 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\green Your attack had no effect!" - src.occupant_message("\blue The [user]'s attack is stopped by the armor.") + user << "Your attack had no effect!" + src.occupant_message("The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\blue The [user] rebounds off the [src.name] armor!", 1) + V.show_message("The [user] rebounds off the [src.name] armor!", 1) return */ @@ -665,7 +665,7 @@ var/obj/item/mecha_parts/mecha_equipment/E = W spawn() if(E.can_attach(src)) - user.drop_item() + user.drop_item(W) E.attach(src) user.visible_message("[user] attaches [W] to [src]", "You attach [W] to [src]") else @@ -731,7 +731,7 @@ if(state==4) if(!src.cell) user << "You install the powercell" - user.drop_item(src) + user.drop_item(W, src) src.cell = W src.log_message("Powercell installed") else @@ -764,7 +764,7 @@ /* src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - user << "\red The [W] bounces off [src.name] armor." + user << "The [W] bounces off [src.name] armor." src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -950,7 +950,7 @@ set name = "Enter Exosuit" set src in oview(1) - if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other + if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting || (usr.status_flags & FAKEDEATH)) //are you cuffed, dying, lying, stunned or other return if (usr.stat || !ishuman(usr)) return @@ -961,7 +961,7 @@ return /* if (usr.abiotic()) - usr << "\blue Subject cannot have abiotic items on." + usr << "Subject cannot have abiotic items on." return */ var/passed @@ -1442,7 +1442,7 @@ return if(href_list["close"]) return - if(usr.stat > 0) + if(usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return var/datum/topic_input/filter = new /datum/topic_input(href,href_list) if(href_list["select_equip"]) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index c4d03a2b9a1..d347c040b34 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -47,7 +47,7 @@ else user << "You failed to salvage anything valuable from [src]." else - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." return if(istype(W, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 1b7fb3de9b8..df8bffe5c6a 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -71,7 +71,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) if(O && O in src.cargo) - src.occupant_message("\blue You unload [O].") + src.occupant_message("You unload [O].") O.loc = get_turf(src) src.cargo -= O var/turf/T = get_turf(O) diff --git a/code/game/objects/closets/walllocker.dm b/code/game/objects/closets/walllocker.dm index 058e8c0237e..b64f7a8eebe 100644 --- a/code/game/objects/closets/walllocker.dm +++ b/code/game/objects/closets/walllocker.dm @@ -94,7 +94,7 @@ usr << "You put \the [G] in \the [src]." defib = G update_icon() - user.drop_item(src) + user.drop_item(G, src) return return diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index db53d8152cb..c58488e53e6 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -94,7 +94,7 @@ /obj/effect/alien/resin/hitby(AM as mob|obj) ..() for(var/mob/O in viewers(src, null)) - O.show_message("\red [src] was hit by [AM].", 1) + O.show_message("[src] was hit by [AM].", 1) var/tforce = 0 if(ismob(AM)) tforce = 10 @@ -109,14 +109,14 @@ /obj/effect/alien/resin/attack_hand() usr.delayNextAttack(10) if (M_HULK in usr.mutations) - usr << "\blue You easily destroy the [name]." + usr << "You easily destroy the [name]." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] destroys the [name]!", 1) + O.show_message("[usr] destroys the [name]!", 1) health = 0 else - usr << "\blue You claw at the [name]." + usr << "You claw at the [name]." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] claws at the [name]!", 1) + O.show_message("[usr] claws at the [name]!", 1) health -= rand(5,10) healthcheck() return @@ -127,15 +127,15 @@ /obj/effect/alien/resin/attack_alien() if (islarva(usr))//Safety check for larva. /N return - usr << "\green You claw at the [name]." + usr << "You claw at the [name]." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] claws at the resin!", 1) + O.show_message("[usr] claws at the resin!", 1) playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) health -= rand(40, 60) if(health <= 0) - usr << "\green You slice the [name] to pieces." + usr << "You slice the [name] to pieces." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] slices the [name] apart!", 1) + O.show_message("[usr] slices the [name] apart!", 1) healthcheck() return @@ -146,19 +146,19 @@ //Only aliens can stick humans and monkeys into resin walls. Also, the wall must not have a person inside already. if(!affecting) if(G.state<2) - user << "\red You need a better grip to do that!" + user << "You need a better grip to do that!" return G.affecting.loc = src G.affecting.paralysis = 10 for(var/mob/O in viewers(world.view, src)) if (O.client) - O << text("\green [] places [] in the resin wall!", G.assailant, G.affecting) + O << text("[] places [] in the resin wall!", G.assailant, G.affecting) affecting=G.affecting del(W) spawn(0) process() else - user << "\red This wall is already occupied." + user << "This wall is already occupied." return */ user.delayNextAttack(10) var/aforce = W.force @@ -288,9 +288,9 @@ Alien plants should do something if theres a lot of poison /obj/effect/alien/weeds/attackby(var/obj/item/weapon/W, var/mob/user) user.delayNextAttack(10) if(W.attack_verb && W.attack_verb.len) - visible_message("\red \The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - visible_message("\red \The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 @@ -361,7 +361,7 @@ Alien plants should do something if theres a lot of poison if(ticks >= target_strength) for(var/mob/O in hearers(src, null)) - O.show_message("\green [src.target] collapses under its own weight into a puddle of goop and undigested debris!", 1) + O.show_message("[src.target] collapses under its own weight into a puddle of goop and undigested debris!", 1) if(istype(target, /turf/simulated/wall)) // I hate turf code. var/turf/simulated/wall/W = target @@ -373,13 +373,13 @@ Alien plants should do something if theres a lot of poison switch(target_strength - ticks) if(6) - visible_message("\green [src.target] is holding up against the acid!") + visible_message("[src.target] is holding up against the acid!") if(4) - visible_message("\green [src.target]\s structure is being melted by the acid!") + visible_message("[src.target]\s structure is being melted by the acid!") if(2) - visible_message("\green [src.target] is struggling to withstand the acid!") + visible_message("[src.target] is struggling to withstand the acid!") if(0 to 1) - visible_message("\green [src.target] begins to crumble under the acid!") + visible_message("[src.target] begins to crumble under the acid!") spawn(rand(150, 200)) tick() /* @@ -416,14 +416,14 @@ Alien plants should do something if theres a lot of poison if(isalien(user)) switch(status) if(BURST) - user << "\red You clear the hatched egg." + user << "You clear the hatched egg." qdel(src) return if(GROWING) - user << "\red The child is not developed yet." + user << "The child is not developed yet." return if(GROWN) - user << "\red You retrieve the child." + user << "You retrieve the child." Burst(0) return else @@ -451,7 +451,7 @@ Alien plants should do something if theres a lot of poison spawn(15) status = BURST if(!child) - src.visible_message("\red The egg bursts apart revealing nothing") + src.visible_message("The egg bursts apart revealing nothing") status = "GROWN" new /obj/effect/decal/cleanable/blood/xeno(src) var/obj/effect/decal/cleanable/blood/xeno/O = getFromPool(/obj/effect/decal/cleanable/blood/xeno, src) @@ -478,9 +478,9 @@ Alien plants should do something if theres a lot of poison return user.delayNextAttack(10) if(W.attack_verb && W.attack_verb.len) - src.visible_message("\red \The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - src.visible_message("\red \The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 if(istype(W, /obj/item/weapon/weldingtool)) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 08b1ba92da3..ff445be4ba8 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -814,7 +814,7 @@ steam.start() -- spawns the effect return M.stop_pulling() - M << "\blue You slipped on the foam!" + M << "You slipped on the foam!" playsound(get_turf(src), 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(5) M.Weaken(2) @@ -904,13 +904,13 @@ steam.start() -- spawns the effect attack_hand(var/mob/user) user.delayNextAttack(10) if ((M_HULK in user.mutations) || (prob(75 - metal*25))) - user << "\blue You smash through the metal foam wall." + user << "You smash through the metal foam wall." for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) - O << "\red [user] smashes through the foamed metal." + O << "[user] smashes through the foamed metal." del(src) else - user << "\blue You hit the metal foam but bounce off it." + user << "You hit the metal foam but bounce off it." return @@ -921,19 +921,19 @@ steam.start() -- spawns the effect G.affecting.loc = src.loc for(var/mob/O in viewers(src)) if (O.client) - O << "\red [G.assailant] smashes [G.affecting] through the foamed metal wall." + O << "[G.assailant] smashes [G.affecting] through the foamed metal wall." del(I) del(src) return if(prob(I.force*20 - metal*25)) - user << "\blue You smash through the foamed metal with \the [I]." + user << "You smash through the foamed metal with \the [I]." for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) - O << "\red [user] smashes through the foamed metal." + O << "[user] smashes through the foamed metal." del(src) else - user << "\blue You hit the metal foam to no effect." + user << "You hit the metal foam to no effect." CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) if(air_group) return 0 @@ -983,10 +983,10 @@ steam.start() -- spawns the effect s.start() for(var/mob/M in viewers(5, location)) - M << "\red The solution violently explodes." + M << "The solution violently explodes." for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - M << "\red The explosion knocks you down." + M << "The explosion knocks you down." M.Weaken(rand(1,5)) return else @@ -1016,7 +1016,7 @@ steam.start() -- spawns the effect */ for(var/mob/M in viewers(8, location)) - M << "\red The solution violently explodes." + M << "The solution violently explodes." explosion(location, devastation, heavy, light, flash) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 1cfb68fe722..13ff0da2b14 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -99,7 +99,7 @@ set category = "Object" set src in oview(1) - if(!istype(src.loc, /turf) || usr.stat || usr.restrained() ) + if(!istype(src.loc, /turf) || usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) return var/turf/T = src.loc @@ -686,7 +686,7 @@ //if((M_CLUMSY in user.mutations) && prob(50)) // M = user /* - M << "\red You stab yourself in the eye." + M << "You stab yourself in the eye." M.sdisabilities |= BLIND M.weakened += 4 M.adjustBruteLoss(10) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 7144b861ebd..a96b12070f9 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -104,20 +104,20 @@ move an amendment to the drawing. if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - usr << "\red The new area must be completely airtight!" + usr << "The new area must be completely airtight!" return if(ROOM_ERR_TOOLARGE) - usr << "\red The new area too large!" + usr << "The new area too large!" return else - usr << "\red Error! Please notify administration!" + usr << "Error! Please notify administration!" return var/list/turf/turfs = res var/str = trim(stripped_input(usr,"New area name:","Blueprint Editing", "", MAX_NAME_LEN)) if(!str || !length(str)) //cancel return if(length(str) > 50) - usr << "\red Name too long." + usr << "Name too long." return var/area/A = new A.name = str @@ -161,12 +161,12 @@ move an amendment to the drawing. if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - usr << "\red Text too long." + usr << "Text too long." return set_area_machinery_title(A,str,prevname) for(var/area/RA in A.related) RA.name = str - usr << "\blue You set the area '[prevname]' title to '[str]'." + usr << "You set the area '[prevname]' title to '[str]'." interact() return diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 83d7e88ccf0..7c096980e2a 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -123,5 +123,5 @@ /obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location) if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return - usr << "\red You can't fold that up anymore.." + usr << "You can't fold that up anymore.." ..() \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ee73d537d8e..c6d6f35152e 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -84,7 +84,7 @@ if(uses) uses-- if(!uses) - user << "\red You used up your crayon!" + user << "You used up your crayon!" del(src) return @@ -95,7 +95,7 @@ if(uses) uses -= 5 if(uses <= 0) - user << "\red You ate your crayon!" + user << "You ate your crayon!" del(src) else ..() diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index a112e25a67e..e9f3e94c8b6 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -487,7 +487,7 @@ var/global/list/obj/item/device/pda/PDAs = list() set category = "AI Commands" set name = "Send Message" set src in usr - if(usr.stat == 2) + if(usr.stat == 2 || (usr.status_flags & FAKEDEATH)) usr << "You can't send PDA messages because you are dead!" return var/list/plist = available_pdas() @@ -503,7 +503,7 @@ var/global/list/obj/item/device/pda/PDAs = list() set category = "AI Commands" set name = "Toggle Sender/Receiver" set src in usr - if(usr.stat == 2) + if(usr.stat == 2 || (usr.status_flags & FAKEDEATH)) usr << "You can't do that because you are dead!" return toff = !toff @@ -514,7 +514,7 @@ var/global/list/obj/item/device/pda/PDAs = list() set category = "AI Commands" set name = "Toggle Ringer" set src in usr - if(usr.stat == 2) + if(usr.stat == 2 || (usr.status_flags & FAKEDEATH)) usr << "You can't do that because you are dead!" return silent=!silent @@ -525,7 +525,7 @@ var/global/list/obj/item/device/pda/PDAs = list() set category = "AI Commands" set name = "Show Message Log" set src in usr - if(usr.stat == 2) + if(usr.stat == 2 || (usr.status_flags & FAKEDEATH)) usr << "You can't do that because you are dead!" return var/HTML = "
Messenger
Current Events
Nanotrasen Relay Chat Nanotrasen Relay Chat
View Crew Manifest" + message += "Results:
" else - message += "\blue \icon [container] Results of [container] scan:
" + message += "\icon [container] Results of [container] scan:
" if(total_moles) - message += "[human_standard && abs(pressure - ONE_ATMOSPHERE) > 10 ? "\red" : "\blue"] Pressure: [round(pressure,0.1)] kPa
" + message += "[human_standard && abs(pressure - ONE_ATMOSPHERE) > 10 ? "" : ""] Pressure: [round(pressure,0.1)] kPa
" var/o2_concentration = scanned.oxygen/total_moles var/n2_concentration = scanned.nitrogen/total_moles var/co2_concentration = scanned.carbon_dioxide/total_moles @@ -288,19 +288,19 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) if(n2_concentration > 0.01) - message += "[human_standard && abs(n2_concentration - N2STANDARD) > 20 ? "\red" : "\blue"] Nitrogen: [round(scanned.nitrogen, 0.1)] mol, [round(n2_concentration*100)]%
" + message += "[human_standard && abs(n2_concentration - N2STANDARD) > 20 ? "" : ""] Nitrogen: [round(scanned.nitrogen, 0.1)] mol, [round(n2_concentration*100)]%
" if(o2_concentration > 0.01) - message += "[human_standard && abs(o2_concentration - O2STANDARD) > 2 ? "\red" : "\blue"] Oxygen: [round(scanned.oxygen, 0.1)] mol, [round(o2_concentration*100)]%
" + message += "[human_standard && abs(o2_concentration - O2STANDARD) > 2 ? "" : ""] Oxygen: [round(scanned.oxygen, 0.1)] mol, [round(o2_concentration*100)]%
" if(co2_concentration > 0.01) - message += "[human_standard ? "\red" : "\blue"] CO2: [round(scanned.carbon_dioxide, 0.1)] mol, [round(co2_concentration*100)]%
" + message += "[human_standard ? "" : ""] CO2: [round(scanned.carbon_dioxide, 0.1)] mol, [round(co2_concentration*100)]%
" if(plasma_concentration > 0.01) - message += "[human_standard ? "\red" : "\blue"] Plasma: [round(scanned.toxins, 0.1)] mol, [round(plasma_concentration*100)]%
" + message += "[human_standard ? "" : ""] Plasma: [round(scanned.toxins, 0.1)] mol, [round(plasma_concentration*100)]%
" if(unknown_concentration > 0.01) - message += "\blue Unknown: [round(unknown_concentration*100)]%
" + message += "Unknown: [round(unknown_concentration*100)]%
" - message += "[human_standard && !(scanned.temperature-T0C in range(0, 40)) ? "\red" : "\blue"] Temperature: [round(scanned.temperature-T0C)]°C" + message += "[human_standard && !(scanned.temperature-T0C in range(0, 40)) ? "" : ""] Temperature: [round(scanned.temperature-T0C)]°C" else - message += "\red No gasses detected[container && !istype(container, /turf) ? " in \the [container]." : ""]!" + message += "No gasses detected[container && !istype(container, /turf) ? " in \the [container]." : ""]!" return message /obj/item/device/mass_spectrometer @@ -336,17 +336,17 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) if (user.stat) return if (crit_fail) - user << "\red This device has critically failed and is no longer functional!" + user << "This device has critically failed and is no longer functional!" return if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + 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 << "\red The sample was contaminated! Please insert another sample" + user << "The sample was contaminated! Please insert another sample" return else blood_traces = params2list(R.data["trace_chem"]) @@ -399,12 +399,12 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) if (user.stat) return if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return if(!istype(O)) return if (crit_fail) - user << "\red This device has critically failed and is no longer functional!" + user << "This device has critically failed and is no longer functional!" return if(!isnull(O.reagents)) @@ -413,7 +413,7 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) var/one_percent = O.reagents.total_volume / 100 for (var/datum/reagent/R in O.reagents.reagent_list) if(prob(reliability)) - dat += "\n \t \blue [R][details ? ": [R.volume / one_percent]%" : ""]" + dat += "\n \t [R][details ? ": [R.volume / one_percent]%" : ""]" recent_fail = 0 else if(recent_fail) crit_fail = 1 @@ -422,11 +422,11 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) else recent_fail = 1 if(dat) - user << "\blue Chemicals found: [dat]" + user << "Chemicals found: [dat]" else - user << "\blue No active chemical agents found in [O]." + user << "No active chemical agents found in [O]." else - user << "\blue No significant chemical agents found in [O]." + user << "No significant chemical agents found in [O]." return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 1f7eaf85349..ad060fcbf63 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -53,10 +53,10 @@ set name = "Start Recording" set category = "Object" - if(usr.stat) + if(usr.stat || (usr.status_flags & FAKEDEATH)) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return icon_state = "taperecorderrecording" if(timerecorded < 3600 && playing == 0) @@ -80,10 +80,10 @@ set name = "Stop" set category = "Object" - if(usr.stat) + if(usr.stat || (usr.status_flags & FAKEDEATH)) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(recording == 1) recording = 0 @@ -104,7 +104,7 @@ set name = "Clear Memory" set category = "Object" - if(usr.stat) + if(usr.stat || (usr.status_flags & FAKEDEATH)) return if(emagged == 1) usr << "The tape recorder makes a scratchy noise." @@ -124,10 +124,10 @@ set name = "Playback Memory" set category = "Object" - if(usr.stat) + if(usr.stat || (usr.status_flags & FAKEDEATH)) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(recording == 1) usr << "You can't playback when recording!" @@ -183,10 +183,10 @@ set name = "Print Transcript" set category = "Object" - if(usr.stat) + if(usr.stat || (usr.status_flags & FAKEDEATH)) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(!canprint) usr << "The recorder can't print that fast!" @@ -211,11 +211,11 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return icon_state = "taperecorderrecording" if(timerecorded < 3600 && playing == 0) - usr << "\blue Recording started." + usr << "Recording started." recording = 1 timestamp+= timerecorded storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] Recording started." @@ -228,7 +228,7 @@ icon_state = "taperecorderidle" return else - usr << "\red Either your tape recorder's memory is full, or it is currently playing back its memory." + usr << "Either your tape recorder's memory is full, or it is currently playing back its memory." else if(usr.stat) usr << "Not when you're incapacitated." @@ -237,7 +237,7 @@ recording = 0 timestamp+= timerecorded storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] Recording stopped." - usr << "\blue Recording stopped." + usr << "Recording stopped." icon_state = "taperecorderidle" return else if(playing == 1) @@ -248,5 +248,5 @@ icon_state = "taperecorderidle" return else - usr << "\red Stop what?" + usr << "Stop what?" return \ No newline at end of file diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index f4aa12c3c37..4c62c4e9fc4 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 as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - user << "\red The mind batterer has been burnt out!" + user << "The mind batterer has been burnt out!" return user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") @@ -46,17 +46,17 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - M << "\red You feel a tremendous, paralyzing wave flood your mind." + M << "You feel a tremendous, paralyzing wave flood your mind." if(!iscarbon(user)) M.LAssailant = null else M.LAssailant = user else - M << "\red You feel a sudden, electric jolt travel through your head." + M << "You feel a sudden, electric jolt travel through your head." playsound(get_turf(src), 'sound/misc/interference.ogg', 50, 1) - user << "\blue You trigger [src]." + user << "You trigger [src]." times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index c45a41278ac..0799733414f 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -15,6 +15,11 @@ /obj/item/device/transfer_valve/IsAssemblyHolder() return 1 +/obj/item/device/transfer_valve/Crossed(AM as mob|obj) + if(attached_device) + attached_device.Crossed(AM) + ..() + /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user) if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) @@ -23,11 +28,11 @@ if(!tank_one) tank_one = item - user.drop_item(src) + user.drop_item(item, src) user << "You attach the tank to the transfer valve." else if(!tank_two) tank_two = item - user.drop_item(src) + user.drop_item(item, src) user << "You attach the tank to the transfer valve." update_icon() diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index ce6e0e5456c..572ea8e176a 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -21,7 +21,7 @@ user.show_message("[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"",2) //It's a hearable message silly! insults-- else - user << "\red *BZZZZcuntZZZZT*" + user << "*BZZZZcuntZZZZT*" else playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) user.show_message("[user]'s [name] rasps, \"Halt! Security!\"",1) @@ -32,7 +32,7 @@ /obj/item/device/hailer/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/card/emag) && !emagged) - user << "\red You overload \the [src]'s voice synthesizer." + user << "You overload \the [src]'s voice synthesizer." emagged = 1 insults = rand(1, 3)//to prevent dickflooding return diff --git a/code/game/objects/items/mountable_frames/newscaster.dm b/code/game/objects/items/mountable_frames/newscaster.dm new file mode 100644 index 00000000000..4a57e348d4c --- /dev/null +++ b/code/game/objects/items/mountable_frames/newscaster.dm @@ -0,0 +1,12 @@ +/obj/item/mounted/frame/newscaster + name = "Unhinged Newscaster" + desc = "The difference between an unhinged newscaster and a journalist is that one of them is actually crazy." + icon = 'icons/obj/terminals.dmi' + icon_state = "newscaster_off" + flags = FPRINT + w_type=2*RECYK_METAL + mount_reqs = list("nospace", "simfloor") + +/obj/item/mounted/frame/newscaster/do_build(turf/on_wall, mob/user) + new /obj/machinery/newscaster(get_turf(src), get_dir(user, on_wall)) + qdel(src) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 4b923fbc698..c2ef887d1ef 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -29,7 +29,7 @@ for(var/mob/O in viewers(M, null)) if (O.client) - O.show_message("\red [user] has prodded [M] with an electrically-charged arm!", 1, "\red You hear someone fall", 2) + O.show_message("[user] has prodded [M] with an electrically-charged arm!", 1, "You hear someone fall", 2) /obj/item/borg/overdrive name = "overdrive" diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 3d5ee06181d..5a808f2a007 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -114,32 +114,32 @@ qdel(src) if(istype(W, /obj/item/robot_parts/l_leg)) if(src.l_leg) return - user.drop_item(src) + user.drop_item(W, src) src.l_leg = W src.updateicon() if(istype(W, /obj/item/robot_parts/r_leg)) if(src.r_leg) return - user.drop_item(src) + user.drop_item(W, src) src.r_leg = W src.updateicon() if(istype(W, /obj/item/robot_parts/l_arm)) if(src.l_arm) return - user.drop_item(src) + user.drop_item(W, src) src.l_arm = W src.updateicon() if(istype(W, /obj/item/robot_parts/r_arm)) if(src.r_arm) return - user.drop_item(src) + user.drop_item(W, src) src.r_arm = W src.updateicon() if(istype(W, /obj/item/robot_parts/chest)) if(src.chest) return if(W:wires && W:cell) - user.drop_item(src) + user.drop_item(W, src) src.chest = W src.updateicon() else if(!W:wires) @@ -150,7 +150,7 @@ if(istype(W, /obj/item/robot_parts/head)) if(src.head) return if(W:flash2 && W:flash1) - user.drop_item(src) + user.drop_item(W, src) src.head = W src.updateicon() else @@ -199,7 +199,7 @@ if(!O) return - user.drop_item() + user.drop_item(W) O.mmi = W O.invisibility = 0 @@ -248,7 +248,7 @@ user << "You have already inserted a cell!" return else - user.drop_item(src) + user.drop_item(W, src) src.cell = W user << "You insert the cell!" if(istype(W, /obj/item/stack/cable_coil)) @@ -269,17 +269,17 @@ user << "You have already inserted the eyes!" return else if(src.flash1) - user.drop_item(src) + user.drop_item(W, src) src.flash2 = W user << "You insert the flash into the eye socket!" else - user.drop_item(src) + user.drop_item(W, src) src.flash1 = W user << "You insert the flash into the eye socket!" else if(istype(W, /obj/item/weapon/stock_parts/manipulator)) user << "You install some manipulators and modify the head, creating a functional spider-bot!" new /mob/living/simple_animal/spiderbot(get_turf(loc)) - user.drop_item() + user.drop_item(W) del(W) del(src) return diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 02b4366cd86..6c0a8633c40 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -96,7 +96,7 @@ if(hp <= 0) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << "\red [src] breaks into tiny pieces and collapses!" + O << "[src] breaks into tiny pieces and collapses!" del(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/cable.dm b/code/game/objects/items/stacks/cable.dm index 255f4589efe..85b20e5314b 100644 --- a/code/game/objects/items/stacks/cable.dm +++ b/code/game/objects/items/stacks/cable.dm @@ -65,12 +65,12 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \ S.heal_damage(0, 15, 0, 1) if(user != M) - user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ - "\red You repair some burn damage on your [S.display_name]",\ + user.visible_message("\The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ + "You repair some burn damage on your [S.display_name]",\ "You hear wires being cut.") else - user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ - "\red You repair some burn damage on your [S.display_name]",\ + user.visible_message("\The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ + "You repair some burn damage on your [S.display_name]",\ "You hear wires being cut.") else user << "Nothing to fix!" diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 844b337cef0..0cd5f1225bd 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -20,6 +20,8 @@ var/sname = "glass" var/shard_type = /obj/item/weapon/shard + siemens_coefficient = 0 //does not conduct + /obj/item/stack/sheet/glass/attack_self(mob/user as mob) construct_window(user) @@ -204,10 +206,10 @@ if(istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(CC.amount < 5) - user << "\b There is not enough wire in this coil. You need 5 lengths." + user << "There is not enough wire in this coil. You need 5 lengths." return CC.use(5) - user << "\blue You attach wire to the [name]." + user << "You attach wire to the [name]." new /obj/item/stack/light_w(user.loc) src.use(1) else diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 01916e1909d..3b47288cde9 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -97,9 +97,9 @@ istype(W, /obj/item/weapon/hatchet) ) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) - usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") + usr.visible_message("\the [usr] 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)) - usr << "\blue You cut the hair from this [src.singular_name]" + usr << "You cut the hair from this [src.singular_name]" //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index dde3304ac15..6a688d5544f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -78,6 +78,8 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2), \ new/datum/stack_recipe("lightswitch frame", /obj/item/mounted/frame/light_switch, 2), \ new/datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2), \ + new/datum/stack_recipe("requests console", /obj/machinery/requests_console, 2), \ + new/datum/stack_recipe("ATM", /obj/machinery/atm/, 2), \ null, \ new/datum/stack_recipe("iron door", /obj/machinery/door/mineral/iron, 20, one_per_turf = 1, on_floor = 1), \ ) @@ -193,6 +195,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("wooden door", /obj/machinery/door/mineral/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \ + new/datum/stack_recipe("bowl", /obj/item/trash/bowl, 1), \ ) /obj/item/stack/sheet/wood diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index be03c6fe692..cd645b9d032 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -43,10 +43,10 @@ return var/T = user.loc if (!( istype(T, /turf) )) - user << "\red You must be on the ground!" + user << "You must be on the ground!" return if (!( istype(T, /turf/space) )) - user << "\red You cannot build on or repair this turf!" + user << "You cannot build on or repair this turf!" return src.build(T) src.add_fingerprint(user) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ef9152e1c4c..88d272e7eef 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -848,7 +848,7 @@ set name = "Flip Card" set category = "Object" set src in range(1) - if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained()) + if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained() || (usr.status_flags & FAKEDEATH)) return if(!flipped) src.flipped = 1 @@ -947,4 +947,253 @@ spamcheck = 1 spawn(20) spamcheck = 0 - return \ No newline at end of file + return + + +/obj/item/toy/gasha + icon = 'icons/obj/toy.dmi' + icon_state = "greyshirt" + var/cooldown = 0 + +/obj/item/toy/gasha/greyshirt + name = "toy greyshirt" + desc = "Now with kung-fu grip action!" + +/obj/item/toy/gasha/greytide + name = "toy greytide" + desc = "Includes small pieces, not for children under or above the age of 5." + icon_state = "greytide" + +/obj/item/toy/gasha/newcop + name = "toy nuke-op" + desc = "Mildly explosive." + icon_state = "newcop" + +/obj/item/toy/gasha/jani + name = "toy janitor" + desc = "cleanliness is next to godliness!" + icon_state = "jani" + +/obj/item/toy/gasha/miner + name = "toy miner" + desc = "Walk softly, and carry a ton of monsters." + icon_state = "miner" + +/obj/item/toy/gasha/clown + name = "toy clown" + desc = "HONK" + icon_state = "clown" + +/obj/item/toy/gasha/goliath + name = "toy goliath" + desc = "Now with fully articulated tentacles!" + icon_state = "goliath" + +/obj/item/toy/gasha/basilisk + name = "toy basilisk" + desc = "The eye has a strange shine to it." + icon_state = "basilisk" + +/obj/item/toy/gasha/mommi + name = "toy MoMMI" + desc = "*ping" + icon_state = "mommi" + +/obj/item/toy/gasha/guard + name = "toy guard spider" + desc = "Miniature giant spider, or just 'spider' for short." + icon_state = "guard" + +/obj/item/toy/gasha/hunter + name = "toy hunter spider" + desc = "As creepy looking as the real thing, but with 80% less chance of killing you." + icon_state = "hunter" + +/obj/item/toy/gasha/nurse + name = "toy nurse spider" + desc = "Not exactly what most people are hoping for when they hear 'nurse'." + icon_state = "nurse" + +/obj/item/toy/gasha/alium + name = "toy alien" + desc = "Has a great smile." + icon_state = "alium" + +/obj/item/toy/gasha/pomf + name = "toy chicken" + desc = "Cluck." + icon_state = "pomf" + +/obj/item/toy/gasha/engi + name = "toy engineer" + desc = "Probably better at setting up power than the real thing!" + icon_state = "engi" + +/obj/item/toy/gasha/atmos + name = "toy atmos-tech" + desc = "Can withstand high temperatures without melting!" + icon_state = "atmos" + +/obj/item/toy/gasha/sec + name = "toy security" + desc = "Won't search you on code green!" + icon_state = "sec" + +/obj/item/toy/gasha/plasman + name = "toy plasmaman" + desc = "All of the undending agony of the real thing, but in tiny plastic form!" + icon_state = "plasman" + +/obj/item/toy/gasha/shard + name = "toy supermatter shard" + desc = "Nowhere near as explosive as the real one." + icon_state = "shard" + +/obj/item/toy/gasha/mime + name = "toy mime" + desc = "..." + icon_state = "mime" + +/obj/item/toy/gasha/captain + name = "toy captain" + desc = "Though some say the captain should always go down with his ship, captains on NT stations tend to be the first on escape shuttles whenever the time comes." + icon_state = "captain" + +/obj/item/toy/gasha/comdom + name = "toy comdom" + desc = "WE GOT THE VALIDS AI CALL THE SHUTTLE" + icon_state = "comdom" + +/obj/item/toy/gasha/shade + name = "toy shade" + desc = "Eternal torment in cute plastic form!" + icon_state = "shade" + +/obj/item/toy/gasha/wraith + name = "toy wraith" + desc = "Not the most subtle of constructs, overly fond of teleporting into walls." + icon_state = "wraith" + +/obj/item/toy/gasha/juggernaut + name = "toy juggernaut" + desc = "Big fists to leave big holes in the side of the station." + icon_state = "juggernaut" + +/obj/item/toy/gasha/artificer + name = "toy artificer" + desc = "Sort of like a MoMMI, if MoMMIs hated their own existence." + icon_state = "artificer" + +/obj/item/toy/gasha/harvester + name = "toy harvester" + desc = "Harvesters tend to have a bad habit of violently stabbing anyone they meet" + icon_state = "harvester" + +/obj/item/toy/gasha/corgitoy + name = "plush corgi" + desc = "Perfect for the pet owner on a tight budget!" + icon_state = "corgitoy" + +/obj/item/toy/gasha/cattoy + name = "plush cat" + desc = "Marginally less affectionate than an actual cat." + icon_state = "cattoy" + +/obj/item/toy/gasha/parrottoy + name = "plush parrot" + desc = "All the fun of a real parrot, without the obnoxious talking!" + icon_state = "parrottoy" + +/obj/item/toy/gasha/beartoy + name = "plush bear" + desc = "HOO, HA! HOO, HA!" + icon_state = "beartoy" + +/obj/item/toy/gasha/carptoy + name = "plush carp" + desc = "Can not be used as a distraction during a space carp attack." + icon_state = "carptoy" +/obj/item/toy/gasha/monkeytoy + name = "plush monkey" + desc = "Slightly less likely to throw poop than the real one." + icon_state = "monkeytoy" + +/obj/item/toy/gasha/huggertoy + name = "toy facehugger" + desc = "Cannot be worn as a mask, unfortunately." + icon_state = "huggertoy" + +/obj/item/toy/gasha/borertoy + name = "Mini Borer" + desc = "Probably not something you should be playing with" + icon_state = "borertoy" + +/obj/item/toy/gasha/minislime + name = "Pygmy Grey Slime" + desc = "If you experience a tingling sensation in your hands, please stop playing with your pygmy slime immediately." + icon_state = "minislime" + +/obj/item/toy/gasha/AI/attack_self(mob/user as mob) + if(cooldown < world.time - 8) + playsound(user, 'sound/vox/doop.wav', 20, 1) + cooldown = world.time + +/obj/item/toy/gasha/AI/attack_hand(mob/user as mob) + if(loc == user) + if(cooldown < world.time - 8) + playsound(user, 'sound/vox/doop.wav', 20, 1) + cooldown = world.time + return + ..() + +/obj/item/toy/gasha/AI + name = "Mini AI" + desc = "Does not open doors." + icon_state = "AI" + +/obj/item/toy/gasha/AI/malf + name = "Mini Malf" + desc = "May be a bad influence for cyborgs" + icon_state = "malfAI" + +/obj/item/toy/gasha/minibutt/attack_self(mob/user as mob) + if(cooldown < world.time - 8) + playsound(user, 'sound/misc/fart.ogg', 20, 1) + cooldown = world.time + +/obj/item/toy/gasha/minibutt/attack_hand(mob/user as mob) + if(loc == user) + if(cooldown < world.time - 8) + playsound(user, 'sound/misc/fart.ogg', 20, 1) + cooldown = world.time + return + ..() + +/obj/item/toy/gasha/minibutt + name = "mini-buttbot" + desc = "Made from real gnome butts!" + icon_state = "minibutt" + +/obj/item/toy/gasha/skub + name = "Skub" + desc = "It's just Skub." + icon_state = "skub" + + +/obj/item/toy/gasha/fingerbox/attack_self(mob/user as mob) + if(cooldown < world.time - 8) + playsound(user, 'sound/weapons/switchblade.ogg', 20, 1) + cooldown = world.time + +/obj/item/toy/gasha/fingerbox/attack_hand(mob/user as mob) + if(loc == user) + if(cooldown < world.time - 8) + playsound(user, 'sound/weapons/switchblade.ogg', 20, 1) + cooldown = world.time + return + ..() + +/obj/item/toy/gasha/fingerbox + name = "fingerbox" + desc = "A high quality fingerbox." + icon_state = "fingerbox" \ No newline at end of file diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 31e7c6d0695..87c74ed8853 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -92,7 +92,7 @@ RCD airlock_type = /obj/machinery/door/airlock /obj/item/weapon/rcd/suicide_act(mob/user) - viewers(user) << "\red [user] is using the deconstruct function on the [src.name] on \himself! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is using the deconstruct function on the [src.name] on \himself! It looks like \he's trying to commit suicide!" return (user.death(1)) /obj/item/weapon/rcd/New() diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index e018459f3bc..9937f73dd0b 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -491,7 +491,7 @@ var/global/list/RPD_recipes=list( return 0 var/obj/machinery/atmospherics/pipe/P = A if(!(paint_color in P.available_colors)) - user << "\red This [P] can't be painted [paint_color]. Available colors: [english_list(P.available_colors)]" + user << "This [P] can't be painted [paint_color]. Available colors: [english_list(P.available_colors)]" return 0 playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) P._color = paint_color diff --git a/code/game/objects/items/weapons/ai_modules/AI_modules.dm b/code/game/objects/items/weapons/ai_modules/AI_modules.dm index 907ab5f6ea5..4dccf3761e9 100644 --- a/code/game/objects/items/weapons/ai_modules/AI_modules.dm +++ b/code/game/objects/items/weapons/ai_modules/AI_modules.dm @@ -48,7 +48,7 @@ Refactored AI modules by N3X15 /obj/item/weapon/aiModule/attack_ai(mob/user as mob) // Keep MoMMIs from picking them up. if(isMoMMI(user)) - user << "\red Your firmware prevents you from picking that up!" + user << "Your firmware prevents you from picking that up!" return // This prevents modules from being picked up. Use it, if needed. @@ -82,7 +82,7 @@ Refactored AI modules by N3X15 var/mob/M=target // This seems redundant. Revisit. - N3X if(src.modflags & HIDE_SENDER) - target << "\red \[REDACTED\] \black has uploaded a change to the laws you must follow, using \a [name]. From now on: " + target << "\[REDACTED\] has uploaded a change to the laws you must follow, using \a [name]. From now on: " else target << "[senderName] has uploaded a change to the laws you must follow, using \a [name]. From now on: " targetName="[fmtSubject(M)])" @@ -182,5 +182,5 @@ Refactored AI modules by N3X15 /obj/item/weapon/aiModule/keeper/validate(var/datum/ai_laws/laws, var/atom/target, var/mob/sender) ..() - sender << "\red How the fuck did you get this?" + sender << "How the fuck did you get this?" return 0 \ No newline at end of file diff --git a/code/game/objects/items/weapons/ai_modules/freeform.dm b/code/game/objects/items/weapons/ai_modules/freeform.dm index 2c1865d1d96..b956f2fc1d3 100644 --- a/code/game/objects/items/weapons/ai_modules/freeform.dm +++ b/code/game/objects/items/weapons/ai_modules/freeform.dm @@ -35,13 +35,13 @@ By N3X15 while(1) lawpos = input("Please enter the priority for your new law. Can only write to law sectors [allowed_priority_min] - [allowed_priority_max].", "Law Priority (15+)", lawpos) as num if(allowed_priority_min > 0 && lawpos < allowed_priority_min) - user << "\red Desired law sector is too low." + user << "Desired law sector is too low." continue if(allowed_priority_max > 0 && lawpos > allowed_priority_max) - user << "\red Desired law sector is too high." + user << "Desired law sector is too high." continue priority=lawpos - user << "\blue Target law sector set to [priority]." + user << "Target law sector set to [priority]." break law = copytext(sanitize(input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", law)),1,MAX_MESSAGE_LEN) diff --git a/code/game/objects/items/weapons/ai_modules/planning_frame.dm b/code/game/objects/items/weapons/ai_modules/planning_frame.dm index 6dfb9ca6470..f7acaffcd1a 100644 --- a/code/game/objects/items/weapons/ai_modules/planning_frame.dm +++ b/code/game/objects/items/weapons/ai_modules/planning_frame.dm @@ -54,7 +54,7 @@ return if(!module.upload(src.laws,src,user)) return - //user.drop_item() + //user.drop_item(null, ) //module.loc=src modules += module.copy() // Instead of a reference user << "You insert \the [module] into \the [src], and the device reads the module's contents." diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 07f4588fb50..de36b02a496 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -61,7 +61,7 @@ if(ink) user << "\the [name] already contains \a [ink]." return - user.drop_item(src) + user.drop_item(W, src) user << "You install \the [W] into \the [name]." ink = W playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 13e5461413a..de9f9009805 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -159,18 +159,18 @@ /obj/item/weapon/card/emag/attack() return - + /obj/item/weapon/card/emag/afterattack(atom/target, mob/user, proximity) var/atom/A = target if(!proximity) return A.emag_act(user) - + /obj/item/weapon/card/id name = "identification card" desc = "A card used to provide ID and determine access across the station." icon_state = "id" item_state = "card-id" - var/access = list() + var/list/access = list() var/registered_name = "Unknown" // The name registered_name on the card slot_flags = SLOT_ID diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 29361e2027b..a139010fe92 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -1,4 +1,4 @@ -var/global/list/moneytypes=list( +var/global/list/moneytypes = list( /obj/item/weapon/spacecash/c1000 = 1000, /obj/item/weapon/spacecash/c100 = 100, /obj/item/weapon/spacecash/c10 = 10, @@ -23,8 +23,8 @@ var/global/list/moneytypes=list( w_class = 1.0 var/access = list() access = access_crate_cash - var/worth = 1 // Per chip - var/amount = 1 // number of chips + var/worth = 1 //Per chip + var/amount = 1 //Number of chips var/stack_color = "#4E054F" autoignition_temperature=AUTOIGNITION_PAPER @@ -35,10 +35,10 @@ var/global/list/moneytypes=list( update_icon() /obj/item/weapon/spacecash/examine(mob/user) - if(amount>1) + if(amount > 1) setGender(PLURAL) ..() - user << "It is a stack holding [amount] chips." + user << "It's a stack holding [amount] chips." user << "It's worth [worth*amount] credits." else setGender(NEUTER) @@ -46,11 +46,11 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/update_icon() icon_state = "cash[worth]" - // Up to 100 items per stack. + //Up to 100 items per stack. overlays = 0 var/stacksize=round(amount/25) - pixel_x=rand(-7,7) - pixel_y=rand(-14,14) + pixel_x = rand(-7, 7) + pixel_y = rand(-14, 14) if(stacksize) // 0 = single // 1 = 1/4 stack @@ -72,10 +72,7 @@ var/global/list/moneytypes=list( return 0 /obj/item/weapon/spacecash/afterattack(atom/A as mob|obj, mob/user as mob) - if (istype(A, /turf) \ - || istype(A, /obj/structure/table) \ - || istype(A, /obj/structure/rack) \ - ) + if(istype(A, /turf) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack)) var/turf/T = get_turf(A) var/collected = 0 for(var/obj/item/weapon/spacecash/cash in T) @@ -83,13 +80,13 @@ var/global/list/moneytypes=list( collected += collect_from(cash) if(collected) update_icon() - user << "span class='notice'>You add [collected] chips to your stack of cash." + user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." else if(istype(A,/obj/item/weapon/spacecash)) var/obj/item/weapon/spacecash/cash = A var/collected = src.collect_from(cash) if(collected) update_icon() - user << "span class='notice'>You add [collected] chips to your stack of cash." + user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." /obj/item/weapon/spacecash/c10 icon_state = "cash10" diff --git a/code/game/objects/items/weapons/chisel.dm b/code/game/objects/items/weapons/chisel.dm index 7235aa5cdee..2fef0e9c534 100644 --- a/code/game/objects/items/weapons/chisel.dm +++ b/code/game/objects/items/weapons/chisel.dm @@ -40,11 +40,11 @@ var/engraving_name = sanitize(input(usr, "Depicted on the wall is an image of ...","Engraving")) var/engraving = sanitize(input(usr, "Enter the details of your engraving.","Engraving")) - user.visible_message("\blue [user.name] starts engraving something on the [W.name].", "\blue You start engraving an image of [engraving_name] on the [W.name].") + user.visible_message("[user.name] starts engraving something on the [W.name].", "You start engraving an image of [engraving_name] on the [W.name].") if(do_after(user, 60)) if( !istype(W, /turf/simulated/wall) || !user || !src || !W ) return if( W.rotting ) - user.visible_message("\red The [W.name] crumbles under [user.name]'s touch!", "\red The [W.name] crumbles under your touch!") + user.visible_message("The [W.name] crumbles under [user.name]'s touch!", "The [W.name] crumbles under your touch!") W.dismantle_wall() return @@ -59,7 +59,7 @@ W.engraving_quality = "an exceptionally designed" if(10) W.engraving_quality = "a masterfully designed" - user << "\red It's a masterpiece!" + user << "It's a masterpiece!" engraving = {"Depicted on the wall is [W.engraving_quality] image of [engraving_name][(use_name ? " by [user.real_name]" : "")]. [engraving]"} @@ -68,4 +68,4 @@ W.overlays += engraving_overlay W.engraving = engraving - user.visible_message("\blue [user.name] finishes engraving [W.engraving_quality] image of [engraving_name].", "\blue You finish engraving on the [W.name].") \ No newline at end of file + user.visible_message("[user.name] finishes engraving [W.engraving_quality] image of [engraving_name].", "You finish engraving on the [W.name].") \ No newline at end of file diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index c4bea0d8662..c7fec1a6a1b 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -180,7 +180,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM new src.type_butt(location) processing_objects.Remove(src) user << "Half of the [name] dissolves with a nasty fizzle." - user.drop_item() + user.drop_item(src) qdel(src) return var/transfered = glass.reagents.trans_to(src, chem_volume) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 590b9e0e0d2..ba9ddbb3182 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -73,7 +73,7 @@ /obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob) if(target && user && ishuman(target) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" ) - user.visible_message("\red \the [user] washes \the [target]'s mouth out with soap!") + user.visible_message("\the [user] washes \the [target]'s mouth out with soap!") return ..() diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 9c23df29bf5..f603f7f88e1 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -100,7 +100,7 @@ if(result == 1) user << "Rocks fall, you die." user.gib() - user.drop_item(src.loc) + user.drop_item(src) else triggered = 1 visible_message("You hear a quiet click.") diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 1858c0f27be..b56b2cf9bdc 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -110,7 +110,7 @@ if (!istype(M, /mob)) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])") @@ -140,17 +140,17 @@ if(block)// Isolated injector testing("Isolated block [block] injector with contents: [GetValue()]") if (GetState() && block == MONKEYBLOCK && istype(M, /mob/living/carbon/human) ) - message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] \red(MONKEY)") + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name] (MONKEY)") - log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] \red(MONKEY)") + log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") else log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name]") else testing("DNA injector with contents: [english_list(buf.dna.SE)]") if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human) ) - message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)") + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)") - log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)") + log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") else // message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]") log_attack("[key_name(user)] injected [key_name(M)] with the [name]") @@ -165,25 +165,25 @@ if(!inuse) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] has been injected with [] by [].", M, src, user), 1) + O.show_message(text("[] has been injected with [] by [].", M, src, user), 1) //Foreach goto(192) if (!(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))) - user << "\red Apparently it didn't work." + user << "Apparently it didn't work." return if (buf.types & DNA2_BUF_SE) if(block)// Isolated injector testing("Isolated block [block] injector with contents: [GetValue()]") if (GetState() && block == MONKEYBLOCK && istype(M, /mob/living/carbon/human) ) - message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] \red(MONKEY)") + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name] (MONKEY)") - log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] \red(MONKEY)") + log_game("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") else log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name]") else testing("DNA injector with contents: [english_list(buf.dna.SE)]") if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human)) - message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)") + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)") else // message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]") @@ -202,9 +202,9 @@ */ if(user)//If the user still exists. Their mob may not. if(M)//Runtime fix: If the mob doesn't exist, mob.name doesnt work. - Nodrak - user.show_message(text("\red You inject [M.name]")) + user.show_message(text("You inject [M.name]")) else - user.show_message(text("\red You finish the injection.")) + user.show_message(text("You finish the injection.")) return diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index b0e5b0149d9..04cd6035e75 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -23,15 +23,15 @@ return if(M == user) - user.visible_message("\red [user.name] injects \himself with [src]!") + user.visible_message("[user.name] injects \himself with [src]!") src.injected(user,user) else - user.visible_message("\red [user.name] is trying to inject [M.name] with [src]!") + user.visible_message("[user.name] is trying to inject [M.name] with [src]!") if (do_mob(user,M,30)) - user.visible_message("\red [user.name] injects [M.name] with [src].") + user.visible_message("[user.name] injects [M.name] with [src].") src.injected(M, user) else - user << "\red You failed to inject [M.name]." + user << "You failed to inject [M.name]." proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user) target.generate_name() diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index bfb3dfab8ff..c3af9b5a3d4 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -28,7 +28,7 @@ /obj/item/weapon/plastique/suicide_act(var/mob/user) . = (BRUTELOSS) - viewers(user) << "\red [user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!" + viewers(user) << "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!" var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) @@ -71,16 +71,16 @@ user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" msg_admin_attack("[user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey]) (JMP)") - user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!") + user.visible_message("[user.name] is trying to plant some kind of explosive on [target.name]!") if(do_after(user, 50) && in_range(user, target)) - user.drop_item() + user.drop_item(src) src.target = target loc = null if (ismob(target)) var/mob/M=target target:attack_log += "\[[time_stamp()]\] Had the [name] planted on them by [user.real_name] ([user.ckey])" - user.visible_message("\red [user.name] finished planting an explosive on [target.name]!") + user.visible_message("[user.name] finished planting an explosive on [target.name]!") playsound(get_turf(src), 'sound/weapons/c4armed.ogg', 60, 1) if(!iscarbon(user)) M.LAssailant = null diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index aabe4fec354..a92ad964bc1 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -94,7 +94,7 @@ if(isrobot(user) && !isMoMMI(user)) // MoMMI's can but borgs can't user << "You're a robot. No." return - user.drop_item(src) + user.drop_item(W, src) user << "You cram \the [W] into the nozzle of \the [src]." message_admins("[user]/[user.ckey] has crammed \a [W] into a [src].") diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 53e9024b795..38b4ff04ca5 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -99,7 +99,7 @@ var/obj/item/device/assembly/igniter/I = W if(I.secured) return if(igniter) return - user.drop_item(src) + user.drop_item(I, src) igniter = I update_icon() return @@ -108,7 +108,7 @@ if(ptank) user << "There appears to already be a plasma tank loaded in [src]!" return - user.drop_item(src) + user.drop_item(W, src) ptank = W update_icon() return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index f4c503a9e56..d56e6a55d5c 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -32,7 +32,7 @@ w_class = W /obj/item/weapon/gift/attack_self(mob/user as mob) - user.drop_item() + user.drop_item(src) if(gift) user.put_in_active_hand(gift) gift.add_fingerprint(user) @@ -340,7 +340,7 @@ return src.amount -= a_used - user.drop_item() + user.drop_item(null, ) var/obj/item/weapon/gift/G = new /obj/item/weapon/gift( src.loc ) G.size = W.w_class G.w_class = G.size + 1 diff --git a/code/game/objects/items/weapons/glowstick.dm b/code/game/objects/items/weapons/glowstick.dm index 6fe680962d7..b6e4028a2fd 100644 --- a/code/game/objects/items/weapons/glowstick.dm +++ b/code/game/objects/items/weapons/glowstick.dm @@ -13,7 +13,7 @@ w_class = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is breaking open the [src.name] and eating the liquid inside! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is breaking open the [src.name] and eating the liquid inside! It looks like \he's trying to commit suicide!" return (TOXLOSS) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index feaebb1132e..cb9adf9769f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -67,6 +67,14 @@ icon_state = initial(icon_state) +"_ass" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" stage = 1 + else if(istype(W,/obj/item/stack/cable_coil/) && !beakers.len) + var/obj/item/stack/cable_coil/coil = W + if(coil.amount < 2) return + coil.use(2) + var/obj/item/weapon/electrolyzer/E = new /obj/item/weapon/electrolyzer + user.before_take_item(src) + user.put_in_hands(E) + qdel(src) else if(istype(W,/obj/item/weapon/screwdriver) && path != 2) if(stage == 1) path = 1 @@ -103,7 +111,7 @@ user << " This type of grenade cannot hold more than one slime core." else user << " You add \the [W] to the assembly." - user.drop_item(src) + user.drop_item(W, src) beakers += W E = W inserted_cores++ @@ -111,8 +119,7 @@ name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" else if(W.reagents.total_volume) user << " You add \the [W] to the assembly." - user.drop_item() - W.loc = src + user.drop_item(W, src) beakers += W stage = 1 name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" @@ -297,7 +304,7 @@ obj/item/weapon/grenade/chem_grenade/exgrenade/attackby(obj/item/weapon/W as obj user << " You cannot fit more than two slime cores in this grenade." else user << " You add \the [W] to the assembly." - user.drop_item(src) + user.drop_item(W, src) beakers += W if (E == null)//E = first slime extract, C = second slime extract E = W @@ -308,7 +315,7 @@ obj/item/weapon/grenade/chem_grenade/exgrenade/attackby(obj/item/weapon/W as obj name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" else if(W.reagents.total_volume) user << " You add \the [W] to the assembly." - user.drop_item(src) + user.drop_item(W, src) beakers += W stage = 1 name = "unsecured EX grenade with [beakers.len] containers[detonator?" and detonator":""]" diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index b6861fb81ea..a857ad31e95 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -27,7 +27,7 @@ S.active = 0 // -- Polymorph S.icon_state = "shield0" - M << "\red BANG" + M << "BANG" playsound(get_turf(src), 'sound/effects/bang.ogg', 25, 1) //Checking for protections @@ -81,19 +81,19 @@ var/mob/living/carbon/human/H = M var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if (E && E.damage >= E.min_bruised_damage) - M << "\red Your eyes start to burn badly!" + M << "Your eyes start to burn badly!" if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) if (E.damage >= E.min_broken_damage) - M << "\red You can't see anything!" + M << "You can't see anything!" if (M.ear_damage >= 15) - M << "\red Your ears start to ring badly!" + M << "Your ears start to ring badly!" if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) if (prob(M.ear_damage - 10 + 5)) - M << "\red You can't hear anything!" + M << "You can't hear anything!" M.sdisabilities |= DEAF else if (M.ear_damage >= 5) - M << "\red Your ears start to ring!" + M << "Your ears start to ring!" M.update_icons() /obj/effect/effect/smoke/flashbang diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 7a871fc82a7..3b93eccb752 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -37,7 +37,7 @@ prime() return user.dir = get_dir(user, target) - user.drop_item() + user.drop_item(null, ) var/t = (isturf(target) ? target : target.loc) walk_towards(src, t, 3) return*/ diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index c6944ee09a0..fdfbaaaf8b7 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -25,7 +25,7 @@ var/turf/p_loc_m = C.loc playsound(get_turf(src), 'sound/weapons/handcuffs.ogg', 30, 1, -2) for(var/mob/O in viewers(user, null)) - O.show_message("\red [user] is trying to put handcuffs on [C]!", 1) + O.show_message("[user] is trying to put handcuffs on [C]!", 1) spawn(30) if(!C) return if(p_loc == user.loc && p_loc_m == C.loc) @@ -34,7 +34,7 @@ else if ((M_CLUMSY in usr.mutations) && prob(50)) - usr << "\red Uh ... how do those things work?!" + usr << "Uh ... how do those things work?!" if (istype(C, /mob/living/carbon/human)) if(!C.handcuffed) var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human( ) @@ -50,7 +50,7 @@ return return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return if (istype(C, /mob/living/carbon/human)) if(!C.handcuffed) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 454fb809e85..de1e249edb2 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -53,10 +53,10 @@ else S.item_quants[G.name] = 1 else - user << "\blue The seed bag is full." + user << "The seed bag is full." S.updateUsrDialog() return - user << "\blue You pick up all the seeds." + user << "You pick up all the seeds." else if (S.contents.len < S.capacity) S.contents += src; @@ -65,7 +65,7 @@ else S.item_quants[name] = 1 else - user << "\blue The seed bag is full." + user << "The seed bag is full." S.updateUsrDialog() return @@ -155,13 +155,13 @@ /obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) if(!..()) return if(istype(M, /mob/living)) - M << "\red You are heated by the warmth of the of the [name]!" + M << "You are heated by the warmth of the of the [name]!" M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob) if(!user.gloves) - user << "\red The [name] burns your bare hand!" + user << "The [name] burns your bare hand!" user.adjustFireLoss(rand(1,5)) /* @@ -169,7 +169,7 @@ */ /obj/item/weapon/grown/nettle/pickup(mob/living/carbon/human/user as mob) if(!user.gloves) - user << "\red The nettle burns your bare hand!" + user << "The nettle burns your bare hand!" if(istype(user, /mob/living/carbon/human)) var/organ = ((user.hand ? "l_":"r_") + "arm") var/datum/organ/external/affecting = user.get_organ(organ) @@ -197,12 +197,12 @@ user.take_organ_damage(0,force) if(prob(50)) user.Paralyse(5) - user << "\red You are stunned by the Deathnettle when you try picking it up!" + user << "You are stunned by the Deathnettle when you try picking it up!" /obj/item/weapon/grown/deathnettle/attack(mob/living/carbon/M as mob, mob/user as mob) if(!..()) return if(istype(M, /mob/living)) - M << "\red You are stunned by the powerful acid of the Deathnettle!" + M << "You are stunned by the powerful acid of the Deathnettle!" M.attack_log += text("\[[time_stamp()]\] Had the [src.name] used on them by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] on [M.name] ([M.ckey])") diff --git a/code/game/objects/items/weapons/implants/exile2.dm b/code/game/objects/items/weapons/implants/exile2.dm index a085ed1a641..c167d654ea5 100644 --- a/code/game/objects/items/weapons/implants/exile2.dm +++ b/code/game/objects/items/weapons/implants/exile2.dm @@ -29,7 +29,7 @@ implanted(mob/M) if(!istype(M, /mob/living/carbon/human)) return 0 var/mob/living/carbon/human/H = M - H << "\blue Your hair raises on end as you feel a weak bluespace void surround you." + H << "Your hair raises on end as you feel a weak bluespace void surround you." H.locked_to_z = ASTEROID_Z return 1 diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 762311b9d7e..aff923832ee 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -38,11 +38,11 @@ if(!src.imp) return if(!src.imp.allow_reagents) return if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume) - user << "\red [src] is full." + user << "[src] is full." else spawn(5) I.reagents.trans_to(src.imp, 5) - user << "\blue You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units." + user << "You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units." else if (istype(I, /obj/item/weapon/implanter)) if (I:imp) if ((src.imp || I:imp.implanted)) diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 38aa376fc0e..d6fba1b32f1 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -112,10 +112,10 @@ put_mob(mob/living/carbon/M as mob) if(!iscarbon(M)) - usr << "\red The [src.name] cannot hold this!" + usr << "The [src.name] cannot hold this!" return if(src.occupant) - usr << "\red The [src.name] is already occupied!" + usr << "The [src.name] is already occupied!" return if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -136,7 +136,7 @@ if(!imp) continue if(istype(imp, /obj/item/weapon/implant/loyalty)) for (var/mob/O in viewers(M, null)) - O.show_message("\red [M] has been implanted by the [src.name].", 1) + O.show_message("[M] has been implanted by the [src.name].", 1) if(imp.implanted(M)) imp.loc = M @@ -158,7 +158,7 @@ set name = "Eject occupant" set category = "Object" set src in oview(1) - if(usr.stat != 0) + if(usr.stat != 0 || (usr.status_flags & FAKEDEATH)) return src.go_out(usr) add_fingerprint(usr) @@ -169,7 +169,7 @@ set name = "Move Inside" set category = "Object" set src in oview(1) - if(usr.stat != 0 || stat & (NOPOWER|BROKEN)) + if(usr.stat != 0 || stat & (NOPOWER|BROKEN) || (usr.status_flags & FAKEDEATH)) return put_mob(usr) return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index fc8a9b4ba51..c9a627aa04e 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -24,19 +24,19 @@ return if (user && src.imp) for (var/mob/O in viewers(M, null)) - O.show_message("\red [user] is attemping to implant [M].", 1) + O.show_message("[user] is attemping to implant [M].", 1) var/turf/T1 = get_turf(M) if (T1 && ((M == user) || do_after(user, 50))) if(user && M && (get_turf(M) == T1) && src && src.imp) for (var/mob/O in viewers(M, null)) - O.show_message("\red [M] has been implanted by [user].", 1) + O.show_message("[M] has been implanted by [user].", 1) M.attack_log += text("\[[time_stamp()]\] Implanted with [src.name] ([src.imp.name]) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])") msg_admin_attack("[user.name] ([user.ckey]) implanted [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") - user.show_message("\red You implanted the implant into [M].") + user.show_message("You implanted the implant into [M].") if(src.imp.implanted(M, user)) src.imp.loc = M src.imp.imp_in = M @@ -129,7 +129,7 @@ /obj/item/weapon/implanter/compressed/afterattack(var/obj/item/I, mob/user as mob) if(is_type_in_list(I,forbidden_types)) - user << "\red A red light flickers on the implanter." + user << "A red light flickers on the implanter." return if(istype(I) && imp) var/obj/item/weapon/implant/compressed/c = imp @@ -137,7 +137,7 @@ if(istype(I,/obj/item/weapon/storage)) ..() return - user << "\red Something is already scanned inside the implant!" + user << "Something is already scanned inside the implant!" return if(user) user.u_equip(I) diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index cc6eb303a45..ab225dafa52 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -42,7 +42,7 @@ ..() if(istype(C, /obj/item/weapon/implantcase)) if(!( src.case )) - user.drop_item(src) + user.drop_item(C, src) src.case = C else return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 0bce18189b8..56442f0440b 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -76,9 +76,9 @@ if (src.loaded_food) reagents.update_total() if(M == user) - user.visible_message("\blue [user] eats a delicious forkful of [loaded_food_name]!") + user.visible_message("[user] eats a delicious forkful of [loaded_food_name]!") else - user.visible_message("\blue [user] feeds [M] a delicious forkful of [loaded_food_name]!") + user.visible_message("[user] feeds [M] a delicious forkful of [loaded_food_name]!") reagents.reaction(M, INGEST) reagents.trans_to(M.reagents, reagents.total_volume) overlays -= loaded_food @@ -143,14 +143,14 @@ melt_temperature = MELTPOINT_STEEL /obj/item/weapon/kitchen/utensil/knife/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red You accidentally cut yourself with the [src]." + user << "You accidentally cut yourself with the [src]." user.take_organ_damage(20) return playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) @@ -188,9 +188,9 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") /obj/item/weapon/kitchen/utensil/knife/large/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /obj/item/weapon/kitchen/utensil/knife/large/ritual @@ -255,7 +255,7 @@ /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return @@ -275,7 +275,7 @@ if (H.stat < 2 && H.health < 50 && prob(90)) // ******* Check if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)) - H << "\red The helmet protects you from being hit hard in the head!" + H << "The helmet protects you from being hit hard in the head!" return var/time = rand(2, 6) if (prob(75)) @@ -283,10 +283,10 @@ else H.Stun(time) if(H.stat != 2) H.stat = 1 - user.visible_message("\red [H] has been knocked unconscious!", "\red You knock [H] unconscious!") + user.visible_message("[H] has been knocked unconscious!", "You knock [H] unconscious!") return else - H.visible_message("\red [user] tried to knock [H] unconscious!", "\red [user] tried to knock you unconscious!") + H.visible_message("[user] tried to knock [H] unconscious!", "[user] tried to knock you unconscious!") H.eye_blurry += 3 return ..() @@ -329,7 +329,7 @@ if((M_CLUMSY in user.mutations) && prob(50)) //What if he's a clown? - M << "\red You accidentally slam yourself with the [src]!" + M << "You accidentally slam yourself with the [src]!" M.Weaken(1) user.take_organ_damage(2) if(prob(50)) @@ -366,19 +366,19 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) return else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) return if(istype(M, /mob/living/carbon/human) && H.check_body_part_coverage(EYES)) - H << "\red You get slammed in the face with the tray, against your mask!" + H << "You get slammed in the face with the tray, against your mask!" if(prob(33)) src.add_blood(H) if (H.wear_mask) @@ -394,11 +394,11 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) if(prob(10)) M.Stun(rand(1,3)) M.take_organ_damage(3) @@ -408,7 +408,7 @@ return else //No eye or head protection, tough luck! - M << "\red You get slammed in the face with the tray!" + M << "You get slammed in the face with the tray!" if(prob(33)) src.add_blood(M) var/turf/location = H.loc @@ -418,11 +418,11 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) + O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) + O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) if(prob(30)) M.Stun(rand(2,4)) M.take_organ_damage(4) @@ -524,7 +524,7 @@ /*/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/kitchen/utensil/fork)) if (W.icon_state == "forkloaded") - user << "\red You already have omelette on your fork." + user << "You already have omelette on your fork." return W.icon = 'icons/obj/kitchen.dmi' W.icon_state = "forkloaded" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index fa8c788655e..220cf413912 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -4,8 +4,8 @@ heat_production = 3500 /obj/item/weapon/melee/energy/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ - "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") + viewers(user) << pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ + "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /obj/item/weapon/melee/energy/is_hot() @@ -33,7 +33,7 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide." + viewers(user) << "[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide." return (BRUTELOSS|FIRELOSS) /obj/item/weapon/melee/energy/sword diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 2a910ea8d2c..5ea2750353f 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -14,5 +14,5 @@ attack_verb = list("flogged", "whipped", "lashed", "disciplined") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." return (OXYLOSS) \ No newline at end of file diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index cb616cb5cc2..7f51d3a6349 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -20,7 +20,7 @@ var/global/list/cached_icons = list() var/paint_type = "" /obj/item/weapon/reagent_containers/glass/paint/suicide_act(mob/user) - viewers(user) << "\red [user] is taking \his hand and eating the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is taking \his hand and eating the [src.name]! It looks like \he's trying to commit suicide!" return (TOXLOSS|OXYLOSS) /obj/item/weapon/reagent_containers/glass/paint/mop_act(obj/item/weapon/mop/M, mob/user) @@ -29,7 +29,7 @@ var/global/list/cached_icons = list() /obj/item/weapon/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user , flag) if(istype(target) && reagents.total_volume > 5) for(var/mob/O in viewers(user)) - O.show_message("\red \The [target] has been splashed with something by [user]!", 1) + O.show_message("\The [target] has been splashed with something by [user]!", 1) spawn(5) reagents.reaction(target, TOUCH) reagents.remove_any(5) diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 3a726771584..35ebee86759 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -2,7 +2,7 @@ if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera)) user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") if(user && user.get_active_hand() == src) - user.drop_item(M) + user.drop_item(src, M) src.machine = M else user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].") diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 8097d31ff11..2aef235359c 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -21,7 +21,7 @@ var/minor_fault = 0 //If not 100% reliable, it will build up faults. suicide_act(mob/user) - viewers(user) << "\red [user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." return (FIRELOSS) /obj/item/weapon/cell/crap diff --git a/code/game/objects/items/weapons/shard.dm b/code/game/objects/items/weapons/shard.dm index de0c63a09c8..4f72a27fbe9 100644 --- a/code/game/objects/items/weapons/shard.dm +++ b/code/game/objects/items/weapons/shard.dm @@ -15,6 +15,7 @@ g_amt = 3750 w_type = RECYK_GLASS melt_temperature = MELTPOINT_GLASS + siemens_coefficient = 0 //no conduct attack_verb = list("stabbed", "slashed", "sliced", "cut") var/glass = /obj/item/stack/sheet/glass/glass @@ -64,8 +65,8 @@ return /obj/item/weapon/shard/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") + viewers(user) << pick("[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index bb1dc277b7e..ae01479f9cf 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -22,7 +22,7 @@ var/cooldown = 0 //shield bash cooldown. based on world.time suicide_act(mob/user) - viewers(user) << "\red [user] is smashing \his face into the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is smashing \his face into the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) IsShield() @@ -73,7 +73,7 @@ var/active = 0 suicide_act(mob/user) - viewers(user) << "\red [user] is putting the [src.name] to their head and activating it! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is putting the [src.name] to their head and activating it! It looks like \he's trying to commit suicide!" return (BRUTELOSS) @@ -96,10 +96,10 @@ /obj/item/weapon/cloaking_device/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The cloaking device is now active." + user << "The cloaking device is now active." src.icon_state = "shield1" else - user << "\blue The cloaking device is now inactive." + user << "The cloaking device is now inactive." src.icon_state = "shield0" src.add_fingerprint(user) return @@ -110,3 +110,38 @@ if(ismob(loc)) loc:update_icons() ..() + +/obj/item/weapon/shield/riot/proto + name = "Prototype Shield" + desc = "Doubles as a sled!" + icon_state = "protoshield" + inhand_states = list("left_hand" = 'icons/mob/in-hand/left/shields.dmi', "right_hand" = 'icons/mob/in-hand/right/shields.dmi') + IsShield() + return 1 + + attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/spear)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + cooldown = world.time + else + ..() + + +/obj/item/weapon/shield/riot/joe + name = "Sniper Shield" + desc = "Very useful for close-quarters sniping, regardless of how stupid that idea is." + icon_state = "joeshield" + inhand_states = list("left_hand" = 'icons/mob/in-hand/left/shields.dmi', "right_hand" = 'icons/mob/in-hand/right/shields.dmi') + IsShield() + return 1 + + attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/spear)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + cooldown = world.time + else + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index c55cfe01e81..892f788e636 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -67,7 +67,7 @@ cant_hold = list("/obj/item/weapon/disk/nuclear") suicide_act(mob/user) - viewers(user) << "\red [user] puts the [src.name] over \his head and tightens the handles around \his neck! It looks like \he's trying to commit suicide." + viewers(user) << "[user] puts the [src.name] over \his head and tightens the handles around \his neck! It looks like \he's trying to commit suicide." return(OXYLOSS) // ----------------------------- @@ -148,7 +148,7 @@ current += S.amount if(capacity == current)//If it's full, you're done if(!stop_messages) - usr << "\red The snatcher is full." + usr << "The snatcher is full." return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 9b9ca0e1747..5e332a5c271 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -13,7 +13,7 @@ fire_fuel = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is farting lightly on the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is farting lightly on the [src.name]! It looks like \he's trying to commit suicide!" return (user.death(1)) @@ -93,40 +93,40 @@ if (M.stat !=2) if(M.mind && (M.mind.assigned_role == "Chaplain")) - user << "\red You can't heal yourself!" + user << "You can't heal yourself!" return if((iscult(M) && !isculthead(M)) && (prob(20))) // can't deconvert originals - Pomf - M << "\red The power of [src.deity_name] clears your mind of heresy!" - user << "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!" + M << "The power of [src.deity_name] clears your mind of heresy!" + user << "You see how [M]'s eyes become clear, the cult no longer holds control over him!" ticker.mode.remove_cultist(M.mind) if ((istype(M, /mob/living/carbon/human) && prob(60))) bless(M) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] heals [] with the power of [src.deity_name]!", user, M), 1) - M << "\red May the power of [src.deity_name] compel you to be healed!" + O.show_message(text("[] heals [] with the power of [src.deity_name]!", user, M), 1) + M << "May the power of [src.deity_name] compel you to be healed!" playsound(get_turf(src), "punch", 25, 1, -1) else if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet)) M.adjustBrainLoss(10) - M << "\red You feel dumber." + M << "You feel dumber." for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] beats [] over the head with []!", user, M, src), 1) + O.show_message(text("[] beats [] over the head with []!", user, M, src), 1) playsound(get_turf(src), "punch", 25, 1, -1) else if(M.stat == 2) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] smacks []'s lifeless corpse with [].", user, M, src), 1) + O.show_message(text("[] smacks []'s lifeless corpse with [].", user, M, src), 1) playsound(get_turf(src), "punch", 25, 1, -1) return /obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob) /* if (istype(A, /turf/simulated/floor)) - user << "\blue You hit the floor with the bible." + user << "You hit the floor with the bible." if(user.mind && (user.mind.assigned_role == "Chaplain")) call(/obj/effect/rune/proc/revealrunes)(src)*/ user.delayNextAttack(5) if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - user << "\blue You bless [A]." + user << "You bless [A]." var/water2holy = A.reagents.get_reagent_amount("water") A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 4c965dc5519..f1038fd185a 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -33,7 +33,7 @@ //..() if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return @@ -51,7 +51,7 @@ var/mob/H = M // ******* Check if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) - M << "\red The helmet protects you from being hit hard in the head!" + M << "The helmet protects you from being hit hard in the head!" return var/time = rand(2, 6) if (prob(75)) @@ -60,9 +60,9 @@ M.Stun(time) if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall.", 2) + O.show_message(text("[] has been knocked unconscious!", M), 1, "You hear someone fall.", 2) else - M << text("\red [] tried to knock you unconcious!",user) + M << text("[] tried to knock you unconcious!",user) M.eye_blurry += 3 return @@ -104,7 +104,7 @@ bottom_open = 0 else if(bottom_open && item.w_class <= 3.0) stored_item = item - user.drop_item() + user.drop_item(item) max_w_class = 3.0 - stored_item.w_class item.loc = null //null space here we go - to stop it showing up in the briefcase user << "You place \the [item] into the false bottom of the briefcase." diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 8747f38ae82..706d4943d2f 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -15,10 +15,13 @@ var/icon_locked = "lockbox+l" var/icon_closed = "lockbox" var/icon_broken = "lockbox+b" + var/tracked_access = "It doesn't look like it's ever been used." + /obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/ID = W if(src.broken) user << "It appears to be broken." return @@ -27,10 +30,12 @@ if(src.locked) src.icon_state = src.icon_locked user << "You lock the [src.name]!" + tracked_access = "The tracker reads: 'Last locked by [ID.registered_name].'" return else src.icon_state = src.icon_closed user << "You unlock the [src.name]!" + tracked_access = "The tracker reads: 'Last unlocked by [ID.registered_name].'" return else user << "Access Denied" @@ -162,11 +167,10 @@ name = "semi-secure lockbox" desc = "A securable locked box. Can't lock anything, but can track whoever used it." req_access = list() - var/tracked_access = "It doesn't look like it's ever been used." -/obj/item/weapon/storage/lockbox/unlockable/examine(mob/user) +/obj/item/weapon/storage/lockbox/examine(mob/user) ..() - user << tracked_access + user << "tracked_access" /obj/item/weapon/storage/lockbox/unlockable/attackby(obj/O as obj, mob/user as mob) if (istype(O, /obj/item/weapon/card/id)) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 9deeaf4de72..2b4edeadcce 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -176,7 +176,7 @@ //I consider this worthless but it isn't my code so whatever. Remove or uncomment. /*attack(mob/M as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return @@ -193,7 +193,7 @@ if (H.stat < 2 && H.health < 50 && prob(90)) // ******* Check if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)) - H << "\red The helmet protects you from being hit hard in the head!" + H << "The helmet protects you from being hit hard in the head!" return var/time = rand(2, 6) if (prob(75)) @@ -202,9 +202,9 @@ H.Stun(time) if(H.stat != 2) H.stat = 1 for(var/mob/O in viewers(H, null)) - O.show_message(text("\red [] has been knocked unconscious!", H), 1, "\red You hear someone fall.", 2) + O.show_message(text("[] has been knocked unconscious!", H), 1, "You hear someone fall.", 2) else - H << text("\red [] tried to knock you unconcious!",user) + H << text("[] tried to knock you unconcious!",user) H.eye_blurry += 3 return*/ diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 061cea6bf99..be0d5ca4ffb 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -429,7 +429,7 @@ set name = "Empty Contents" set category = "Object" - if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained()) + if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) return var/turf/T = get_turf(src) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 83b2292514a..e01de226740 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -18,7 +18,7 @@ attack_verb = list("robusted") suicide_act(mob/user) - viewers(user) << "\red [user] is [pick("stoving","robusting")] \his head in with the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is [pick("stoving","robusting")] \his head in with the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index e3f3c346b51..406c91d95c3 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/box/syndicate/ New() ..() - var/tagname = pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1, "psycho" = 1, "hotline" = 1)) + var/tagname = pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1, "psycho" = 1, "hotline" = 1, "balloon" = 0.1)) switch (tagname) if("bloodyspai") new /obj/item/clothing/under/chameleon(src) @@ -92,6 +92,16 @@ new /obj/item/weapon/kitchen/utensil/knife/large/butch/meatcleaver(src) new /obj/item/weapon/storage/pill_bottle/hyperzine(src) new /obj/item/weapon/card/id/syndicate(src) + + + if("balloon") + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) + new /obj/item/toy/syndicateballoon(src) tag = tagname diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index bc79486ea10..fdd6f309f0b 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -62,7 +62,7 @@ /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/cell)) if(!bcell) - user.drop_item(src) + user.drop_item(W, src) bcell = W user << "You install a cell in [src]." update_icon() diff --git a/code/game/objects/items/weapons/surgery_limbattachment.dm b/code/game/objects/items/weapons/surgery_limbattachment.dm index 5ada374d1cd..e544c0c11e8 100644 --- a/code/game/objects/items/weapons/surgery_limbattachment.dm +++ b/code/game/objects/items/weapons/surgery_limbattachment.dm @@ -19,36 +19,36 @@ else if((user.zone_sel.selecting == "l_leg") && (istype(src, /obj/item/robot_parts/l_leg))) limbloc = "l_foot" else - user << "\red That doesn't fit there!" + user << "That doesn't fit there!" return ..() var/mob/living/carbon/human/H = M var/datum/organ/external/S = H.organs[user.zone_sel.selecting] if(S.status & ORGAN_DESTROYED) if(!(S.status & ORGAN_ATTACHABLE)) - user << "\red The wound is not ready for a replacement!" + user << "The wound is not ready for a replacement!" return 0 if(M != user) M.visible_message( \ - "\red [user] is beginning to attach \the [src] where [H]'s [S.display_name] used to be.", \ - "\red [user] begins to attach \the [src] where your [S.display_name] used to be.") + "[user] is beginning to attach \the [src] where [H]'s [S.display_name] used to be.", \ + "[user] begins to attach \the [src] where your [S.display_name] used to be.") else M.visible_message( \ - "\red [user] begins to attach a robotic limb where \his [S.display_name] used to be with [src].", \ - "\red You begin to attach \the [src] where your [S.display_name] used to be.") + "[user] begins to attach a robotic limb where \his [S.display_name] used to be with [src].", \ + "You begin to attach \the [src] where your [S.display_name] used to be.") if(do_mob(user, H, 100)) if(M != user) M.visible_message( \ - "\red [user] finishes attaching [H]'s new [S.display_name].", \ - "\red [user] finishes attaching your new [S.display_name].") + "[user] finishes attaching [H]'s new [S.display_name].", \ + "[user] finishes attaching your new [S.display_name].") else M.visible_message( \ - "\red [user] finishes attaching \his new [S.display_name].", \ - "\red You finish attaching your new [S.display_name].") + "[user] finishes attaching \his new [S.display_name].", \ + "You finish attaching your new [S.display_name].") if(H == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" S.take_damage(15) S.status &= ~ORGAN_BROKEN diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index eefae8a3a19..04928cbfd2f 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -27,7 +27,7 @@ origin_tech = "materials=1;biotech=1" suicide_act(mob/user) - viewers(user) << "\red [user] is pulling \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is pulling \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) @@ -48,34 +48,34 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N - user << "\red You cannot locate any eyes on this creature!" + user << "You cannot locate any eyes on this creature!" return switch(M.eye_op_stage) if(1.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is having his eyes retracted by [user].", 1) - M << "\red [user] begins to seperate your eyes with [src]!" - user << "\red You seperate [M]'s eyes with [src]!" + O.show_message("[M] is having his eyes retracted by [user].", 1) + M << "[user] begins to seperate your eyes with [src]!" + user << "You seperate [M]'s eyes with [src]!" else user.visible_message( \ - "\red [user] begins to have his eyes retracted.", \ - "\red You begin to pry open your eyes with [src]!" \ + "[user] begins to have his eyes retracted.", \ + "You begin to pry open your eyes with [src]!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(15)) @@ -94,20 +94,20 @@ LOOK FOR SURGERY.DM*/ return ..() if(H.wear_suit || H.w_uniform) - user << "\red You're going to need to remove that suit/jumpsuit first." + user << "You're going to need to remove that suit/jumpsuit first." return var/obj/item/alien_embryo/A = locate() in M.contents if(!A) return ..() - user.visible_message("\red [user] begins to pull something out of [M]'s chest.", "\red You begin to pull the alien organism out of [M]'s chest.") + user.visible_message("[user] begins to pull something out of [M]'s chest.", "You begin to pull the alien organism out of [M]'s chest.") spawn(20 + rand(0,50)) if(!A || A.loc != M) return if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("chest") if(affecting.take_damage(30)) @@ -122,7 +122,7 @@ LOOK FOR SURGERY.DM*/ M:alien_op_stage = 4.0 if(M) - user.visible_message("\red [user] pulls an alien organism out of [M]'s chest.", "\red You pull the alien organism out of [M]'s chest.") + user.visible_message("[user] pulls an alien organism out of [M]'s chest.", "You pull the alien organism out of [M]'s chest.") A.loc = M.loc //alien embryo handles cleanup else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human)))) @@ -150,7 +150,7 @@ LOOK FOR SURGERY.DM*/ attack_verb = list("attacked", "pinched") suicide_act(mob/user) - viewers(user) << "\red [user] is pulling \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is pulling \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) @@ -168,16 +168,16 @@ LOOK FOR SURGERY.DM*/ if(1.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [user] is beginning to clamp bleeders in [M]'s abdomen cut open with [src].", 1) - M << "\red [user] begins to clamp bleeders in your abdomen with [src]!" - user << "\red You clamp bleeders in [M]'s abdomen with [src]!" + O.show_message("[user] is beginning to clamp bleeders in [M]'s abdomen cut open with [src].", 1) + M << "[user] begins to clamp bleeders in your abdomen with [src]!" + user << "You clamp bleeders in [M]'s abdomen with [src]!" M:appendix_op_stage = 2.0 if(4.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [user] is removing [M]'s appendix with [src].", 1) - M << "\red [user] begins to remove your appendix with [src]!" - user << "\red You remove [M]'s appendix with [src]!" + O.show_message("[user] is removing [M]'s appendix with [src].", 1) + M << "[user] begins to remove your appendix with [src]!" + user << "You remove [M]'s appendix with [src]!" for(var/datum/disease/D in M.viruses) if(istype(D, /datum/disease/appendicitis)) new /obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed(get_turf(M)) @@ -195,34 +195,34 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N - user << "\red You cannot locate any eyes on this creature!" + user << "You cannot locate any eyes on this creature!" return switch(M.eye_op_stage) if(2.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is having his eyes mended by [user].", 1) - M << "\red [user] begins to mend your eyes with [src]!" - user << "\red You mend [M]'s eyes with [src]!" + O.show_message("[M] is having his eyes mended by [user].", 1) + M << "[user] begins to mend your eyes with [src]!" + user << "You mend [M]'s eyes with [src]!" else user.visible_message( \ - "\red [user] begins to have his eyes mended.", \ - "\red You begin to mend your eyes with [src]!" \ + "[user] begins to have his eyes mended.", \ + "You begin to mend your eyes with [src]!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(15)) @@ -239,14 +239,14 @@ LOOK FOR SURGERY.DM*/ return ..() if(H.wear_suit || H.w_uniform) - user << "\red You're going to need to remove that suit/jumpsuit first." + user << "You're going to need to remove that suit/jumpsuit first." return - user.visible_message("\red [user] begins to dig around in [M]'s chest.", "\red You begin to dig around in [M]'s chest.") + user.visible_message("[user] begins to dig around in [M]'s chest.", "You begin to dig around in [M]'s chest.") spawn(20 + (M:alien_op_stage == 3 ? 0 : rand(0,50))) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("chest") if(affecting.take_damage(30)) @@ -256,7 +256,7 @@ LOOK FOR SURGERY.DM*/ var/obj/item/alien_embryo/A = locate() in M.contents if(A) - var/dat = "\blue You found an unknown alien organism in [M]'s chest!" + var/dat = "You found an unknown alien organism in [M]'s chest!" if(A.stage < 4) dat += " It's small and weak, barely the size of a foetus." if(A.stage > 3) @@ -266,7 +266,7 @@ LOOK FOR SURGERY.DM*/ user << dat M:alien_op_stage = 3.0 else - user << "\blue You find nothing of interest." + user << "You find nothing of interest." else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human)))) return ..() @@ -293,7 +293,7 @@ LOOK FOR SURGERY.DM*/ attack_verb = list("burnt") suicide_act(mob/user) - viewers(user) << "\red [user] is burning \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is burning \his eyes out with the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) is_hot() return 1 @@ -312,9 +312,9 @@ LOOK FOR SURGERY.DM*/ if(5.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [user] is beginning to cauterize the incision in [M]'s abdomen with [src].", 1) - M << "\red [user] begins to cauterize the incision in your abdomen with [src]!" - user << "\red You cauterize the incision in [M]'s abdomen with [src]!" + O.show_message("[user] is beginning to cauterize the incision in [M]'s abdomen with [src].", 1) + M << "[user] begins to cauterize the incision in your abdomen with [src]!" + user << "You cauterize the incision in [M]'s abdomen with [src]!" M:appendix_op_stage = 6.0 for(var/datum/disease/appendicitis in M.viruses) appendicitis.cure() @@ -328,34 +328,34 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N - user << "\red You cannot locate any eyes on this creature!" + user << "You cannot locate any eyes on this creature!" return switch(M.eye_op_stage) if(3.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is having his eyes cauterized by [user].", 1) - M << "\red [user] begins to cauterize your eyes!" - user << "\red You cauterize [M]'s eyes with [src]!" + O.show_message("[M] is having his eyes cauterized by [user].", 1) + M << "[user] begins to cauterize your eyes!" + user << "You cauterize [M]'s eyes with [src]!" else user.visible_message( \ - "\red [user] begins to have his eyes cauterized.", \ - "\red You begin to cauterize your eyes!" \ + "[user] begins to have his eyes cauterized.", \ + "You begin to cauterize your eyes!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(15)) @@ -394,8 +394,8 @@ LOOK FOR SURGERY.DM*/ attack_verb = list("drilled") suicide_act(mob/user) - viewers(user) << pick("\red [user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "\red [user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.") + viewers(user) << pick("[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ + "[user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /* @@ -422,9 +422,9 @@ LOOK FOR SURGERY.DM*/ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /* @@ -449,16 +449,16 @@ LOOK FOR SURGERY.DM*/ if(0.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is beginning to have his abdomen cut open with [src] by [user].", 1) - M << "\red [user] begins to cut open your abdomen with [src]!" - user << "\red You cut [M]'s abdomen open with [src]!" + O.show_message("[M] is beginning to have his abdomen cut open with [src] by [user].", 1) + M << "[user] begins to cut open your abdomen with [src]!" + user << "You cut [M]'s abdomen open with [src]!" M:appendix_op_stage = 1.0 if(3.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is beginning to have his appendix seperated with [src] by [user].", 1) - M << "\red [user] begins to seperate your appendix with [src]!" - user << "\red You seperate [M]'s appendix with [src]!" + O.show_message("[M] is beginning to have his appendix seperated with [src] by [user].", 1) + M << "[user] begins to seperate your appendix with [src]!" + user << "You seperate [M]'s appendix with [src]!" M:appendix_op_stage = 4.0 return @@ -470,14 +470,14 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return switch(M:brain_op_stage) @@ -485,26 +485,26 @@ LOOK FOR SURGERY.DM*/ if(istype(M, /mob/living/carbon/slime)) if(M.stat == 2) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M.name] is beginning to have its flesh cut open with [src] by [user].", 1) - M << "\red [user] begins to cut open your flesh with [src]!" - user << "\red You cut [M]'s flesh open with [src]!" + O.show_message("[M.name] is beginning to have its flesh cut open with [src] by [user].", 1) + M << "[user] begins to cut open your flesh with [src]!" + user << "You cut [M]'s flesh open with [src]!" M:brain_op_stage = 1.0 return if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is beginning to have his head cut open with [src] by [user].", 1) - M << "\red [user] begins to cut open your head with [src]!" - user << "\red You cut [M]'s head open with [src]!" + O.show_message("[M] is beginning to have his head cut open with [src] by [user].", 1) + M << "[user] begins to cut open your head with [src]!" + user << "You cut [M]'s head open with [src]!" else user.visible_message( \ - "\red [user] begins to cut open his skull with [src]!", \ - "\red You begin to cut open your head with [src]!" \ + "[user] begins to cut open his skull with [src]!", \ + "You begin to cut open your head with [src]!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(15)) @@ -525,9 +525,9 @@ LOOK FOR SURGERY.DM*/ if(istype(M, /mob/living/carbon/slime)) if(M.stat == 2) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M.name] is having its silky innards cut apart with [src] by [user].", 1) - M << "\red [user] begins to cut apart your innards with [src]!" - user << "\red You cut [M]'s silky innards apart with [src]!" + O.show_message("[M.name] is having its silky innards cut apart with [src] by [user].", 1) + M << "[user] begins to cut apart your innards with [src]!" + user << "You cut [M]'s silky innards apart with [src]!" M:brain_op_stage = 2.0 return if(2.0) @@ -536,21 +536,21 @@ LOOK FOR SURGERY.DM*/ var/mob/living/carbon/slime/slime = M if(slime.cores > 0) if(istype(M, /mob/living/carbon/slime)) - user << "\red You attempt to remove [M]'s core, but [src] is ineffective!" + user << "You attempt to remove [M]'s core, but [src] is ineffective!" return if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is having his connections to the brain delicately severed with [src] by [user].", 1) - M << "\red [user] begins to cut open your head with [src]!" - user << "\red You cut [M]'s head open with [src]!" + O.show_message("[M] is having his connections to the brain delicately severed with [src] by [user].", 1) + M << "[user] begins to cut open your head with [src]!" + user << "You cut [M]'s head open with [src]!" else user.visible_message( \ - "\red [user] begin to delicately remove the connections to his brain with [src]!", \ - "\red You begin to cut open your head with [src]!" \ + "[user] begin to delicately remove the connections to his brain with [src]!", \ + "You begin to cut open your head with [src]!" \ ) if(M == user && prob(25)) - user << "\red You nick an artery!" + user << "You nick an artery!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(75)) @@ -571,7 +571,7 @@ LOOK FOR SURGERY.DM*/ return else if(user.zone_sel.selecting == "eyes") - user << "\blue So far so good." + user << "So far so good." var/mob/living/carbon/human/H = M if(istype(H) && ( \ @@ -579,34 +579,34 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N - user << "\red You cannot locate any eyes on this creature!" + user << "You cannot locate any eyes on this creature!" return switch(M:eye_op_stage) if(0.0) if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] is beginning to have his eyes incised with [src] by [user].", 1) - M << "\red [user] begins to cut open your eyes with [src]!" - user << "\red You make an incision around [M]'s eyes with [src]!" + O.show_message("[M] is beginning to have his eyes incised with [src] by [user].", 1) + M << "[user] begins to cut open your eyes with [src]!" + user << "You make an incision around [M]'s eyes with [src]!" else user.visible_message( \ - "\red [user] begins to cut around his eyes with [src]!", \ - "\red You begin to cut open your eyes with [src]!" \ + "[user] begins to cut around his eyes with [src]!", \ + "You begin to cut open your eyes with [src]!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(15)) @@ -614,10 +614,10 @@ LOOK FOR SURGERY.DM*/ else M.take_organ_damage(15) - user << "\blue So far so good before." + user << "So far so good before." M.updatehealth() M:eye_op_stage = 1.0 - user << "\blue So far so good after." + user << "So far so good after." else if(user.zone_sel.selecting == "chest") switch(M:alien_op_stage) @@ -627,14 +627,14 @@ LOOK FOR SURGERY.DM*/ return ..() if(H.wear_suit || H.w_uniform) - user << "\red You're going to need to remove that suit/jumpsuit first." + user << "You're going to need to remove that suit/jumpsuit first." return - user.visible_message("\red [user] begins to slice open [M]'s chest.", "\red You begin to slice open [M]'s chest.") + user.visible_message("[user] begins to slice open [M]'s chest.", "You begin to slice open [M]'s chest.") spawn(rand(20,50)) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("chest") if(affecting.take_damage(15)) @@ -643,7 +643,7 @@ LOOK FOR SURGERY.DM*/ M.take_organ_damage(15) M:alien_op_stage = 1.0 - user << "\blue So far so good." + user << "So far so good." else return ..() @@ -728,7 +728,7 @@ LOOK FOR SURGERY.DM*/ attack_verb = list("attacked", "slashed", "sawed", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] is sawing \his head in two with the [src.name]! It looks like \he's trying to commit suicide!" + viewers(user) << "[user] is sawing \his head in two with the [src.name]! It looks like \he's trying to commit suicide!" return (BRUTELOSS) @@ -754,14 +754,14 @@ LOOK FOR SURGERY.DM*/ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return var/mob/living/carbon/monkey/Mo = M if(istype(Mo) && ( \ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) - user << "\red You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first." return switch(M:brain_op_stage) @@ -770,16 +770,16 @@ LOOK FOR SURGERY.DM*/ return if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] has his skull sawed open with [src] by [user].", 1) - M << "\red [user] begins to saw open your head with [src]!" - user << "\red You saw [M]'s head open with [src]!" + O.show_message("[M] has his skull sawed open with [src] by [user].", 1) + M << "[user] begins to saw open your head with [src]!" + user << "You saw [M]'s head open with [src]!" else user.visible_message( \ - "\red [user] saws open his skull with [src]!", \ - "\red You begin to saw open your head with [src]!" \ + "[user] saws open his skull with [src]!", \ + "You begin to saw open your head with [src]!" \ ) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") if(affecting.take_damage(40)) @@ -803,11 +803,11 @@ LOOK FOR SURGERY.DM*/ var/mob/living/carbon/slime/slime = M if(slime.cores > 0) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M.name] is having one of its cores sawed out with [src] by [user].", 1) + O.show_message("[M.name] is having one of its cores sawed out with [src] by [user].", 1) slime.cores-- - M << "\red [user] begins to remove one of your cores with [src]! ([slime.cores] cores remaining)" - user << "\red You cut one of [M]'s cores out with [src]! ([slime.cores] cores remaining)" + M << "[user] begins to remove one of your cores with [src]! ([slime.cores] cores remaining)" + user << "You cut one of [M]'s cores out with [src]! ([slime.cores] cores remaining)" new slime.coretype(M.loc) @@ -818,18 +818,18 @@ LOOK FOR SURGERY.DM*/ if(3.0) /*if(M.mind && M.mind.changeling) - user << "\red The neural tissue regrows before your eyes as you cut it." + user << "The neural tissue regrows before your eyes as you cut it." return*/ if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] has his spine's connection to the brain severed with [src] by [user].", 1) - M << "\red [user] severs your brain's connection to the spine with [src]!" - user << "\red You sever [M]'s brain's connection to the spine with [src]!" + O.show_message("[M] has his spine's connection to the brain severed with [src] by [user].", 1) + M << "[user] severs your brain's connection to the spine with [src]!" + user << "You sever [M]'s brain's connection to the spine with [src]!" else user.visible_message( \ - "\red [user] severs his brain's connection to the spine with [src]!", \ - "\red You sever your brain's connection to the spine with [src]!" \ + "[user] severs his brain's connection to the spine with [src]!", \ + "You sever your brain's connection to the spine with [src]!" \ ) user.attack_log += "\[[time_stamp()]\] Debrained [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" @@ -856,14 +856,14 @@ LOOK FOR SURGERY.DM*/ return ..() if(H.wear_suit || H.w_uniform) - user << "\red You're going to need to remove that suit/jumpsuit first." + user << "You're going to need to remove that suit/jumpsuit first." return - user.visible_message("\red [user] begins to slice through the bone of [M]'s chest.", "\red You begin to slice through the bone of [M]'s chest.") + user.visible_message("[user] begins to slice through the bone of [M]'s chest.", "You begin to slice through the bone of [M]'s chest.") spawn(20 + rand(0,50)) if(M == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("chest") if(affecting.take_damage(15)) @@ -872,7 +872,7 @@ LOOK FOR SURGERY.DM*/ M.take_organ_damage(15) M:alien_op_stage = 2.0 - user << "\blue So far so good." + user << "So far so good." else return ..() @@ -893,7 +893,7 @@ LOOK FOR SURGERY.DM*/ throwforce = 1.0 suicide_act(mob/user) - viewers(user) << "\red [user] is eating the [src.name]! It looks like \he's trying to commit suicide!" //Don't eat glue kids. + viewers(user) << "[user] is eating the [src.name]! It looks like \he's trying to commit suicide!" //Don't eat glue kids. return (TOXLOSS) diff --git a/code/game/objects/items/weapons/switchtool.dm b/code/game/objects/items/weapons/switchtool.dm index 660ce613d58..7ca4fd326ec 100644 --- a/code/game/objects/items/weapons/switchtool.dm +++ b/code/game/objects/items/weapons/switchtool.dm @@ -97,7 +97,7 @@ return else stored_modules[module] = used_item - user.drop_item(src) + user.drop_item(used_item, src) user << "You successfully load \the [used_item] into \the [src]'s [get_module_name(module)] slot." return 1 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index b8fd1d8c916..bc041f0a447 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -31,7 +31,7 @@ /obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red You club yourself over the head." + user << "You club yourself over the head." user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -54,7 +54,7 @@ M.Stun(8) M.Weaken(8) for(var/mob/O in viewers(M)) - if (O.client) O.show_message("\red [M] has been beaten with \the [src] by [user]!", 1, "\red You hear someone fall", 2) + if (O.client) O.show_message("[M] has been beaten with \the [src] by [user]!", 1, "You hear someone fall", 2) else playsound(get_turf(src), 'sound/weapons/Genhit.ogg', 50, 1, -1) M.Stun(5) @@ -69,7 +69,7 @@ src.add_fingerprint(user) for(var/mob/O in viewers(M)) - if (O.client) O.show_message("\red [M] has been stunned with \the [src] by [user]!", 1, "\red You hear someone fall", 2) + if (O.client) O.show_message("[M] has been stunned with \the [src] by [user]!", 1, "You hear someone fall", 2) //Telescopic baton /obj/item/weapon/melee/telebaton @@ -88,8 +88,8 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\ - "\red You extend the baton.",\ + user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ + "You extend the baton.",\ "You hear an ominous click.") icon_state = "telebaton_1" item_state = "telebaton_1" @@ -97,8 +97,8 @@ force = 15//quite robust attack_verb = list("smacked", "struck", "slapped") else - user.visible_message("\blue [user] collapses their telescopic baton.",\ - "\blue You collapse the baton.",\ + user.visible_message("[user] collapses their telescopic baton.",\ + "You collapse the baton.",\ "You hear a click.") icon_state = "telebaton_0" item_state = "telebaton_0" @@ -124,7 +124,7 @@ /obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) if(on) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red You club yourself over the head." + user << "You club yourself over the head." user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -145,7 +145,7 @@ user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [target.name] ([target.ckey])") log_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") src.add_fingerprint(user) - target.visible_message("\red [target] has been stunned with \the [src] by [user]!") + target.visible_message("[target] has been stunned with \the [src] by [user]!") if(!iscarbon(user)) target.LAssailant = null else @@ -191,12 +191,12 @@ /obj/item/weapon/melee/energy/axe/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The axe is now energised." + user << "The axe is now energised." src.force = 150 src.icon_state = "axe1" src.w_class = 5 else - user << "\blue The axe can now be concealed." + user << "The axe can now be concealed." src.force = 40 src.icon_state = "axe0" src.w_class = 5 @@ -215,7 +215,7 @@ /obj/item/weapon/shield/energy/attack_self(mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red You beat yourself in the head with [src]." + user << "You beat yourself in the head with [src]." user.take_organ_damage(5) active = !active if (active) @@ -223,12 +223,12 @@ icon_state = "eshield[active]" w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - user << "\blue [src] is now active." + user << "[src] is now active." else force = 3 icon_state = "eshield[active]" w_class = 1 playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - user << "\blue [src] can now be concealed." + user << "[src] can now be concealed." add_fingerprint(user) return \ No newline at end of file diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 4593bf932f4..14b7f9a0b4b 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -71,12 +71,12 @@ pr_open = 1 switch(alert(user, "What would you like to do?", "Lighter", "Press the button.", "Close the lighter.")) if("Press the button.") - user << "\red You press the button." + user << "You press the button." flick("c-4detonator_click", src) if(src.bomb) src.bomb.detonate() log_admin("[user.real_name]([user.ckey]) has triggered [src.bomb] with [src].") - message_admins("\red [user.real_name]([user.ckey]) has triggered [src.bomb] with [src].") + message_admins("[user.real_name]([user.ckey]) has triggered [src.bomb] with [src].") if("Close the lighter.") src.icon_state = "c-4detonator_0" diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index 0750b4a80b2..d76f761e49e 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -21,15 +21,15 @@ if (istype(W, /obj/item/stack/rods)) if (W:amount >= 4) new /obj/item/weapon/table_parts/reinforced( user.loc ) - user << "\blue You reinforce the [name]." + user << "You reinforce the [name]." W:use(4) del(src) else if (W:amount < 4) - user << "\red You need at least four rods to do this." + user << "You need at least four rods to do this." /obj/item/weapon/table_parts/attack_self(mob/user as mob) new /obj/structure/table( user.loc ) - user.drop_item() + user.drop_item(src) del(src) return @@ -46,7 +46,7 @@ /obj/item/weapon/table_parts/reinforced/attack_self(mob/user as mob) new /obj/structure/table/reinforced( user.loc ) - user.drop_item() + user.drop_item(src) del(src) return @@ -70,7 +70,7 @@ /obj/item/weapon/table_parts/wood/attack_self(mob/user as mob) new /obj/structure/table/woodentable( user.loc ) - user.drop_item() + user.drop_item(src) del(src) return @@ -87,7 +87,7 @@ /obj/item/weapon/table_parts/wood/poker/attack_self(mob/user as mob) new /obj/structure/table/woodentable/poker( user.loc ) - user.drop_item() + user.drop_item(src) del(src) return @@ -107,6 +107,6 @@ /obj/item/weapon/rack_parts/attack_self(mob/user as mob) var/obj/structure/rack/R = new /obj/structure/rack( user.loc ) R.add_fingerprint(user) - user.drop_item() + user.drop_item(src) del(src) return \ No newline at end of file diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 7e376ac18eb..8ecae54a9e6 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -226,7 +226,7 @@ if(!istype(src.loc,/obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") - //world << "\blue[x],[y] tank is exploding: [pressure] kPa" + //world << "[x],[y] tank is exploding: [pressure] kPa" //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -239,7 +239,7 @@ range = min(range, MAX_EXPLOSION_RANGE) // was 8 - - - Changed to a configurable define -- TLE var/turf/epicenter = get_turf(loc) - //world << "\blue Exploding Pressure: [pressure] kPa, intensity: [range]" + //world << "Exploding Pressure: [pressure] kPa, intensity: [range]" explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5), 1, cap) if(cap) @@ -254,7 +254,7 @@ del(src) else if(pressure > TANK_RUPTURE_PRESSURE) - //world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" + //world << "[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -266,7 +266,7 @@ integrity-- else if(pressure > TANK_LEAK_PRESSURE) - //world << "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" + //world << "[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/weapons/tile_painter.dm b/code/game/objects/items/weapons/tile_painter.dm index 25841f695ec..f4934d246f2 100644 --- a/code/game/objects/items/weapons/tile_painter.dm +++ b/code/game/objects/items/weapons/tile_painter.dm @@ -323,6 +323,7 @@ var/global/list/paint_variants = list( /obj/item/weapon/tile_painter/Destroy() //do I even have to do that selected = null + ..() // FUCKING DUMB /obj/item/weapon/tile_painter/attack_self(mob/user as mob) show_menu(user) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index b2eaa60ce05..bb87ca6d072 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -64,7 +64,7 @@ user.update_inv_r_hand() /obj/item/weapon/fireaxe/suicide_act(mob/user) - viewers(user) << "\red [user] is smashing \himself in the head with the [src.name]! It looks like \he's commit suicide!" + viewers(user) << "[user] is smashing \himself in the head with the [src.name]! It looks like \he's commit suicide!" return (BRUTELOSS) /obj/item/weapon/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) @@ -114,7 +114,7 @@ /obj/item/weapon/dualsaber/attack(target as mob, mob/living/user as mob) ..() if((M_CLUMSY in user.mutations) && (wielded) &&prob(40)) - user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]." + user << "You twirl around a bit before losing your balance and impaling yourself on the [src]." user.take_organ_damage(20,25) return if((wielded) && prob(50)) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index eadbc8f5d82..4be017325cd 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -12,7 +12,7 @@ attack_verb = list("banned") suicide_act(mob/user) - viewers(user) << "\red [user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life." + viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life." return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /obj/item/weapon/nullrod @@ -29,7 +29,7 @@ w_class = 1 suicide_act(mob/user) - viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." return (BRUTELOSS|FIRELOSS) /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. @@ -44,11 +44,11 @@ msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return if ((M_CLUMSY in user.mutations) && prob(50)) - user << "\red The rod slips out of your hand and hits your head." + user << "The rod slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(20) return @@ -63,7 +63,7 @@ /obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob) user.delayNextAttack(8) if (istype(A, /turf/simulated/floor)) - user << "\blue You hit the floor with the [src]." + user << "You hit the floor with the [src]." call(/obj/effect/rune/proc/revealrunes)(src) /obj/item/weapon/nullrod/pickup(mob/living/user as mob) @@ -87,7 +87,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." return(BRUTELOSS) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -113,7 +113,7 @@ return 1 suicide_act(mob/user) - viewers(user) << "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide." return(BRUTELOSS) /obj/item/weapon/claymore/cultify() @@ -139,7 +139,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku." + viewers(user) << "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku." return(BRUTELOSS) /obj/item/weapon/katana/IsShield() diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index 284be5284c3..ce3db913017 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -12,9 +12,9 @@ /obj/item/weapon/wire/attack_self(mob/user as mob) if (src.laying) src.laying = 0 - user << "\blue You're done laying wire!" + user << "You're done laying wire!" else - user << "\blue You are not using this to lay wire..." + user << "You are not using this to lay wire..." return diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index aae8edf579d..9db1bb6b554 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -44,7 +44,7 @@ /obj/structure/sign/double/barsign/attack_hand(mob/user as mob) if (!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return if (!(get_dir(src, usr) in list(SOUTHWEST, SOUTH, SOUTHEAST))) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 682f5a33bf8..910e109c6f7 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -47,7 +47,7 @@ LINEN BINS //todo: sharp thing code/game/objects/objs.dm /obj/item/weapon/bedsheet/attack_self(mob/user as mob) - user.drop_item() + user.drop_item(src) if(layer == initial(layer)) layer = 5 else @@ -157,12 +157,12 @@ LINEN BINS /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/bedsheet)) - user.drop_item(src) + user.drop_item(I, src) sheets.Add(I) amount++ user << "You put [I] in [src]." else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. - user.drop_item(src) + user.drop_item(I, src) hidden = I user << "You hide [I] among the sheets." diff --git a/code/game/objects/structures/coatrack.dm b/code/game/objects/structures/coatrack.dm index d7116bc6cf0..1b9ab221020 100644 --- a/code/game/objects/structures/coatrack.dm +++ b/code/game/objects/structures/coatrack.dm @@ -37,14 +37,14 @@ if (istype(C, /obj/item/clothing/suit/storage/det_suit) && !suit) user << "You place your [C] on the [src]" playsound(get_turf(src), "rustle", 50, 1, -5) - user.drop_item(src) + user.drop_item(C, src) suit = C update_icon() else if (istype(C, /obj/item/clothing/head/det_hat) && !hat) user << "You place your [C] on the [src]" playsound(get_turf(src), "rustle", 50, 1, -5) - user.drop_item(src) + user.drop_item(C, src) hat = C update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9f76e221e98..f6e3b855d88 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -242,7 +242,7 @@ /obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob) if(user.environment_smash) - visible_message("\red [user] destroys the [src]. ") + visible_message("[user] destroys the [src]. ") for(var/atom/movable/A as mob|obj in src) A.loc = src.loc del(src) @@ -284,10 +284,7 @@ del(src) return - if(isrobot(user)) - return - - user.drop_item(src.loc) + user.drop_item(W, src.loc) else if(istype(W, /obj/item/weapon/packageWrap)) return @@ -366,7 +363,7 @@ set category = "Object" set name = "Toggle Open" - if(!usr.canmove || usr.stat || usr.restrained()) + if(!usr.canmove || usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) return if(ishuman(usr) || isMoMMI(usr)) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 58e7e490adf..37a9cad3f4e 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -80,7 +80,7 @@ user << "Unwield [F] first!" return fireaxe = O - user.drop_item(src) + user.drop_item(F, src) visible_message("[user] places [F] back into [src].", \ "You place [F] back into [src].") update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index c42b1c98758..0e6807dd269 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -172,6 +172,7 @@ new /obj/item/clothing/under/rank/mechanic(src) new /obj/item/clothing/shoes/white(src) new /obj/item/weapon/storage/toolbox/mechanical(src) + //new /obj/item/device/component_exchanger(src) new /obj/item/device/radio/headset/headset_engsci(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/device/device_analyser(src) @@ -199,4 +200,4 @@ New() ..() sleep(2) - new /obj/machinery/power/supermatter/shard(src) \ No newline at end of file + new /obj/machinery/power/supermatter/shard(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 1bce1fc56db..00055bea3d2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -136,7 +136,7 @@ set category = "Object" set name = "Toggle Lock" - if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain + if(!usr.canmove || usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) // Don't use it if you're not able to! Checks for stuns, ghost and restrain return if(get_dist(usr, src) != 1) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 01f9451af3c..5c0ceef419f 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -118,7 +118,7 @@ /obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob) health -= I.force - visible_message("\red [user] strikes [src] with [I].") + visible_message("[user] strikes [src] with [I].") if(health <= 0) for(var/mob/M in src) shatter(M) @@ -145,7 +145,7 @@ if (user) user.dust() dump_contents() - visible_message("\red [src] shatters!. ") + visible_message("[src] shatters!. ") del(src) /obj/structure/closet/statue/container_resist() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 87ecb362d8c..94b38439b15 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -461,14 +461,14 @@ user << "[src] is already rigged!" return user << "You rig [src]." - user.drop_item() + user.drop_item(W) del(W) rigged = 1 return else if(istype(W, /obj/item/device/radio/electropack)) if(rigged) user << "You attach [W] to [src]." - user.drop_item(src.loc) + user.drop_item(W, src.loc) return else if(istype(W, /obj/item/weapon/wirecutters)) if(rigged) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index cc90c15662e..046a4d03c1a 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -11,7 +11,7 @@ switch(state) if(0) if(istype(W, /obj/item/weapon/circuitboard/airlock) && W:icon_state != "door_electronics_smoked") - user.drop_item(src) + user.drop_item(W, src) circuit=W state++ playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) @@ -222,7 +222,7 @@ user << "It's locked, you can't put anything into it." else if(!occupant) user << "You insert \the [W] into \the [src], and it floats as the hoverfield activates." - user.drop_item(src) + user.drop_item(W, src) occupant=W update_icon() diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index a275f8ffa6d..62abe8a9484 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -222,7 +222,7 @@ busy = 1 playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") - user.drop_item(src) + user.drop_item(W, src) if(do_after(user, 40)) if(!src) return diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 26a90b8f093..5c1e4ad03a0 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -14,7 +14,7 @@ return if(istype(O, /obj/item/weapon/extinguisher)) if(!has_extinguisher && opened) - user.drop_item(src) + user.drop_item(O, src) has_extinguisher = O user << "You place [O] in [src]." else diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index cfa8c08327b..f6a2b015f75 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -146,13 +146,13 @@ /obj/structure/falsewall/attackby(obj/item/weapon/W as obj, mob/user as mob) if(opening) - user << "\red You must wait until the door has stopped moving." + user << "You must wait until the door has stopped moving." return if(density) var/turf/T = get_turf(src) if(T.density) - user << "\red The wall is blocked!" + user << "The wall is blocked!" return if(istype(W, /obj/item/weapon/screwdriver)) user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.") @@ -174,7 +174,7 @@ T.attackby(W,user) del(src) else - user << "\blue You can't reach, close it first!" + user << "You can't reach, close it first!" if( istype(W, /obj/item/weapon/pickaxe) ) var/obj/item/weapon/pickaxe/used_pick = W @@ -270,7 +270,7 @@ /obj/structure/falserwall/attackby(obj/item/weapon/W as obj, mob/user as mob) if(opening) - user << "\red You must wait until the door has stopped moving." + user << "You must wait until the door has stopped moving." return if(istype(W, /obj/item/weapon/screwdriver)) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 18d8ddc4afc..6afde3e1d44 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -91,7 +91,7 @@ user << "There is already something in the pot." else full = I - user.drop_item(src) + user.drop_item(I, src) full.loc = src user.visible_message("[user] stuffs something into the pot.","You stuff \the [full] into the [src].") @@ -225,3 +225,25 @@ /obj/structure/flora/ausbushes/fullgrass/New() ..() icon_state = "fullgrass_[rand(1, 3)]" + +//a rock is flora according to where the icon file is +//and now these defines +/obj/structure/flora/rock + name = "rock" + desc = "a rock" + icon_state = "rock1" + icon = 'icons/obj/flora/rocks.dmi' + anchored = 1 + +/obj/structure/flora/rock/New() + ..() + icon_state = "rock[rand(1,5)]" + +/obj/structure/flora/rock/pile + name = "rocks" + desc = "some rocks" + icon_state = "rockpile1" + +/obj/structure/flora/rock/pile/New() + ..() + icon_state = "rockpile[rand(1,5)]" \ No newline at end of file diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 61e55d8a73d..90715e809bb 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -250,7 +250,7 @@ else if(istype(W, /obj/item/pipe)) var/obj/item/pipe/P = W if(P.pipe_type in list(0, 1, 5)) //Simple pipes, simple bends, and simple manifolds. - user.drop_item(src.loc) + user.drop_item(P, src.loc) user.visible_message("[user] fits \the [P] into \the [src]", \ "You fit \the [P] into \the [src]") else diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 8d4fc060d9b..c054a1d23f9 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -192,17 +192,12 @@ "You place \a [WD] on \the [src].") return - else if(istype(W, /obj/item/weapon/shard)) - health -= W.force * 0.1 //Turns the base shard into a .5 damage item. If you want to break an electrified grille with that, you're going to EARN IT, ROD. BY. ROD. - healthcheck(hitsound = 1) - ..() //We need to call the rest of the attackby proc - return //Don't bother to go any further, we handled everything here switch(W.damtype) if("fire") health -= W.force //Fire-based tools like welding tools are ideal to work through small metal rods ! if("brute") health -= W.force * 0.5 //Rod matrices have an innate resistance to brute damage - shock(user, 70) //Alright let's have fun + shock(user, 100 * W.siemens_coefficient) //Chance of getting shocked is proportional to conductivity healthcheck(hitsound = 1) ..() return diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 01d8d004963..919e7ac3eea 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -43,7 +43,7 @@ /obj/structure/stool/bed/chair/vehicle/janicart/attackby(obj/item/W, mob/user) ..() if(istype(W, /obj/item/mecha_parts/janicart_upgrade) && !upgraded && !destroyed) - user.drop_item() + user.drop_item(W) del(W) user << "You upgrade the Pussy Wagon." upgraded = 1 @@ -51,7 +51,7 @@ icon_state = "pussywagon_upgraded" else if(istype(W, /obj/item/weapon/storage/bag/trash)) user << "You hook the trashbag onto the pimpin' ride." - user.drop_item(src) + user.drop_item(W, src) mybag = W /obj/structure/stool/bed/chair/vehicle/janicart/mop_act(obj/item/weapon/mop/M, mob/user) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 074ad11ff9e..cb515def0b8 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -79,10 +79,10 @@ if (src.destroyed) return else - usr << text("\blue You kick the lab cage.") + usr << text("You kick the lab cage.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << text("\red [] kicks the lab cage.", usr) + O << text("[] kicks the lab cage.", usr) src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 54e17adf801..486a30adcc7 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -78,7 +78,7 @@ if ((shattered) && (istype(I, /obj/item/stack/sheet/glass/glass))) var/obj/item/stack/sheet/glass/glass/stack = I if ((stack.amount - 2) < 0) - user << "\red You need more glass to do that." + user << "You need more glass to do that." else stack.use(2) shattered = 0 diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 7c542253ca8..d03142d679c 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -181,7 +181,7 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + B << text("[] stuffs [] into []!", user, O, src) return @@ -243,13 +243,13 @@ /obj/structure/crematorium/attack_hand(mob/user as mob) // if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH -// user.show_message("\red Uh-oh, that was a bad idea.", 1) +// user.show_message("Uh-oh, that was a bad idea.", 1) // //usr << "Uh-oh, that was a bad idea." // src:loc:poison += 20000000 // src:loc:firelevel = src:loc:poison // return if (cremating) - usr << "\red It's locked." + usr << "It's locked." return if ((src.connected) && (src.locked == 0)) for(var/atom/movable/A as mob|obj in src.connected.loc) @@ -319,18 +319,18 @@ if(contents.len <= 0) for (var/mob/M in viewers(src)) - M.show_message("\red You hear a hollow crackle.", 1) + M.show_message("You hear a hollow crackle.", 1) return else - var/inside = get_contents_in_object(src, /atom/movable) + var/inside = get_contents_in_object(src) if (locate(/obj/item/weapon/disk/nuclear) in inside) user << "You get the feeling that you shouldn't cremate one of the items in the cremator." return for (var/mob/M in viewers(src)) - M.show_message("\red You hear a roar as the crematorium activates.", 1) + M.show_message("You hear a roar as the crematorium activates.", 1) locked = 1 cremating = 1 @@ -406,7 +406,7 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + B << text("[] stuffs [] into []!", user, O, src) //Foreach goto(99) return diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 5920d088948..d00c5d42b7a 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -429,20 +429,20 @@ if (istype(O, /obj/item/weapon/wrench)) if (anchored) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to loosen \the [src]'s casters..." + user << "You begin to loosen \the [src]'s casters..." if (do_after(user, 40)) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ - "\blue You have loosened \the [src]. Now it can be pulled somewhere else.", \ + "You have loosened \the [src]. Now it can be pulled somewhere else.", \ "You hear ratchet.") src.anchored = 0 else playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to tighten \the [src] to the floor..." + user << "You begin to tighten \the [src] to the floor..." if (do_after(user, 20)) user.visible_message( \ "[user] tightens \the [src]'s casters.", \ - "\blue You have tightened \the [src]'s casters. Now it can be played again.", \ + "You have tightened \the [src]'s casters. Now it can be played again.", \ "You hear ratchet.") src.anchored = 1 else diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index f6ee82006c9..bc60c43d022 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -22,7 +22,7 @@ if(notices < 5) O.add_fingerprint(user) add_fingerprint(user) - user.drop_item(src) + user.drop_item(O,src) notices++ icon_state = "nboard0[notices]" //update sprite user << "You pin the paper to the noticeboard." diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 96397976a2a..318ae2516e1 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -151,7 +151,7 @@ FLOOR SAFES if(open) if(I.w_class + space <= maxspace) space += I.w_class - user.drop_item(src) + user.drop_item(I, src) user << "You put [I] in [src]." updateUsrDialog() return diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index feb1a52cf12..d16aa2d3d30 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -61,12 +61,12 @@ if(buckled_mob.buckled == src) if(buckled_mob != user) buckled_mob.visible_message(\ - "\blue [buckled_mob.name] was unbuckled by [user.name]!",\ + "[buckled_mob.name] was unbuckled by [user.name]!",\ "You were unbuckled from [src] by [user.name].",\ "You hear metal clanking") else buckled_mob.visible_message(\ - "\blue [buckled_mob.name] unbuckled \himself!",\ + "[buckled_mob.name] unbuckled \himself!",\ "You unbuckle yourself from [src].",\ "You hear metal clanking") unbuckle() diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 5ab4794ca4c..245f4f4556e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -19,7 +19,7 @@ if(!SK.status) user << "[SK] is not ready to be attached!" return - user.drop_item() + user.drop_item(W) var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) E.dir = dir @@ -86,7 +86,7 @@ return if(!config.ghost_interaction && !blessed) - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) return spin() @@ -102,13 +102,13 @@ if(!M.weakened) //Spam prevention if(M == usr) M.visible_message(\ - "\blue [M.name] has no butt, and slides right out of [src]!",\ + "[M.name] has no butt, and slides right out of [src]!",\ "Having no butt, you slide right out of the [src]",\ "You hear metal clanking") else M.visible_message(\ - "\blue [M.name] has no butt, and slides right out of [src]!",\ + "[M.name] has no butt, and slides right out of [src]!",\ "Having no butt, you slide right out of the [src]",\ "You hear metal clanking") diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 0cf98438c4f..d3ec7454b18 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -55,7 +55,7 @@ S.origin = src src.loc = S H.put_in_hands(S) - H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") + H.visible_message("[H] grabs [src] from the floor!", "You grab [src] from the floor!") /obj/item/weapon/stool name = "stool" @@ -72,12 +72,12 @@ if(origin) origin.loc = get_turf(src) user.u_equip(src) - user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.") + user.visible_message("[user] puts [src] down.", "You put [src] down.") del src /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob) if (prob(5) && istype(M,/mob/living)) - user.visible_message("\red [user] breaks [src] over [M]'s back!.") + user.visible_message("[user] breaks [src] over [M]'s back!.") user.u_equip(src) if(!istype(origin,/obj/structure/stool/hologram)) var/obj/item/stack/sheet/metal/MM = getFromPool(/obj/item/stack/sheet/metal, get_turf(src)) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 967b350567d..2d6f0c592e8 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -343,15 +343,15 @@ if(user.a_intent == I_HURT) if (prob(15)) M.Weaken(5) M.apply_damage(8,def_zone = "head") - visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!") + visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 50, 1) else - user << "\red You need a better grip to do that!" + user << "You need a better grip to do that!" return else G.affecting.loc = src.loc G.affecting.Weaken(5) - visible_message("\red [G.assailant] puts [G.affecting] on \the [src].") + visible_message("[G.assailant] puts [G.affecting] on \the [src].") del(W) return @@ -363,9 +363,6 @@ destroy() return - if(isrobot(user)) - return - if(istype(W, /obj/item/weapon/melee/energy/blade)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) @@ -373,10 +370,10 @@ playsound(get_turf(src), 'sound/weapons/blade1.ogg', 50, 1) playsound(get_turf(src), "sparks", 50, 1) for(var/mob/O in viewers(user, 4)) - O.show_message("\blue The [src] was sliced apart by [user]!", 1, "\red You hear [src] coming apart.", 2) + O.show_message("The [src] was sliced apart by [user]!", 1, "You hear [src] coming apart.", 2) destroy() - if(user.drop_item(src.loc)) + if(user.drop_item(W, src.loc)) if(W.loc == src.loc && params_list.len) var/clamp_x = clicked.Width() / 2 var/clamp_y = clicked.Height() / 2 @@ -545,18 +542,18 @@ return ..() if(WT.remove_fuel(0, user)) if(src.status == 2) - user << "\blue Now weakening the reinforced table" + user << "Now weakening the reinforced table" playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50)) if(!src || !WT.isOn()) return - user << "\blue Table weakened" + user << "Table weakened" src.status = 1 else - user << "\blue Now strengthening the reinforced table" + user << "Now strengthening the reinforced table" playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50)) if(!src || !WT.isOn()) return - user << "\blue Table strengthened" + user << "Table strengthened" src.status = 2 return return @@ -612,7 +609,7 @@ return if(isrobot(user)) return - user.drop_item() + user.drop_item(O) if (O.loc != src.loc) step(O, get_dir(O, src)) return @@ -625,7 +622,7 @@ return if(isrobot(user)) return - user.drop_item(src.loc) + user.drop_item(W, src.loc) return 1 /obj/structure/rack/meteorhit(obj/O as obj) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 92fbcec299c..f3a4ea713b1 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -55,7 +55,7 @@ /obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic)) if(oxygentanks < 10) - user.drop_item(src) + user.drop_item(I, src) oxytanks.Add(I) oxygentanks++ user << "You put [I] in [src]." @@ -65,7 +65,7 @@ return if(istype(I, /obj/item/weapon/tank/plasma)) if(plasmatanks < 10) - user.drop_item(src) + user.drop_item(I, src) platanks.Add(I) plasmatanks++ user << "You put [I] in [src]." diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 27dc912d8e9..9784da2f427 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -27,7 +27,7 @@ if(istype(W, /obj/item/target)) density = 0 W.density = 1 - user.drop_item(src.loc) + user.drop_item(W, src.loc) W.layer = 3.1 pinned_target = W user << "You slide the target into the stake." diff --git a/code/game/objects/structures/vehicles/vehicle.dm b/code/game/objects/structures/vehicles/vehicle.dm index df76f9f16aa..43bb4078ce9 100644 --- a/code/game/objects/structures/vehicles/vehicle.dm +++ b/code/game/objects/structures/vehicles/vehicle.dm @@ -184,7 +184,7 @@ /* The cart has very grippy tires and or magnets to keep it from slipping when on a good surface //Check to see if we slipped if(prob(Process_Spaceslipping(5))) - src << "\blue You slipped!" + src << "You slipped!" src.inertia_dir = src.last_move step(src, src.inertia_dir) return 0 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e52b95b8147..2a35f73c0ab 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -1,4 +1,6 @@ //todo: toothbrushes, and some sort of "toilet-filthinator" for the hos +#define NORODS 0 +#define RODSADDED 1 /obj/structure/toilet name = "toilet" @@ -7,6 +9,7 @@ icon_state = "toilet00" density = 0 anchored = 1 + var/state = 0 //1 if rods added; 0 if not var/open = 0 //if the lid is up var/cistern = 0 //if the cistern bit is open var/w_items = 0 //the combined w_class of all the items in the cistern @@ -44,6 +47,20 @@ icon_state = "toilet[open][cistern]" /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) + if(open && cistern && state == NORODS && istype(I,/obj/item/stack/rods)) //State = 0 if no rods + var/obj/item/stack/rods/R = I + if(R.amount < 2) return + user << "You add the rods to the toilet, creating flood avenues." + R.use(2) + state = RODSADDED //State 0 -> 1 + return + if(open && cistern && state == RODSADDED && istype(I,/obj/item/weapon/paper)) //State = 1 if rods are added + user << "You create a filter with the paper and insert it." + var/obj/structure/centrifuge/C = new /obj/structure/centrifuge(src.loc) + C.dir = src.dir + qdel(I) + qdel(src) + return if(istype(I, /obj/item/weapon/crowbar)) user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]." playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) @@ -84,7 +101,7 @@ if(w_items + I.w_class > 5) user << "The cistern is full." return - user.drop_item(src) + user.drop_item(I, src) w_items += I.w_class user << "You carefully place \the [I] into the cistern." return @@ -346,10 +363,10 @@ return if(busy) - M << "\red Someone's already washing here." + M << "Someone's already washing here." return - usr << "\blue You start washing your hands." + usr << "You start washing your hands." busy = 1 sleep(40) @@ -361,7 +378,7 @@ if(ishuman(M)) M:update_inv_gloves() for(var/mob/V in viewers(src, null)) - V.show_message("\blue [M] washes their hands using \the [src].") + V.show_message("[M] washes their hands using \the [src].") /obj/structure/sink/mop_act(obj/item/weapon/mop/M, mob/user) if(busy) return 1 @@ -380,7 +397,7 @@ /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) - user << "\red Someone's already washing here." + user << "Someone's already washing here." return if(istype(O, /obj/item/weapon/mop)) return @@ -388,7 +405,7 @@ if (istype(O, /obj/item/weapon/reagent_containers)) var/obj/item/weapon/reagent_containers/RG = O RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - user.visible_message("\blue [user] fills the [RG] using \the [src].","\blue You fill the [RG] using \the [src].") + user.visible_message("[user] fills the [RG] using \the [src].","You fill the [RG] using \the [src].") return else if (istype(O, /obj/item/weapon/melee/baton)) @@ -405,7 +422,7 @@ B.deductcharge(1) user.visible_message( \ "[user] was stunned by his wet [O].", \ - "\red You have wet \the [O], it shocks you!") + "You have wet \the [O], it shocks you!") return var/turf/location = user.loc @@ -414,7 +431,7 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - usr << "\blue You start washing \the [I]." + usr << "You start washing \the [I]." busy = 1 sleep(40) @@ -426,8 +443,8 @@ O.clean_blood() user.visible_message( \ - "\blue [user] washes \a [I] using \the [src].", \ - "\blue You wash \a [I] using \the [src].") + "[user] washes \a [I] using \the [src].", \ + "You wash \a [I] using \the [src].") /obj/structure/sink/kitchen diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 145a7afa550..5dd4c2e699f 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -173,7 +173,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src) return - user.drop_item(src) + user.drop_item(W, src) user << "You've installed the airlock electronics!" src.name = "Near finished Windoor Assembly" src.electronics = W diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7e2395a8de3..96b5caf03da 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -237,8 +237,8 @@ visible_message("\The [user] slams \the [M] into \the [src]!", \ "You slam \the [M] into \the [src]!") if(GRAB_NECK to GRAB_KILL) - M.Weaken(5) //Almost certainly shoved head or face-first, you're going to need a bit for the lights to come back on - M.apply_damage(30) //That got to fucking hurt, you were basically flung into a window, most likely a shattered one at that + M.Weaken(3) //Almost certainly shoved head or face-first, you're going to need a bit for the lights to come back on + M.apply_damage(20) //That got to fucking hurt, you were basically flung into a window, most likely a shattered one at that health -= 20 //Window won't like that visible_message("\The [user] crushes \the [M] into \the [src]!", \ "You crush \the [M] into \the [src]!") diff --git a/code/game/response_team.dm b/code/game/response_team.dm index e9900cf6006..1c22919fb62 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -13,16 +13,16 @@ var/can_call_ert set desc = "Send an emergency response team to the station" if(!holder) - usr << "\red Only administrators may use this command." + usr << "Only administrators may use this command." return if(!ticker) - usr << "\red The game hasn't started yet!" + usr << "The game hasn't started yet!" return if(ticker.current_state == 1) - usr << "\red The round hasn't started yet!" + usr << "The round hasn't started yet!" return if(send_emergency_team) - usr << "\red Central Command has already dispatched an emergency response team!" + usr << "Central Command has already dispatched an emergency response team!" return if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes") return @@ -31,7 +31,7 @@ var/can_call_ert if("No") return if(send_emergency_team) - usr << "\red Looks like somebody beat you to it!" + usr << "Looks like somebody beat you to it!" return message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team.", 1) @@ -65,7 +65,7 @@ client/verb/JoinResponseTeam() new_commando.mind.key = usr.key new_commando.key = usr.key - new_commando << "\blue You are [!leader_selected?"a member":"the LEADER"] of an Emergency Response Team, a type of military division, under CentComm's service. There is a code red alert on [station_name()], you are tasked to go and fix the problem." + new_commando << "You are [!leader_selected?"a member":"the LEADER"] of an Emergency Response Team, a type of military division, under CentComm's service. There is a code red alert on [station_name()], you are tasked to go and fix the problem." new_commando << "You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready." if(!leader_selected) new_commando << "As member of the Emergency Response Team, you answer only to your leader and CentComm officials." @@ -157,7 +157,7 @@ proc/trigger_armed_response_team(var/force = 0) /client/proc/create_response_team(obj/spawn_location, leader_selected = 0, commando_name) - //usr << "\red ERT has been temporarily disabled. Talk to a coder." + //usr << "ERT has been temporarily disabled. Talk to a coder." //return var/mob/living/carbon/human/M = new(null) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 6b5ff0e9d82..a9ac1312fa0 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -502,7 +502,7 @@ var/list/mechtoys = list( if(I) account = get_card_account(I) else - usr << "\red Please wear an ID with an associated bank account." + usr << "Please wear an ID with an associated bank account." return else if(issilicon(usr)) idname = usr.real_name @@ -570,7 +570,7 @@ var/list/mechtoys = list( /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return if(..()) @@ -600,14 +600,14 @@ var/list/mechtoys = list( /obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag) && !hacked) - user << "\blue Special supplies unlocked." + user << "Special supplies unlocked." hacked = 1 return if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) getFromPool(/obj/item/weapon/shard, loc) var/obj/item/weapon/circuitboard/supplycomp/M = new /obj/item/weapon/circuitboard/supplycomp( A ) @@ -619,7 +619,7 @@ var/list/mechtoys = list( A.anchored = 1 del(src) else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) var/obj/item/weapon/circuitboard/supplycomp/M = new /obj/item/weapon/circuitboard/supplycomp( A ) if(can_order_contraband) @@ -724,7 +724,7 @@ var/list/mechtoys = list( if(I) account = get_card_account(I) else - usr << "\red Please wear an ID with an associated bank account." + usr << "Please wear an ID with an associated bank account." return else if(issilicon(usr)) idname = usr.real_name diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 268c07782de..5be17b9bd38 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -436,7 +436,7 @@ turf/simulated/floor/proc/update_icon() if(is_light_floor()) var/obj/item/stack/tile/light/T = floor_tile if(T.state) - user.drop_item() + user.drop_item(C) del(C) T.state = C //fixing it by bashing it with a light bulb, fun eh? update_icon() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 11d553fccae..9910c2f4838 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -306,6 +306,10 @@ O.density = 1 O.layer = 5 + var/cultwall = 0 + if(istype(src, /turf/simulated/wall/cult)) + cultwall = 1 + src.ChangeTurf(/turf/simulated/floor/plating) var/turf/simulated/floor/F = src @@ -316,7 +320,7 @@ qdel(O) return F.burn_tile() - F.icon_state = "wall_thermite" + F.icon_state = "[cultwall ? "cultwall_thermite" : "wall_thermite"]" var/pdiff = performWallPressureCheck(src.loc) if(pdiff) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e5a803f087a..bd3d6775fe1 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -557,4 +557,20 @@ //Return a lattice to allow plating building, return 0 for error message, return -1 for silent fail. /turf/proc/canBuildPlating() - return BUILD_SILENT_FAILURE \ No newline at end of file + return BUILD_SILENT_FAILURE + +///////////////////////////////////////////////////// + +/turf/proc/spawn_powerup() + spawn(5) + var/powerup = pick( + 50;/obj/structure/powerup/bombup, + 50;/obj/structure/powerup/fire, + 50;/obj/structure/powerup/skate, + 10;/obj/structure/powerup/kick, + 10;/obj/structure/powerup/line, + 10;/obj/structure/powerup/power, + 10;/obj/structure/powerup/skull, + 5;/obj/structure/powerup/full, + ) + new powerup(src) diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index 2e381f2d793..7478f1896eb 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -11,4 +11,11 @@ name = "engraved floor" icon_state = "cult" turf_animation('icons/effects/effects.dmi',"cultfloor",0,0,MOB_LAYER-1) - return \ No newline at end of file + return + +/turf/unsimulated/floor/grass + icon_state = "grass1" + +/turf/unsimulated/floor/grass/New() + ..() + icon_state = "grass[rand(1,4)]" \ No newline at end of file diff --git a/code/game/verbs/AI_status.dm b/code/game/verbs/AI_status.dm index 39cbc654835..87fcc6c687b 100644 --- a/code/game/verbs/AI_status.dm +++ b/code/game/verbs/AI_status.dm @@ -2,7 +2,7 @@ set category = "AI Commands" set name = "AI status" - if(usr.stat == 2) + if(usr.stat == 2 || (usr.status_flags & FAKEDEATH)) usr <<"You cannot change your emotional status because you are dead!" return var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Beer mug", "Dwarf", "Fishtank", "Plump Helmet") diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 314314d5b64..8f80876f9bf 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -3,7 +3,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return if(!mob) return @@ -15,18 +15,18 @@ if(!msg) return if(!(prefs.toggles & CHAT_OOC)) - src << "\red You have OOC muted." + src << "You have OOC muted." return if(!holder) if(!ooc_allowed) - src << "\red OOC is globally muted" + src << "OOC is globally muted" return if(!dooc_allowed && (mob.stat == DEAD)) - usr << "\red OOC for dead mobs has been turned off." + usr << "OOC for dead mobs has been turned off." return if(prefs.muted & MUTE_OOC) - src << "\red You cannot use OOC (muted)." + src << "You cannot use OOC (muted)." return if(handle_spam_prevention(msg,MUTE_OOC)) return @@ -91,7 +91,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return if(!mob) return @@ -103,18 +103,18 @@ if(!msg) return if(!(prefs.toggles & CHAT_LOOC)) - src << "\red You have LOOC muted." + src << "You have LOOC muted." return if(!holder) if(!ooc_allowed) - src << "\red LOOC is globally muted" + src << "LOOC is globally muted" return if(!dooc_allowed && (mob.stat == DEAD)) - usr << "\red LOOC for dead mobs has been turned off." + usr << "LOOC for dead mobs has been turned off." return if(prefs.muted & MUTE_OOC) - src << "\red You cannot use LOOC (muted)." + src << "You cannot use LOOC (muted)." return if(handle_spam_prevention(msg,MUTE_OOC)) return diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 0ad314c6020..225b233e9ba 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -81,10 +81,10 @@ return - viewers(src) << pick("\red [src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ - "\red [src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ - "\red [src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ - "\red [src] is holding \his breath! It looks like \he's trying to commit suicide.") + viewers(src) << pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ + "[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ + "[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ + "[src] is holding \his breath! It looks like \he's trying to commit suicide.") adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -107,7 +107,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(loc) << "\red [src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." + viewers(loc) << "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." spawn(50) death(0) suiciding = 0 @@ -135,7 +135,7 @@ return suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(src) << "\red [src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." + viewers(src) << "[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." adjustOxyLoss(max(175- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -154,7 +154,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -174,7 +174,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) stat = DEAD //new robot shit doesnt care about oxyloss @@ -190,7 +190,7 @@ card.removePersonality() var/turf/T = get_turf(card.loc) for (var/mob/M in viewers(T)) - M.show_message("\blue [src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "\blue [src] bleeps electronically.", 2) + M.show_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "[src] bleeps electronically.", 2) death(0) else src << "Aborting suicide attempt." @@ -210,7 +210,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is thrashing wildly! It looks like \he's trying to commit suicide." + viewers(src) << "[src] is thrashing wildly! It looks like \he's trying to commit suicide." //put em at -175 adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() diff --git a/code/global.dm b/code/global.dm index 6d86577995b..5f22c3177cb 100644 --- a/code/global.dm +++ b/code/global.dm @@ -125,7 +125,7 @@ var/diaryofmeanpeople = null var/admin_diary = null var/href_logfile = null var/station_name = null -var/game_version = "adsfasdfasdf" +var/game_version = "veegee" var/changelog_hash = "" var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) @@ -357,4 +357,12 @@ var/global/datum/gas_mixture/space_gas = new var/global/obj/item/device/radio/intercom/universe/announcement_intercom = new //used by jump-to-area etc. Updated by area/updateName() -var/list/sortedAreas = list() \ No newline at end of file +var/list/sortedAreas = list() + +var/global/bomberman_mode = 0 +var/global/bomberman_hurt = 0 +var/global/bomberman_destroy = 0 + +var/global/list/volunteer_gladiators = list() +var/global/list/ready_gladiators = list() +var/global/list/never_gladiators = list() diff --git a/code/libs/Get Flat Icon/Get Flat Icon.dm b/code/libs/Get Flat Icon/Get Flat Icon.dm index 8256433b846..d2cb8d7f83d 100644 --- a/code/libs/Get Flat Icon/Get Flat Icon.dm +++ b/code/libs/Get Flat Icon/Get Flat Icon.dm @@ -34,6 +34,7 @@ var/list/directional = list( /obj/machinery/light, /obj/machinery/door/airlock/multi_tile, /obj/machinery/camera, + /obj/structure/bomberflame, ) var/list/exception = list( diff --git a/code/modules/Economy/Accounts.dm b/code/modules/Economy/Accounts.dm index 72d3da0a2c9..dd8508c9918 100644 --- a/code/modules/Economy/Accounts.dm +++ b/code/modules/Economy/Accounts.dm @@ -9,19 +9,18 @@ var/global/list/all_money_accounts = list() /proc/create_station_account() if(!station_account) - next_account_number = rand(111111, 999999) - + next_account_number = rand(11111, 99999) station_account = new() station_account.owner_name = "[station_name()] Station Account" - station_account.account_number = rand(111111, 999999) - station_account.remote_access_pin = rand(1111, 111111) - station_account.money = 75000 + station_account.account_number = rand(11111, 99999) + station_account.remote_access_pin = rand(1111, 9999) + station_account.money = 5000 //create an entry in the account transaction log for when it was created var/datum/transaction/T = new() T.target_name = station_account.owner_name T.purpose = "Account creation" - T.amount = 75000 + T.amount = 5000 T.date = "2nd April, [game_year]" T.time = "11:24" T.source_terminal = "Biesel GalaxyNet Terminal #277" @@ -35,8 +34,8 @@ var/global/list/all_money_accounts = list() var/datum/money_account/department_account = new() department_account.owner_name = "[department] Account" - department_account.account_number = rand(111111, 999999) - department_account.remote_access_pin = rand(1111, 111111) + department_account.account_number = rand(11111, 99999) + department_account.remote_access_pin = rand(1111, 9999) department_account.money = 5000 //create an entry in the account transaction log for when it was created @@ -62,7 +61,7 @@ var/global/list/all_money_accounts = list() //create a new account var/datum/money_account/M = new() M.owner_name = new_owner_name - M.remote_access_pin = rand(1111, 111111) + M.remote_access_pin = rand(1111, 9999) M.money = starting_funds //create an entry in the account transaction log for when it was created @@ -77,7 +76,7 @@ var/global/list/all_money_accounts = list() T.time = "[rand(0,24)]:[rand(11,59)]" //prompting everyone to get a new account one day prior. T.source_terminal = "NTGalaxyNet Terminal #[rand(111,1111)]" //The point being to partly to justify the transaction history being empty at the beginning of the round. - M.account_number = rand(111111, 999999) + M.account_number = rand(11111, 99999) else T.date = current_date_string T.time = worldtime2text() @@ -220,8 +219,9 @@ var/global/list/all_money_accounts = list() Holder name:
- Initial funds: (subtracted from station account)
+ Initial funds: (subtracted from station account.)
New accounts are automatically assigned a secret number and pin, which are printed separately in a sealed package.
+ Ensure that the station account has enough money to create the account, or it will not be created
"} // END AUTOFIX @@ -233,7 +233,7 @@ var/global/list/all_money_accounts = list() dat += {"
Return to accounts list
Account number: #[detailed_account_view.account_number]
- Account holder: [detailed_account_view.owner_name]
+ Account holder:< /b> [detailed_account_view.owner_name]
Account balance: $[detailed_account_view.money]