cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KabKebab/GS13

Browse Source
This commit is contained in:
KabKebab
2022-05-07 21:00:23 +02:00
parent 92060cc123 e9c4c2e009
commit 12a865f2e0
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/storage/boxes.dm
View File

@@ -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

2
code/game/objects/items/tools/crowbar.dm
View File

@@ -101,4 +101,4 @@
icon = 'icons/obj/advancedtools.dmi'
usesound = 'sound/weapons/sonic_jackhammer.ogg'
icon_state = "crowbar"
toolspeed = 0.2
toolspeed = 0.2

2
code/modules/admin/verbs/adminhelp.dm
View File

@@ -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, "<span class='notice'>No active admins are online, your adminhelp was sent to the Discord.</span>")
to_chat(C, "<span class='notice'>No active admins are online. **Please send your Adminhelp to the discord channel with an '@Admin'**.</span>")
//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]```"