From 722abccdf25d5ed131debe396d97ea28b69a7a34 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 24 Mar 2020 20:41:49 -0700 Subject: [PATCH] k --- code/game/machinery/vending.dm | 9 +- code/game/objects/items/stacks/stack.dm | 6 - code/game/objects/structures/gravemarker.dm | 10 +- code/game/objects/structures/musician.dm | 22 +--- .../structures/stool_bed_chair_nest/chairs.dm | 7 +- code/game/verbs/ooc.dm | 14 +-- code/game/verbs/who.dm | 7 +- code/modules/admin/admin_investigate.dm | 14 --- code/modules/admin/admin_verbs.dm | 47 +------- code/modules/admin/verbs/getlogs.dm | 104 ------------------ code/modules/admin/verbs/randomverbs.dm | 11 +- code/modules/client/client_procs.dm | 7 +- code/modules/clothing/suits/aliens/seromi.dm | 12 -- code/modules/clothing/under/xenos/seromi.dm | 5 - code/modules/food/drinkingglass/metaglass.dm | 4 +- code/modules/food/food/snacks.dm | 13 --- code/modules/mob/emote.dm | 7 +- code/modules/mob/login.dm | 3 - .../security levels/security levels.dm | 4 - 19 files changed, 21 insertions(+), 285 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1c510e1fb17..cab65190b09 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -806,11 +806,7 @@ prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit, -======= - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, ->>>>>>> citrp/master /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 5, /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, @@ -1157,7 +1153,6 @@ /obj/item/toy/plushie/face_hugger = 50, /obj/item/toy/plushie/carp = 50, /obj/item/toy/plushie/deer = 50, -<<<<<<< HEAD /obj/item/toy/plushie/tabby_cat = 50) /obj/machinery/vending/fishing @@ -1177,6 +1172,4 @@ /obj/item/stack/cable_coil/random = 4) premium = list(/obj/item/weapon/storage/box/wormcan/deluxe = 1) contraband = list(/obj/item/weapon/storage/box/wormcan/deluxe = 1) -======= - /obj/item/toy/plushie/tabby_cat = 50) ->>>>>>> citrp/master + diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 1de1628936d..de27517a7f7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -24,14 +24,9 @@ var/list/datum/matter_synth/synths = null var/no_variants = TRUE // Determines whether the item should update it's sprites based on amount. -<<<<<<< HEAD var/pass_color = FALSE // Will the item pass its own color var to the created item? Dyed cloth, wood, etc. var/strict_color_stacking = FALSE // Will the stack merge with other stacks that are different colors? (Dyed cloth, wood, etc) -/obj/item/stack/New(var/loc, var/amount=null) - ..() - if (!stacktype) -======= /obj/item/stack/Initialize(mapload, new_amount, merge = TRUE) if(new_amount != null) amount = new_amount @@ -41,7 +36,6 @@ amount -= max_amount new type(loc, max_amount, FALSE) if(!stacktype) ->>>>>>> citrp/master stacktype = type . = ..() if(merge) diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index ab515830b2c..b1259aed66f 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -119,18 +119,12 @@ if(anchored) return -<<<<<<< HEAD if(!usr || !isturf(usr.loc)) return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) -======= - if(config_legacy.ghost_interaction) - src.setDir(turn(src.dir, 90)) ->>>>>>> citrp/master + if(ismouse(usr) || (isobserver(usr) && !config_legacy.ghost_interaction)) return - src.setDir(turn(src.dir, 270)) - return \ No newline at end of file + setDir(turn(src.dir, 270)) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 6267c24e21a..6068c6cfdd1 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -1,13 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 #define MUSICIAN_HEARCHECK_MINDELAY 4 -<<<<<<< HEAD -#define INSTRUMENT_MAX_LINE_LENGTH 50 -#define INSTRUMENT_MAX_LINE_NUMBER 300 -======= #define INSTRUMENT_MAX_LINE_LENGTH 300 #define INSTRUMENT_MAX_LINE_NUMBER 500 ->>>>>>> citrp/master /datum/song var/name = "Untitled" @@ -220,11 +215,7 @@ var/linenum = 1 for(var/l in lines) if(length(l) > INSTRUMENT_MAX_LINE_LENGTH) -<<<<<<< HEAD to_chat(usr, "Line [linenum] too long!") -======= - usr << "Line [linenum] too long!" ->>>>>>> citrp/master lines.Remove(l) else linenum++ @@ -334,18 +325,9 @@ return if(!usr || !isturf(usr.loc) || usr.stat || usr.restrained()) return -<<<<<<< HEAD - if (isobserver(usr) && !config.ghost_interaction) -======= - else if(usr.stat || usr.restrained()) + if (isobserver(usr) && !config_legacy.ghost_interaction) return - else if (istype(usr,/mob/observer/ghost) && !config_legacy.ghost_interaction) - return - else - src.setDir(turn(src.dir, 90)) ->>>>>>> citrp/master - return - src.setDir(turn(src.dir, 270)) + setDir(turn(src.dir, 270)) /obj/structure/device/piano/attack_hand(mob/user) if(!user.IsAdvancedToolUser()) 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 4b397990767..cfc27185c34 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -73,16 +73,11 @@ set category = "Object" set src in oview(1) -<<<<<<< HEAD if(!usr || !isturf(usr.loc)) -======= - if(config_legacy.ghost_interaction) - src.setDir(turn(src.dir, 90)) ->>>>>>> citrp/master return if(usr.stat || usr.restrained()) return - if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + if(ismouse(usr) || (isobserver(usr) && !config_legacy.ghost_interaction)) return src.setDir(turn(src.dir, 270)) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index d9fced5220a..3ec799c4008 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -20,13 +20,8 @@ return if(!holder) -<<<<<<< HEAD - if(!config.ooc_allowed) - to_chat(src, "OOC is globally muted.") -======= if(!config_legacy.ooc_allowed) - src << "OOC is globally muted." ->>>>>>> citrp/master + to_chat(src, "OOC is globally muted.") return if(!config_legacy.dooc_allowed && (mob.stat == DEAD)) usr << "OOC for dead mobs has been turned off." @@ -103,13 +98,8 @@ return if(!holder) -<<<<<<< HEAD - if(!config.looc_allowed) - to_chat(src, "LOOC is globally muted.") -======= if(!config_legacy.looc_allowed) - src << "LOOC is globally muted." ->>>>>>> citrp/master + to_chat(src, "LOOC is globally muted.") return if(!config_legacy.dooc_allowed && (mob.stat == DEAD)) usr << "OOC for dead mobs has been turned off." diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 1dea848b730..d9f6e18eeb3 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -170,13 +170,8 @@ eventMmsg += "\t[C] is a [C.holder.rank]\n" num_event_managers_online++ -<<<<<<< HEAD - if(config.admin_irc) - to_chat(src, "Adminhelps are also sent to IRC. If no admins are available in game try anyway and an admin on IRC may see it and respond.") -======= if(config_legacy.admin_irc) - src << "Adminhelps are also sent to IRC. If no admins are available in game try anyway and an admin on IRC may see it and respond." ->>>>>>> citrp/master + to_chat(src, "Adminhelps are also sent to IRC. If no admins are available in game try anyway and an admin on IRC may see it and respond.") msg = "Current Admins ([num_admins_online]):\n" + msg if(config_legacy.show_mods) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index ce857d6d29f..6cb5724beb1 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -37,17 +37,3 @@ to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") return src << browse(F,"window=investigate[subject];size=800x300") -<<<<<<< HEAD - - if("hrefs") //persistant logs and stuff - if(config && config.log_hrefs) - if(href_logfile) - src << browse(href_logfile,"window=investigate[subject];size=800x300") - else - to_chat(src, "Error: admin_investigate: No href logfile found.") - return - else - to_chat(src, "Error: admin_investigate: Href Logging is not on.") - return -======= ->>>>>>> citrp/master diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4b7a3a9abc5..eec358e20a1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -836,21 +836,6 @@ var/list/admin_verbs_event_manager = list( verbs |= /client/proc/readmin_self feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -<<<<<<< HEAD -/client/proc/toggle_log_hrefs() - set name = "Toggle href logging" - set category = "Server" - if(!holder) return - if(config) - if(config.log_hrefs) - config.log_hrefs = 0 - to_chat(src, "Stopped logging hrefs") - else - config.log_hrefs = 1 - to_chat(src, "Started logging hrefs") - -======= ->>>>>>> citrp/master /client/proc/check_ai_laws() set name = "Check AI Laws" set category = "Admin" @@ -1042,23 +1027,13 @@ var/list/admin_verbs_event_manager = list( set category = "Server" if(!holder) return if(config) -<<<<<<< HEAD - if(config.cult_ghostwriter) - config.cult_ghostwriter = 0 + if(config_legacy.cult_ghostwriter) + config_legacy.cult_ghostwriter = 0 to_chat(src, "Disallowed ghost writers.") message_admins("Admin [key_name_admin(usr)] has disabled ghost writers.", 1) - else - config.cult_ghostwriter = 1 - to_chat(src, "Enabled ghost writers.") -======= - if(config_legacy.cult_ghostwriter) - config_legacy.cult_ghostwriter = 0 - src << "Disallowed ghost writers." - message_admins("Admin [key_name_admin(usr)] has disabled ghost writers.", 1) else config_legacy.cult_ghostwriter = 1 - src << "Enabled ghost writers." ->>>>>>> citrp/master + to_chat(src, "Enabled ghost writers.") message_admins("Admin [key_name_admin(usr)] has enabled ghost writers.", 1) /client/proc/toggledrones() @@ -1066,23 +1041,13 @@ var/list/admin_verbs_event_manager = list( set category = "Server" if(!holder) return if(config) -<<<<<<< HEAD - if(config.allow_drone_spawn) - config.allow_drone_spawn = 0 + if(config_legacy.allow_drone_spawn) + config_legacy.allow_drone_spawn = 0 to_chat(src, "Disallowed maint drones.") message_admins("Admin [key_name_admin(usr)] has disabled maint drones.", 1) - else - config.allow_drone_spawn = 1 - to_chat(src, "Enabled maint drones.") -======= - if(config_legacy.allow_drone_spawn) - config_legacy.allow_drone_spawn = 0 - src << "Disallowed maint drones." - message_admins("Admin [key_name_admin(usr)] has disabled maint drones.", 1) else config_legacy.allow_drone_spawn = 1 - src << "Enabled maint drones." ->>>>>>> citrp/master + to_chat(src, "Enabled maint drones.") message_admins("Admin [key_name_admin(usr)] has enabled maint drones.", 1) /client/proc/man_up(mob/T as mob in mob_list) diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index 17bdf83f196..4ac953e26c5 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -1,62 +1,3 @@ -<<<<<<< HEAD -/* - HOW DO I LOG RUNTIMES? - Firstly, start dreamdeamon if it isn't already running. Then select "world>Log Session" (or press the F3 key) - navigate the popup window to the data/logs/runtime/ folder from where your tgstation .dmb is located. - (you may have to make this folder yourself) - - OPTIONAL: you can select the little checkbox down the bottom to make dreamdeamon save the log everytime you - start a world. Just remember to repeat these steps with a new name when you update to a new revision! - - Save it with the name of the revision your server uses (e.g. r3459.txt). - Game Masters will now be able to grant access any runtime logs you have archived this way! - This will allow us to gather information on bugs across multiple servers and make maintaining the TG - codebase for the entire /TG/station commuity a TONNE easier :3 Thanks for your help! -*/ - - -//This proc allows Game Masters to grant a client access to the .getruntimelog verb -//Permissions expire at the end of each round. -//Runtimes can be used to meta or spot game-crashing exploits so it's advised to only grant coders that -//you trust access. Also, it may be wise to ensure that they are not going to play in the current round. -/client/proc/giveruntimelog() - set name = ".giveruntimelog" - set desc = "Give somebody access to any session logfiles saved to the /log/runtime/ folder." - set category = null - - if(!src.holder) - to_chat(src, "Only Admins may use this command.") - return - - var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in GLOB.clients - if(!istype(target,/client)) - to_chat(src, "Error: giveruntimelog(): Client not found.") - return - - target.verbs |= /client/proc/getruntimelog - target << "You have been granted access to runtime logs. Please use them responsibly or risk being banned." - return - - -//This proc allows download of runtime logs saved within the data/logs/ folder by dreamdeamon. -//It works similarly to show-server-log. -/client/proc/getruntimelog() - set name = ".getruntimelog" - set desc = "Retrieve any session logfiles saved by dreamdeamon." - set category = null - - var/path = browse_files("data/logs/runtime/") - if(!path) - return - - if(file_spam_check()) - return - - message_admins("[key_name_admin(src)] accessed file: [path]") - src << run( file(path) ) - to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - return -======= //This proc allows download of past server logs saved within the data/logs/ folder. /client/proc/getserverlogs() set name = "Get Server Logs" @@ -64,7 +5,6 @@ set category = "Admin" browseserverlogs() ->>>>>>> citrp/master /client/proc/getcurrentlogs() set name = "Get Current Logs" @@ -82,49 +22,6 @@ return message_admins("[key_name_admin(src)] accessed file: [path]") -<<<<<<< HEAD - src << run( file(path) ) - to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - return - - -//Other log stuff put here for the sake of organisation - -//Shows today's server log -/datum/admins/proc/view_txt_log() - set category = "Admin" - set name = "Show Server Log" - set desc = "Shows today's server log." - - var/path = "[log_path].log" - if( fexists(path) ) - src << run( file(path) ) - else - to_chat(src, "Error: view_txt_log(): File not found/Invalid path([path]).") - return - feedback_add_details("admin_verb","VTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - -//Shows today's attack log -/datum/admins/proc/view_atk_log() - set category = "Admin" - set name = "Show Server Attack Log" - set desc = "Shows today's server attack log." - - to_chat(usr,"This verb doesn't actually do anything.") - - /* - var/path = "data/logs/[time2text(world.realtime,"YYYY/MM-Month/DD-Day")] Attack.log" - if( fexists(path) ) - src << run( file(path) ) - else - to_chat(src, "Error: view_atk_log(): File not found/Invalid path([path]).") - return - usr << run( file(path) ) - feedback_add_details("admin_verb","SSAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - */ -======= switch(alert("View (in game), Open (in your system's text editor), or Download?", path, "View", "Open", "Download")) if ("View") src << browse("
[html_encode(file2text(file(path)))]
", list2params(list("window" = "viewfile.[path]"))) @@ -135,4 +32,3 @@ else return to_chat(src, "Attempting to send [path], this may take a fair few minutes if the file is very large.") ->>>>>>> citrp/master diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 98e25f43396..bf456d6d05a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -305,13 +305,8 @@ Ccomp's first proc. g.antagHUD = 0 // Disable it on those that have it enabled g.has_enabled_antagHUD = 2 // We'll allow them to respawn g << "The Administrator has disabled AntagHUD " -<<<<<<< HEAD - config.antag_hud_allowed = 0 - to_chat(src, "AntagHUD usage has been disabled") -======= config_legacy.antag_hud_allowed = 0 - src << "AntagHUD usage has been disabled" ->>>>>>> citrp/master + to_chat(src, "AntagHUD usage has been disabled") action = "disabled" else for(var/mob/observer/dead/g in get_ghosts()) @@ -340,7 +335,7 @@ Ccomp's first proc. g << "The administrator has lifted restrictions on joining the round if you use AntagHUD" action = "lifted restrictions" <<<<<<< HEAD - config.antag_hud_restricted = 0 + config_legacy.antag_hud_restricted = 0 to_chat(src, "AntagHUD restrictions have been lifted") ======= config_legacy.antag_hud_restricted = 0 @@ -354,7 +349,7 @@ Ccomp's first proc. g.has_enabled_antagHUD = 0 action = "placed restrictions" <<<<<<< HEAD - config.antag_hud_restricted = 1 + config_legacy.antag_hud_restricted = 1 to_chat(src, "AntagHUD restrictions have been enabled") ======= config_legacy.antag_hud_restricted = 1 diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index cf30f372a93..0e0b9f938e4 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -107,13 +107,8 @@ void.MakeGreed() screen += void -<<<<<<< HEAD - if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. - to_chat(src, "You have unread updates in the changelog.") -======= if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates. - src << "You have unread updates in the changelog." ->>>>>>> citrp/master + to_chat(src, "You have unread updates in the changelog.") winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") if(config_legacy.aggressive_changelog) src.changes() diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/seromi.dm index a550449336c..679aa8aeed9 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/seromi.dm @@ -222,13 +222,8 @@ item_state = "tesh_cloak_sec" /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm -<<<<<<< HEAD name = "quartermaster cloak" desc = "A soft Teshari cloak made for the Quartermaster" -======= - name = "Quartermaster's cloak" - desc = "A soft Teshari cloak made for the Quartermaster" ->>>>>>> citrp/master icon_state = "tesh_cloak_qm" item_state = "tesh_cloak_qm" @@ -239,14 +234,7 @@ item_state = "tesh_cloak_serv" /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa -<<<<<<< HEAD name = "internal affairs cloak" desc = "A soft Teshari cloak made for the Internal Affairs Agent" icon_state = "tesh_cloak_iaa" item_state = "tesh_cloak_iaa" -======= - name = "Iaa cloak" - desc = "A soft Teshari cloak made for the Internal Affairs Agent" - icon_state = "tesh_uniform_iaa" - item_state = "tesh_uniform_iaa" ->>>>>>> citrp/master diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm index d4981299916..8925fccba27 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/seromi.dm @@ -268,13 +268,8 @@ item_state = "tesh_uniform_sec" /obj/item/clothing/under/seromi/undercoat/jobs/qm -<<<<<<< HEAD name = "quartermaster undercoat" desc = "A traditional Teshari garb made for the Quartermaster" -======= - name = "Quartermaster's undercoat" - desc = "A traditional Teshari garb made for the Quartermaster" ->>>>>>> citrp/master icon_state = "tesh_uniform_qm" item_state = "tesh_uniform_qm" diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index fcc6943ff6b..615cf6f9ac4 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -547,11 +547,10 @@ Drinks Data glass_icon_state = "eggnog" glass_center_of_mass = list("x"=16, "y"=8) -<<<<<<< HEAD /datum/reagent/drink/cider glass_icon_state = "ciderglass" glass_center_of_mass = list("x"=16, "y"=8) -======= + /datum/reagent/ethanol/gibbfloat glass_icon_state = "gibbfloats" glass_center_of_mass = list("x"=16, "y"=8) @@ -599,4 +598,3 @@ Drinks Data /datum/reagent/ethanol/paloma glass_icon_state = "paloma" ->>>>>>> citrp/master diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 3c657d7439e..8d6ae43cb2a 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -717,7 +717,6 @@ reagents.add_reagent(toxin_type, toxin_amount) src.bitesize = 6 -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif desc = "A fillet of sivian fish meat." filling_color = "#2c2cff" @@ -734,9 +733,6 @@ toxin_amount = 1 /obj/item/weapon/reagent_containers/food/snacks/fishfingers -======= -/obj/item/weapon/reagent_containers/food/snacks/fishfingers // Buff 4 >> 9 ->>>>>>> citrp/master name = "Fish Fingers" desc = "A finger of fish." icon_state = "fishfingers" @@ -3394,7 +3390,6 @@ END CITADEL CHANGE */ /obj/item/weapon/reagent_containers/food/snacks/rawsticks/Initialize() . = ..() -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/liquidprotein name = "\improper LiquidProtein Ration" desc = "A variant of the liquidfood ration, designed for obligate carnivore species. Only barely more appealing than regular liquidfood. Should this be crunchy?" @@ -3403,16 +3398,8 @@ END CITADEL CHANGE */ filling_color = "#A8A8A8" survivalfood = TRUE center_of_mass = list("x"=16, "y"=15) -======= -/obj/item/weapon/reagent_containers/food/snacks/liquidfood // Buff 20 >> 30 - name = "\improper LiquidFood Ration" - desc = "A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy?" - icon_state = "liquidfood" - trash = /obj/item/trash/liquidfood - filling_color = "#A8A8A8" nutriment_amt = 22 nutriment_desc = list("chalk" = 6) ->>>>>>> citrp/master /obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize() ..() diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 2dce319c1d5..79e096cfdd4 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -70,13 +70,8 @@ return if(!src.client.holder) -<<<<<<< HEAD - if(!config.dsay_allowed) - to_chat(src, "Deadchat is globally muted.") -======= if(!config_legacy.dsay_allowed) - src << "Deadchat is globally muted." ->>>>>>> citrp/master + to_chat(src, "Deadchat is globally muted.") return diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 0099acf3f1f..4baacd05243 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -71,10 +71,7 @@ if(!client.tooltips) client.tooltips = new(client) -<<<<<<< HEAD var/turf/T = get_turf(src) if(isturf(T)) update_client_z(T.z) -======= ->>>>>>> citrp/master diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 76ea32c8f4c..20e7152f68a 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -69,11 +69,7 @@ if(CC) CC.post_status("alert", "redalert")*/ if(SEC_LEVEL_DELTA) -<<<<<<< HEAD security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta alert level reached!", new_sound = 'sound/effects/siren.ogg') -======= - security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta security level reached!", new_sound = 'sound/effects/siren.ogg') ->>>>>>> citrp/master security_level = SEC_LEVEL_DELTA var/newlevel = get_security_level()