diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 7298839c..5f1223bd 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1213,7 +1213,7 @@ illustration = null /obj/item/storage/box/mre //base MRE type. - name = "Kinaris MRE Ration Kit Menu 0" + name = "GATO MRE Ration Kit Menu 0" desc = "A package containing food suspended in an outdated bluespace pocket which lasts for centuries. If you're lucky you may even be able to enjoy the meal without getting food poisoning." icon_state = "mre" illustration = null @@ -1239,7 +1239,7 @@ ENABLE_BITFIELD(S.foodtype, TOXIC) /obj/item/storage/box/mre/menu1 - name = "\improper Kinaris MRE Ration Kit Menu 1" + name = "\improper GATO MRE Ration Kit Menu 1" /obj/item/storage/box/mre/menu1/safe desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time." @@ -1254,7 +1254,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu2 - name = "\improper Kinaris MRE Ration Kit Menu 2" + name = "\improper GATO Ration Kit Menu 2" /obj/item/storage/box/mre/menu2/safe spawner_chance = 0 @@ -1269,7 +1269,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu3 - name = "\improper Kinaris MRE Ration Kit Menu 3" + name = "\improper GATO Ration Kit Menu 3" desc = "The holy grail of MREs. This item contains the fabled MRE pizza, spicy nachos and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed." icon_state = "menu3" can_expire = FALSE //always fresh, never expired. @@ -1284,7 +1284,7 @@ new /obj/item/tank/internals/emergency_oxygen(src) /obj/item/storage/box/mre/menu4 - name = "\improper Kinaris MRE Ration Kit Menu 4" + name = "\improper GATO MRE Ration Kit Menu 4" /obj/item/storage/box/mre/menu4/safe spawner_chance = 0 diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 74327fca..9aaf9767 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -101,4 +101,4 @@ icon = 'icons/obj/advancedtools.dmi' usesound = 'sound/weapons/sonic_jackhammer.ogg' icon_state = "crowbar" - toolspeed = 0.2 \ No newline at end of file + toolspeed = 0.2 diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 269d96ec..4fee66aa 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -211,7 +211,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) - to_chat(C, "No active admins are online, your adminhelp was sent to the Discord.") + to_chat(C, "No active admins are online. **Please send your Adminhelp to the discord channel with an '@Admin'**.") //hyper change, because we have our own bot, the notification has to be loaded into a file, for the bot to read. fdel("Hyperbot/ahelp.txt") var botmsg = "**[initiator_key_name]** *([GLOB.round_id])*```[msg]```" diff --git a/sound/music/CInferno.ogg b/sound/music/CInferno.ogg index a6a579b6..86c471bc 100644 Binary files a/sound/music/CInferno.ogg and b/sound/music/CInferno.ogg differ diff --git a/sound/music/PigstepSilva.ogg b/sound/music/PigstepSilva.ogg index 755ff5a5..ca984ba8 100644 Binary files a/sound/music/PigstepSilva.ogg and b/sound/music/PigstepSilva.ogg differ diff --git a/sound/music/Sam.ogg b/sound/music/Sam.ogg index 7c1d069f..c7c5e77d 100644 Binary files a/sound/music/Sam.ogg and b/sound/music/Sam.ogg differ diff --git a/sound/music/TinTinOnMark2.ogg b/sound/music/TinTinOnMark2.ogg index 876b944c..cb261b0a 100644 Binary files a/sound/music/TinTinOnMark2.ogg and b/sound/music/TinTinOnMark2.ogg differ