diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index da795b6933..d70c41f863 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -1,4 +1,4 @@
-//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
#include "map_files\generic\CentCom.dmm"
diff --git a/cfg/admin.txt b/cfg/admin.txt
index fcc587124a..5991144d4e 100644
--- a/cfg/admin.txt
+++ b/cfg/admin.txt
@@ -1 +1,2 @@
poojawa role=admin
+junozumori role=admin
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index fc2d9f1e3f..f5d217f0b0 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -338,7 +338,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/mining
name = "mining ID"
- access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_MINERAL_STOREROOM) // CITADEL CHANGE removes golem's ability to get on the station willy nilly.
/obj/item/card/id/away
name = "a perfectly generic identification card"
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 73fc0d43f3..73f3c1e451 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -39,7 +39,7 @@
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
if (CONFIG_GET(flag/panic_bunker) && SSdbcore.Connect())
log_access("Failed Login: [key] - Guests not allowed during panic bunker")
- return list("reason"="guest", "desc"="\nReason: Sorry but the server is currently not accepting connections from never before seen players or guests. If you have played on this server with a byond account before, please log in to the byond account you have played from.")
+ return list("reason"="guest", "desc"="\nReason: You must first join the Discord to verify your account before joining this server. Please ping an admin once you've joined and read the rules. https://discord.gg/E6SQuhz")
//Population Cap Checking
var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 695d6775a5..1728b44d9f 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
/client/proc/cmd_admin_ticket_panel,
+ /client/proc/panicbunker,
/client/proc/stop_sounds
)
GLOBAL_PROTECT(admin_verbs_admin)
@@ -116,7 +117,6 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
/client/proc/toggle_random_events,
/client/proc/forcerandomrotate,
/client/proc/adminchangemap,
- /client/proc/panicbunker,
/client/proc/toggle_hub
)
GLOBAL_PROTECT(admin_verbs_debug)
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index b8176a4ce7..77038ee572 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -55,6 +55,7 @@
Power all SMES
Triple AI mode (needs to be used in the lobby)
Everyone is the traitor
+ AK-47s For Everyone!
Summon Guns
Summon Magic
Summon Events (Toggle)
@@ -107,6 +108,9 @@
dat += "No-one has done anything this round!"
usr << browse(dat, "window=admin_log")
+ if("mentor_log")
+ CitadelMentorLogSecret()
+
if("list_job_debug")
var/dat = "Job Debug info.
"
for(var/line in SSjob.job_debug)
@@ -475,6 +479,13 @@
message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
+ if("ak47s")
+ if(!check_rights(R_FUN))
+ return
+ message_admins("[key_name_admin(usr)] activated AK-47s for Everyone!")
+ usr.client.ak47s()
+ sound_to_playing_players('sound/misc/ak47s.ogg')
+
if("guns")
if(!check_rights(R_FUN))
return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 3dc9b8fcd2..850aca5c93 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -22,6 +22,8 @@
if(!CheckAdminHref(href, href_list))
return
+ citaTopic(href, href_list) //CITADEL EDIT, MENTORS
+
if(href_list["ahelp"])
if(!check_rights(R_ADMIN, TRUE))
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index 79578b290d..5dfdcddbc7 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -57,6 +57,10 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
close()
return
open()
+ var/turf/T = get_turf(src)
+ var/area/A = get_area(src)
+ investigate_log("Valve, [src.name], was manipiulated by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+ message_admins("Valve, [src.name], was manipulated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)], [A]")
/obj/machinery/atmospherics/components/binary/valve/digital // can be controlled by AI
name = "digital valve"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index aa7f5ce82b..41b019e81a 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -87,12 +87,22 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)
return
+ // Mentor PM
+ if(href_list["mentor_msg"])
+ if(CONFIG_GET(flag.mentors_mobname_only))
+ var/mob/M = locate(href_list["mentor_msg"])
+ cmd_mentor_pm(M,null)
+ else
+ cmd_mentor_pm(href_list["mentor_msg"],null)
+ return
switch(href_list["_src_"])
if("holder")
hsrc = holder
if("usr")
hsrc = mob
+ if("mentor") // CITADEL
+ hsrc = mentor_datum // CITADEL END
if("prefs")
if (inprefs)
return
@@ -376,6 +386,8 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
if (menuitem)
menuitem.Load_checked(src)
+ hook_vr("client_new",list(src)) // CIT CHANGE - hook for client/New() changes
+
Master.UpdateTickRate()
//////////////
@@ -604,7 +616,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
/client/proc/note_randomizer_user()
add_system_note("CID-Error", "Detected as using a cid randomizer.")
-
+
/client/proc/add_system_note(system_ckey, message)
var/sql_system_ckey = sanitizeSQL(system_ckey)
var/sql_ckey = sanitizeSQL(ckey)
@@ -713,6 +725,11 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
if (isnull(new_size))
CRASH("change_view called without argument.")
+//CIT CHANGES START HERE - makes change_view change DEFAULT_VIEW to 15x15 depending on preferences
+ if(prefs && CONFIG_GET(string/default_view))
+ if(!prefs.widescreenpref && new_size == CONFIG_GET(string/default_view))
+ new_size = "15x15"
+//END OF CIT CHANGES
view = new_size
apply_clickcatcher()
if (isliving(mob))
diff --git a/modular_citadel/code/modules/admin/holder2.dm b/modular_citadel/code/modules/admin/holder2.dm
index f581de8dfc..143000a0d6 100644
--- a/modular_citadel/code/modules/admin/holder2.dm
+++ b/modular_citadel/code/modules/admin/holder2.dm
@@ -2,7 +2,6 @@
var/following = null
/datum/admins/associate(client/C)
- removeMentor(C.ckey) //safety to avoid multiple datums and other weird shit i cannot comprehend
..()
if(istype(C))
C.mentor_datum_set(TRUE)
diff --git a/modular_citadel/code/modules/admin/topic.dm b/modular_citadel/code/modules/admin/topic.dm
index bdd8758882..26bc902bef 100644
--- a/modular_citadel/code/modules/admin/topic.dm
+++ b/modular_citadel/code/modules/admin/topic.dm
@@ -1,4 +1,8 @@
/datum/admins/proc/citaTopic(href, href_list)
+ if(href_list["makementor"])
+ makeMentor(href_list["makementor"])
+ else if(href_list["removementor"])
+ removeMentor(href_list["removementor"])
/datum/admins/proc/makeMentor(ckey)
if(!usr.client)