diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 79d68aa3e5e..7e7aa262de5 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -72,7 +72,7 @@ GLOBAL_VAR(antag_prototypes) if (R.emagged) common_commands += "Unemag slaved cyborgs" break - common_commands += "Toggle exploitables override" //SKYRAT EDIT ADDITION -- EXPLOITABLES + common_commands += "Toggle exploitables override" //SKYRAT EDIT ADDITION -- EXPLOITABLES return common_commands /datum/mind/proc/get_special_statuses() diff --git a/modular_skyrat/master_files/code/modules/admin/admin.dm b/modular_skyrat/master_files/code/modules/admin/admin.dm index 91afc0def67..b063c6936ad 100644 --- a/modular_skyrat/master_files/code/modules/admin/admin.dm +++ b/modular_skyrat/master_files/code/modules/admin/admin.dm @@ -28,9 +28,9 @@ ADMIN_VERB(toggledchat, R_ADMIN, "Toggle Dead Chat", "Toggle dis bitch.", ADMIN_ /datum/admin_help/ClosureLinks(ref_src) . = ..() - . += " (HANDLE)" //SKYRAT EDIT ADDITION - . += " (PING MUTE)" //SKYRAT EDIT ADDITION - . += " (MHELP)" + . += " (HANDLE)" //SKYRAT EDIT ADDITION + . += " (PING MUTE)" //SKYRAT EDIT ADDITION + . += " (MHELP)" //Let the initiator know their ahelp is being handled /datum/admin_help/proc/handle_issue(key_name = key_name_admin(usr)) diff --git a/modular_skyrat/master_files/code/modules/client/preferences.dm b/modular_skyrat/master_files/code/modules/client/preferences.dm index 802e094427b..fc391799c97 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences.dm @@ -68,14 +68,14 @@ else if (SA.color_src == USE_ONE_COLOR) shown_colors = 1 if((allow_advanced_colors || SA.always_color_customizable) && shown_colors) - dat += "R" - dat += "[acc_name]" + dat += "R" + dat += "[acc_name]" if(allow_advanced_colors || SA.always_color_customizable) if(shown_colors) dat += "
" var/list/colorlist = mutant_bodyparts[key][MUTANT_INDEX_COLOR_LIST] for(var/i in 1 to shown_colors) - dat += " " + dat += " " return dat /datum/preferences/proc/reset_colors() diff --git a/modular_skyrat/modules/alt_vox/code/vox_procs.dm b/modular_skyrat/modules/alt_vox/code/vox_procs.dm index 00d6945d004..de7702db913 100644 --- a/modular_skyrat/modules/alt_vox/code/vox_procs.dm +++ b/modular_skyrat/modules/alt_vox/code/vox_procs.dm @@ -34,28 +34,28 @@ var/index = 0 for(var/word in GLOB.vox_sounds) index++ - dat += "[capitalize(word)]" + dat += "[capitalize(word)]" if(index != GLOB.vox_sounds.len) dat += " / " if(VOX_HL) var/index = 0 for(var/word in GLOB.vox_sounds_hl) index++ - dat += "[capitalize(word)]" + dat += "[capitalize(word)]" if(index != GLOB.vox_sounds_hl.len) dat += " / " if(VOX_MIL) var/index = 0 for(var/word in GLOB.vox_sounds_mil) index++ - dat += "[capitalize(word)]" + dat += "[capitalize(word)]" if(index != GLOB.vox_sounds_mil.len) dat += " / " if(VOX_BMS) var/index = 0 for(var/word in GLOB.vox_sounds_bms) index++ - dat += "[capitalize(word)]" + dat += "[capitalize(word)]" if(index != GLOB.vox_sounds_bms.len) dat += " / " diff --git a/modular_skyrat/modules/customization/modules/mob/living/silicon/examine.dm b/modular_skyrat/modules/customization/modules/mob/living/silicon/examine.dm index 3eb789b6a28..bfc77e49756 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/silicon/examine.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/silicon/examine.dm @@ -8,7 +8,7 @@ /// The first 1-FLAVOR_PREVIEW_LIMIT characters in the mob's client's silicon_flavor_text preference datum. FLAVOR_PREVIEW_LIMIT is defined in flavor_defines.dm. var/silicon_preview_text = copytext_char((client?.prefs.read_preference(/datum/preference/text/silicon_flavor_text)), 1, FLAVOR_PREVIEW_LIMIT) - flavor_text_link = span_notice("[silicon_preview_text]... Look closer?") + flavor_text_link = span_notice("[silicon_preview_text]... Look closer?") if (flavor_text_link) . += flavor_text_link @@ -21,4 +21,4 @@ if(length_char(temporary_flavor_text) <= 40) . += span_notice("They look different than usual: [temporary_flavor_text]") else - . += span_notice("They look different than usual: [copytext_char(temporary_flavor_text, 1, 37)]... More...") + . += span_notice("They look different than usual: [copytext_char(temporary_flavor_text, 1, 37)]... More...") diff --git a/modular_skyrat/modules/customization/modules/mob/living/simple_mob/examine.dm b/modular_skyrat/modules/customization/modules/mob/living/simple_mob/examine.dm index 2746ae43c51..d2dd6db5b53 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/simple_mob/examine.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/simple_mob/examine.dm @@ -5,4 +5,4 @@ if(length_char(temporary_flavor_text) <= 40) . += span_notice("[temporary_flavor_text]") else - . += span_notice("[copytext_char(temporary_flavor_text, 1, 37)]... More...") + . += span_notice("[copytext_char(temporary_flavor_text, 1, 37)]... More...") diff --git a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm index 0e6045eb285..46b9fb7c86d 100644 --- a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm +++ b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm @@ -412,7 +412,7 @@ return message message += span_danger("\nCurrent degradation/max: [span_blue("[current_degradation]")]/[max_degradation].") - message += span_notice("\nView degradation specifics?") + message += span_notice("\nView degradation specifics?") if (permakill_if_at_max_degradation) message += span_revenwarning("\n\nSUBJECT WILL BE PERMANENTLY KILLED IF DEGRADATION REACHES MAXIMUM!") diff --git a/modular_skyrat/modules/delam_emergency_stop/code/delam.dm b/modular_skyrat/modules/delam_emergency_stop/code/delam.dm index 29342d26511..18b391cb838 100644 --- a/modular_skyrat/modules/delam_emergency_stop/code/delam.dm +++ b/modular_skyrat/modules/delam_emergency_stop/code/delam.dm @@ -23,7 +23,7 @@ for(var/client/staff as anything in GLOB.admins) if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification)) SEND_SOUND(staff, sound('sound/misc/server-ready.ogg')) - message_admins("DELAM: Round timer under 30 minutes! [ADMIN_VERBOSEJMP(sm)] will perform an automatic delam suppression once integrity reaches 0%. (TOGGLE AUTOMATIC INTERVENTION))") + message_admins("DELAM: Round timer under 30 minutes! [ADMIN_VERBOSEJMP(sm)] will perform an automatic delam suppression once integrity reaches 0%. (TOGGLE AUTOMATIC INTERVENTION))") sm.station_notified = TRUE /datum/sm_delam/Topic(href, href_list) diff --git a/modular_skyrat/modules/events/code/event_spawner_menu.dm b/modular_skyrat/modules/events/code/event_spawner_menu.dm index 7f839bcfc13..b9278c7df9a 100644 --- a/modular_skyrat/modules/events/code/event_spawner_menu.dm +++ b/modular_skyrat/modules/events/code/event_spawner_menu.dm @@ -96,10 +96,10 @@ var/datum/event_spawner_instance/ESI = managed_instances["[panel_id]"] if(!ESI) return - dat += "Return ----- Export Import
" - dat += "Job Name: [ESI.job_name]" + dat += "Return ----- Export Import
" + dat += "Job Name: [ESI.job_name]" dat += "
This will appear on the person's ID" - dat += "
Flavor Text: [ESI.flavor_text]" + dat += "
Flavor Text: [ESI.flavor_text]" dat += "
The player will be greeted with the flavor text. Tell him who his supervisors are, if any." var/outfit_name var/datum/outfit/OU @@ -109,12 +109,12 @@ else OU = ESI.used_outfit outfit_name = initial(OU.name) - dat += "
Allow Loadout: [ESI.gets_loadout ? "Yes" : "No"]" + dat += "
Allow Loadout: [ESI.gets_loadout ? "Yes" : "No"]" dat += "
Whether loadout from prefs is allowed." - dat += "
Used Outfit: [outfit_name]" + dat += "
Used Outfit: [outfit_name]" dat += "
Which outfit is used for the spawned player. Below you can preview contents of the selected one." if(ESI.used_outfit) - dat += "
[ESI.show_outfit_equipment ? "Hide outfit equipment" : "Show outfit equipment"]" + dat += "
[ESI.show_outfit_equipment ? "Hide outfit equipment" : "Show outfit equipment"]" if(OU && ESI.show_outfit_equipment) dat += "
Outfit equipment:" var/obj/item/display = initial(OU.uniform) @@ -172,43 +172,43 @@ dat += "
" dat += "Here you can add extra equipment on top of loadout, if possible those will be auto equipped." dat += "
You HAVE to add them as typed paths(/obj/item/gun/energy/e_gun). Search in Game Panel to find desired paths." - dat += "
Additional equipment: Add" + dat += "
Additional equipment: Add" for(var/eq in ESI.additional_equipment) var/obj/item/equip = eq - dat += "
[initial(equip.name)] - ([eq])" + dat += "
[initial(equip.name)] - ([eq])" dat += "
" dat += "Outfits limit on what airlocks can someone access, or what headset and frequences they have. Here you can edit those things" dat += "
Access overrides: " for(var/access_key in ESI.access_override) - dat += "[access_key]" - dat += " <- Add" + dat += "[access_key]" + dat += " <- Add" dat += "
Add access in NUMBERS. If no numbers are in the list, then the access will not be overriden. If you want to remove all access, add only a 0" dat += "
See '/code/__DEFINES/access.dm' for an access list. (401-Faction Public, 402-Faction Crew, 403-Faction Command)" dat += "
Headset override: " if(ESI.headset_override) var/obj/item/headset = ESI.headset_override - dat += "[initial(headset.name)] - ([ESI.headset_override])" - dat += " <- Set" + dat += "[initial(headset.name)] - ([ESI.headset_override])" + dat += " <- Set" dat += "
Here you can override the headset, make sure to pick one which has the proper key with radio frequences for your role" dat += "
" dat += "Allowed Species:" for(var/spec in ESI.species_whitelist) - dat += "[spec]" - dat += " <- Add" + dat += "[spec]" + dat += " <- Add" dat += "
If no species are in the list, then any species can join as this role." dat += "
Allowed Genders:" for(var/gend in ESI.gender_whitelist) - dat += "[gend]" - dat += " <- Add" + dat += "[gend]" + dat += " <- Add" dat += "
If no genders are in the list, then any gender can join as this role." dat += "
Allowed CKEYs:" for(var/ckey in ESI.ckey_whitelist) - dat += "[ckey]" - dat += " <- Add" + dat += "[ckey]" + dat += " <- Add" dat += "
If no ckeys are in the list, then any ckey can join as this role." - dat += "
Spawner disappears after spawn: [ESI.disappear_after_spawn ? "Yes" : "No"]" - dat += "
Prompt players when spawner created: [ESI.prompt_players ? "Yes" : "No"] This will only prompt ckeys which can access the spawner." - dat += "
Create spawner on current location
" + dat += "
Spawner disappears after spawn: [ESI.disappear_after_spawn ? "Yes" : "No"]" + dat += "
Prompt players when spawner created: [ESI.prompt_players ? "Yes" : "No"] This will only prompt ckeys which can access the spawner." + dat += "
Create spawner on current location
" //Buttons for easy override for the faction stuff (for access and headset keys) else @@ -223,8 +223,8 @@ var/desc = ESI.flavor_text if(length(desc) > 40) desc = "[copytext_char(desc, 1, 57)]..." - dat += "#[key][ESI.job_name][desc]ConfigureClone" - dat += "*Create new" + dat += "#[key][ESI.job_name][desc]ConfigureClone" + dat += "*Create new" dat += "" winshow(usr, "event_spawn_window", TRUE) diff --git a/modular_skyrat/modules/medical/code/carbon_examine.dm b/modular_skyrat/modules/medical/code/carbon_examine.dm index b4e385badfb..3f59fc8e52a 100644 --- a/modular_skyrat/modules/medical/code/carbon_examine.dm +++ b/modular_skyrat/modules/medical/code/carbon_examine.dm @@ -48,7 +48,7 @@ if(WOUND_SEVERITY_CRITICAL) . += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!!" if(LB.current_gauze) - . += "\t[t_His] [LB.name] is [LB.current_gauze.get_gauze_usage_prefix()] with [LB.current_gauze.get_gauze_description()]." + . += "\t[t_His] [LB.name] is [LB.current_gauze.get_gauze_usage_prefix()] with [LB.current_gauze.get_gauze_description()]." if(!any_bodypart_damage) . += "\t[t_He] [t_Has] no significantly damaged bodyparts." diff --git a/modular_skyrat/modules/medical/code/wounds/_wounds.dm b/modular_skyrat/modules/medical/code/wounds/_wounds.dm index 71f74b011dd..47abfc8cb34 100644 --- a/modular_skyrat/modules/medical/code/wounds/_wounds.dm +++ b/modular_skyrat/modules/medical/code/wounds/_wounds.dm @@ -4,4 +4,4 @@ /// Gets the name of the wound with any interactable topic if possible /datum/wound/proc/get_topic_name(mob/user) - return show_wound_topic(user) ? "[lowertext(name)]" : lowertext(name) + return show_wound_topic(user) ? "[lowertext(name)]" : lowertext(name) diff --git a/modular_skyrat/modules/mentor/code/follow.dm b/modular_skyrat/modules/mentor/code/follow.dm index 5c33da00be0..3060d41f004 100644 --- a/modular_skyrat/modules/mentor/code/follow.dm +++ b/modular_skyrat/modules/mentor/code/follow.dm @@ -6,7 +6,7 @@ mentor_datum.following = M usr.reset_perspective(M) add_verb(src,/client/proc/mentor_unfollow) - to_chat(usr, span_info("Click the \"Stop Following\" button here or in the Mentor tab to stop following [key_name(M)].")) + to_chat(usr, span_info("Click the \"Stop Following\" button here or in the Mentor tab to stop following [key_name(M)].")) orbiting = FALSE else var/mob/dead/observer/O = usr diff --git a/modular_skyrat/modules/mentor/code/mentorhelp.dm b/modular_skyrat/modules/mentor/code/mentorhelp.dm index d3bc2f343bd..2740ba719cd 100644 --- a/modular_skyrat/modules/mentor/code/mentorhelp.dm +++ b/modular_skyrat/modules/mentor/code/mentorhelp.dm @@ -73,9 +73,9 @@ if(key) if(include_link) if(CONFIG_GET(flag/mentors_mobname_only)) - . += "" + . += "" else - . += "" + . += "" if(target_client && target_client?.holder && target_client?.holder.fakekey) . += "Administrator" @@ -97,6 +97,6 @@ . += "*no key*" if(include_follow) - . += " (F)" + . += " (F)" return . diff --git a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm index f8a919d5074..9d2c35be97a 100644 --- a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm +++ b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm @@ -47,7 +47,7 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ for(var/role in GLOB.special_roles) if(role in list(ROLE_MALF, ROLE_PAI, ROLE_SENTIENCE, ROLE_OBSESSED)) continue - dat += "Make [role](s)." + dat += "Make [role](s)." if(antag_is_ghostrole(role)) dat += " (Requires Ghosts)" dat += "
" diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm index 50b6a192c88..f2489ab6662 100644 --- a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm +++ b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm @@ -104,10 +104,10 @@ /// Builds the HTML panel entry for the round end report /datum/opposing_force/proc/build_html_panel_entry() var/list/opfor_entry = list("[mind_reference.key] - ") - opfor_entry += "PM " + opfor_entry += "PM " if(mind_reference.current) - opfor_entry += "FLW " - opfor_entry += "Show OPFOR Panel" + opfor_entry += "FLW " + opfor_entry += "Show OPFOR Panel" return opfor_entry.Join() /datum/opposing_force/ui_interact(mob/user, datum/tgui/ui) @@ -701,7 +701,7 @@ log_admin(msg) /datum/opposing_force/proc/send_admins_opfor_message(message) - message = "[span_pink("OPFOR:")] [span_admin("[message] (Show Panel)")]" + message = "[span_pink("OPFOR:")] [span_admin("[message] (Show Panel)")]" to_chat(GLOB.admins, type = MESSAGE_TYPE_ADMINLOG, html = message, @@ -835,7 +835,7 @@ send_system_message("ERROR: You are muted.") return if(user.ckey != handling_admin && GLOB.directory[handling_admin]) - to_chat(GLOB.directory[handling_admin], span_pink("OPFOR: [user] has pinged their OPFOR admin chat! (Show Panel)")) + to_chat(GLOB.directory[handling_admin], span_pink("OPFOR: [user] has pinged their OPFOR admin chat! (Show Panel)")) SEND_SOUND(GLOB.directory[handling_admin], sound('sound/misc/bloop.ogg')) send_system_message("Handling admin pinged.") COOLDOWN_START(src, ping_cooldown, OPFOR_PING_COOLDOWN) diff --git a/modular_skyrat/modules/records_on_examine/code/examine.dm b/modular_skyrat/modules/records_on_examine/code/examine.dm index 74de9a5a4ea..a8d3e488eca 100644 --- a/modular_skyrat/modules/records_on_examine/code/examine.dm +++ b/modular_skyrat/modules/records_on_examine/code/examine.dm @@ -2,14 +2,14 @@ . = ..() if (target_record?.past_medical_records) - . += "\[View medical records\]" + . += "\[View medical records\]" if (target_record?.past_general_records) - . += "\[View general records\]" + . += "\[View general records\]" /mob/living/carbon/human/get_sechud_examine_info(mob/living/user, datum/record/crew/target_record) . = ..() if (target_record?.past_security_records) - . += "\[View past security records\]" + . += "\[View past security records\]" if (target_record?.past_general_records) - . += "\[View general records\]" + . += "\[View general records\]" diff --git a/modular_skyrat/modules/title_screen/code/new_player.dm b/modular_skyrat/modules/title_screen/code/new_player.dm index 4c11aee35cd..4120c52b936 100644 --- a/modular_skyrat/modules/title_screen/code/new_player.dm +++ b/modular_skyrat/modules/title_screen/code/new_player.dm @@ -215,9 +215,9 @@ qdel(query_get_new_polls) return if(query_get_new_polls.NextRow()) - output +={"POLLS (NEW)"} + output +={"POLLS (NEW)"} else - output +={"POLLS"} + output +={"POLLS"} qdel(query_get_new_polls) if(QDELETED(src)) return diff --git a/modular_skyrat/modules/title_screen/code/title_screen_html.dm b/modular_skyrat/modules/title_screen/code/title_screen_html.dm index b45c34c995d..855b547bd40 100644 --- a/modular_skyrat/modules/title_screen/code/title_screen_html.dm +++ b/modular_skyrat/modules/title_screen/code/title_screen_html.dm @@ -100,27 +100,27 @@ GLOBAL_LIST_EMPTY(startup_messages) dat += {"
"} if(!SSticker || SSticker.current_state <= GAME_STATE_PREGAME) - dat += {"[ready == PLAYER_READY_TO_PLAY ? "☑ READY" : "☒ READY"]"} + dat += {"[ready == PLAYER_READY_TO_PLAY ? "☑ READY" : "☒ READY"]"} else dat += {" - JOIN GAME - CREW MANIFEST + JOIN GAME + CREW MANIFEST "} - dat += {"CHARACTER DIRECTORY"} + dat += {"CHARACTER DIRECTORY"} - dat += {"OBSERVE"} + dat += {"OBSERVE"} dat += {"
- SETUP CHARACTER ([uppertext(client.prefs.read_preference(/datum/preference/name/real_name))]) - GAME OPTIONS - [client.prefs.read_preference(/datum/preference/toggle/be_antag) ? "☑ BE ANTAGONIST" : "☒ BE ANTAGONIST"] + SETUP CHARACTER ([uppertext(client.prefs.read_preference(/datum/preference/name/real_name))]) + GAME OPTIONS + [client.prefs.read_preference(/datum/preference/toggle/be_antag) ? "☑ BE ANTAGONIST" : "☒ BE ANTAGONIST"]
- SWAP SERVERS + SWAP SERVERS "} if(length(GLOB.lobby_station_traits)) - dat += {"JOB TRAITS"} + dat += {"JOB TRAITS"} if(!is_guest_key(src.key)) dat += playerpolls() diff --git a/modular_zubbers/code/game/machinery/doors/door.dm b/modular_zubbers/code/game/machinery/doors/door.dm index 5428f9f8822..8aa021ffbc9 100644 --- a/modular_zubbers/code/game/machinery/doors/door.dm +++ b/modular_zubbers/code/game/machinery/doors/door.dm @@ -1,7 +1,7 @@ -#define LINK_DENY "\a (deny)" -#define LINK_OPEN "\a (open)" -#define LINK_BOLT "\a (bolt)" -#define LINK_SHOCK "\a (shock)" +#define LINK_DENY "\a (deny)" +#define LINK_OPEN "\a (open)" +#define LINK_BOLT "\a (bolt)" +#define LINK_SHOCK "\a (shock)" /obj/machinery/door/airlock //so the AI doesn't get spammed @@ -29,10 +29,10 @@ if(AI.deployed_shell) if(!is_station_level(AI.deployed_shell.registered_z)) continue - to_chat(AI.deployed_shell, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]") + to_chat(AI.deployed_shell, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]") if(!is_station_level(AI.registered_z)) continue - to_chat(AI, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]") + to_chat(AI, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]") requesters[user.name] = world.time #undef LINK_DENY diff --git a/modular_zubbers/code/modules/hydroponics/gene_modder.dm b/modular_zubbers/code/modules/hydroponics/gene_modder.dm index ff2c907e2d1..0161296709a 100644 --- a/modular_zubbers/code/modules/hydroponics/gene_modder.dm +++ b/modular_zubbers/code/modules/hydroponics/gene_modder.dm @@ -176,19 +176,19 @@ dat += "[target.get_name()] gene with [disk.gene.get_name()]?
" if("insert") dat += "[disk.gene.get_name()] gene into \the [seed]?
" - dat += "
Confirm " - dat += "Abort
" + dat += "
Confirm " + dat += "Abort
" popup.set_content(dat) popup.open() return dat+= "
" - dat += "
Plant Sample:
" + dat += "
Plant Sample:
" dat += seed ? seed.name : "None" dat += "
" - dat += "
Data Disk:
" + dat += "
Data Disk:
" if(!disk) dat += "None" else if(!disk.gene) @@ -212,9 +212,9 @@ continue dat += "[G.get_name()]" if(can_extract && G.mutability_flags & PLANT_GENE_GRAFTABLE) - dat += "Extract" + dat += "Extract" if(can_insert && istype(disk.gene, G.type) && G.mutability_flags & PLANT_GENE_REMOVABLE) - dat += "Replace" + dat += "Replace" dat += "" dat += "
" @@ -226,16 +226,16 @@ var/datum/plant_gene/G = a dat += "[G.get_name()]" if(can_extract && G.mutability_flags & PLANT_GENE_GRAFTABLE) - dat += "Extract" + dat += "Extract" if(G.mutability_flags & PLANT_GENE_REMOVABLE) - dat += "Remove" + dat += "Remove" dat += "" dat += "" else dat += "No content-related genes detected in sample.
" dat += "
" if(can_insert && istype(disk.gene, /datum/plant_gene/reagent)) - dat += "Insert: [disk.gene.get_name()]" + dat += "Insert: [disk.gene.get_name()]" dat += "

Trait Genes

" if(trait_genes.len) @@ -244,15 +244,15 @@ var/datum/plant_gene/G = a dat += "[G.get_name()]" if(can_extract && G.mutability_flags & PLANT_GENE_GRAFTABLE) - dat += "Extract" + dat += "Extract" if(G.mutability_flags & PLANT_GENE_REMOVABLE) - dat += "Remove" + dat += "Remove" dat += "" dat += "" else dat += "No trait-related genes detected in sample.
" if(can_insert && istype(disk.gene, /datum/plant_gene/trait)) - dat += "Insert: [disk.gene.get_name()]" + dat += "Insert: [disk.gene.get_name()]" dat += "
" else dat += "
No sample found.
Please, insert a plant sample to use this device." diff --git a/modular_zubbers/code/modules/job_exempt/job_exempt.dm b/modular_zubbers/code/modules/job_exempt/job_exempt.dm index 24f40c12ead..7d3751b24d1 100644 --- a/modular_zubbers/code/modules/job_exempt/job_exempt.dm +++ b/modular_zubbers/code/modules/job_exempt/job_exempt.dm @@ -114,7 +114,7 @@ GLOBAL_LIST_INIT(job_exempt_cache, list()) dat += "[department.department_name]
" for(var/datum/job/job as anything in department.department_jobs) job_count++ - dat += "[job.title]
" + dat += "[job.title]
" dat += "" var/datum/browser/popup = new(user, "job_exempt_menu", "Job Exemption Menu", 730, 650) popup.set_content(dat.Join()) diff --git a/modular_zubbers/code/modules/mob/living/carbon/examine.dm b/modular_zubbers/code/modules/mob/living/carbon/examine.dm index 4cd3dd5b9f4..46e8c657faf 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/examine.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/examine.dm @@ -1,6 +1,6 @@ /atom/proc/examine_title_worn(mob/user) var/regular_examine = src.examine_title(user) if(HAS_TRAIT_FROM(src, TRAIT_WORN_EXAMINE, TRAIT_SUBTREE_REQUIRED_OPERATIONAL_DATUM)) // Uses /datum/element/examined_when_worn - return "[regular_examine]" + return "[regular_examine]" else return regular_examine diff --git a/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm b/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm index 95f03ba01e4..813e15fd5a1 100644 --- a/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm +++ b/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm @@ -69,7 +69,7 @@ SSticker.quote_of_the_round_attribution = "[found_name], [found_job]" SSticker.quote_of_the_round_record_start = null //Chosen! SSticker.quote_of_the_round_ckey = found_user.ckey ? found_user.ckey : "NO CKEY" //It's possible to be null. - message_admins("[found_message] by [ADMIN_LOOKUPFLW(found_user)] has been randomly selected as quote of the round. Click here to change.") + message_admins("[found_message] by [ADMIN_LOOKUPFLW(found_user)] has been randomly selected as quote of the round. Click here to change.") log_world("[key_name(found_user)] has been randomly selected for quote of the round with the quote \"[found_message]\".") /obj/machinery/telecomms/hub/Topic(href, href_list) diff --git a/modular_zubbers/code/modules/storyteller/_events/_event.dm b/modular_zubbers/code/modules/storyteller/_events/_event.dm index 232381eddb3..cc95d007daf 100644 --- a/modular_zubbers/code/modules/storyteller/_events/_event.dm +++ b/modular_zubbers/code/modules/storyteller/_events/_event.dm @@ -59,12 +59,12 @@ if(roundstart) if(!can_run_post_roundstart) return "Fire Schedule" - return "Fire Schedule" + return "Fire Schedule" else - return "Fire Schedule Force Next" + return "Fire Schedule Force Next" else if(roundstart) - return "Force Roundstart" + return "Force Roundstart" else return "Fire Schedule Force Next" diff --git a/modular_zubbers/code/modules/storyteller/gamemode.dm b/modular_zubbers/code/modules/storyteller/gamemode.dm index d8e7170da43..aa2d578ca55 100644 --- a/modular_zubbers/code/modules/storyteller/gamemode.dm +++ b/modular_zubbers/code/modules/storyteller/gamemode.dm @@ -191,7 +191,7 @@ SUBSYSTEM_DEF(gamemode) else if(!sch_event.alerted_admins && world.time >= sch_event.start_time - 1 MINUTES) ///Alert admins 1 minute before running and allow them to cancel or refund the event, once again. sch_event.alerted_admins = TRUE - message_admins("Scheduled Event: [sch_event.event] will run in [(sch_event.start_time - world.time) / 10] seconds. (CANCEL) (REFUND)") + message_admins("Scheduled Event: [sch_event.event] will run in [(sch_event.start_time - world.time) / 10] seconds. (CANCEL) (REFUND)") if(!storyteller_halted && next_storyteller_process <= world.time && storyteller) // We update crew information here to adjust population scalling and event thresholds for the storyteller. @@ -388,9 +388,9 @@ SUBSYSTEM_DEF(gamemode) var/datum/scheduled_event/scheduled = new (passed_event, world.time + passed_time, passed_cost, passed_ignore, passed_announce) var/round_started = SSticker.HasRoundStarted() if(round_started) - message_admins("Event: [passed_event] has been scheduled to run in [passed_time / 10] seconds. (CANCEL) (REFUND)") + message_admins("Event: [passed_event] has been scheduled to run in [passed_time / 10] seconds. (CANCEL) (REFUND)") else //Only roundstart events can be scheduled before round start - message_admins("Event: [passed_event] has been scheduled to run on roundstart. (CANCEL)") + message_admins("Event: [passed_event] has been scheduled to run on roundstart. (CANCEL)") scheduled_events += scheduled /datum/controller/subsystem/gamemode/proc/update_crew_infos() diff --git a/modular_zubbers/code/modules/storyteller/scheduled_event.dm b/modular_zubbers/code/modules/storyteller/scheduled_event.dm index ab196d7baf4..1fd03a2935c 100644 --- a/modular_zubbers/code/modules/storyteller/scheduled_event.dm +++ b/modular_zubbers/code/modules/storyteller/scheduled_event.dm @@ -40,9 +40,9 @@ /datum/scheduled_event/proc/get_href_actions() var/round_started = SSticker.HasRoundStarted() if(round_started) - return "Fire Reschedule Cancel Refund" + return "Fire Reschedule Cancel Refund" else - return "Cancel" + return "Cancel" /// Try and fire off the scheduled event /datum/scheduled_event/proc/try_fire()