cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-13503

Browse Source
This commit is contained in:
Nadyr
2022-08-28 18:06:43 -04:00
committed by GitHub
parent 93870dd2e2 fa6bdf9209
commit 19d875c734
108 changed files with 15379 additions and 242025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+16
View File
@@ -60,6 +60,14 @@
cmd_admin_pm(C,null)
return
if(href_list["mentorhelp_msg"])
var/client/C = locate(href_list["mentorhelp_msg"])
if(ismob(C))
var/mob/M = C
C = M.client
cmd_mentor_pm(C, null)
return
if(href_list["irc_msg"])
if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes
to_chat(usr, "<span class='warning'>You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you</span>")
@@ -123,6 +131,7 @@
switch(href_list["_src_"])
if("holder") hsrc = holder
if("mentorholder") hsrc = (check_rights(R_ADMIN, 0) ? holder : mentorholder)
if("usr") hsrc = mob
if("prefs") return prefs.process_link(usr,href_list)
if("vars") return view_var_Topic(href,href_list,hsrc)
@@ -185,6 +194,10 @@
GLOB.admins += src
holder.owner = src
mentorholder = mentor_datums[ckey]
if (mentorholder)
mentorholder.associate(GLOB.directory[ckey])
//preferences datum - also holds some persistant data for the client (because we may as well keep these datums to a minimum)
prefs = preferences_datums[ckey]
if(!prefs)
@@ -262,6 +275,9 @@
if(holder)
holder.owner = null
GLOB.admins -= src
if (mentorholder)
mentorholder.owner = null
GLOB.mentors -= src
GLOB.ahelp_tickets.ClientLogout(src)
GLOB.directory -= ckey
GLOB.clients -= src
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -1
View File
@@ -91,7 +91,7 @@
/datum/gear/uniform/pants/New()
..()
var/list/pants = list()
for(var/obj/item/clothing/under/pants/pant_type as anything in typesof(/obj/item/clothing/under/pants))
for(var/obj/item/clothing/under/pants/pant_type as anything in (typesof(/obj/item/clothing/under/pants) - typesof(/obj/item/clothing/under/pants/altevian)))
pants[initial(pant_type.name)] = pant_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+36 -1
View File
@@ -36,7 +36,7 @@
/datum/gear/uniform/job_khi/med
display_name = "ge uniform, med" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist")
/datum/gear/uniform/job_khi/eng
display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit
@@ -290,3 +290,38 @@ Talon jumpsuit
display_name = "undersuit, command (SM/HoP)"
allowed_roles = list("Site Manager", "Head of Personnel")
path = /obj/item/clothing/under/undersuit/command
//Altevian Uniforms
/datum/gear/uniform/job_altevian/cmd
display_name = "altevian uniform, cmd"
path = /obj/item/clothing/under/pants/altevian/command
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
/datum/gear/uniform/job_altevian/sec
display_name = "altevian uniform, sec"
path = /obj/item/clothing/under/pants/altevian/security
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/job_altevian/med
display_name = "altevian uniform, med"
path = /obj/item/clothing/under/pants/altevian/medical
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist")
/datum/gear/uniform/job_altevian/eng
display_name = "altevian uniform, eng"
path = /obj/item/clothing/under/pants/altevian/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
/datum/gear/uniform/job_altevian/sci
display_name = "altevian uniform, sci"
path = /obj/item/clothing/under/pants/altevian/science
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_altevian/crg
display_name = "altevian uniform, cargo"
path = /obj/item/clothing/under/pants/altevian/cargo
allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner")
/datum/gear/uniform/job_altevian/civ
display_name = "altevian uniform, civ"
path = /obj/item/clothing/under/pants/altevian
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+4 -4
View File
@@ -167,9 +167,9 @@
sort_category = "Xenowear"
/datum/gear/uniform/dept/undercoat/cap
display_name = "facility director undercoat (Teshari)"
display_name = "site manager undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/cap
allowed_roles = list("Facility Director")
allowed_roles = list("Site Manager")
/datum/gear/uniform/dept/undercoat/hop
display_name = "head of personnel undercoat (Teshari)"
@@ -276,9 +276,9 @@
sort_category = "Xenowear"
/datum/gear/suit/dept/cloak/cap
display_name = "facility director cloak (Teshari)"
display_name = "site manager cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs
allowed_roles = list("Facility Director")
allowed_roles = list("Site Manager")
/datum/gear/suit/dept/cloak/hop
display_name = "head of personnel cloak (Teshari)"
code/modules/client/verbs/who.dm
+23 -1
View File
@@ -83,7 +83,7 @@
else if(check_rights(R_STEALTH, FALSE, C)) // event managers //VOREStation Edit: Retired Staff
category = R_EVENT
num_event_managers_online++
temp += "\t[C] is a [C.holder.rank]"
if(holder)
if(C.holder.fakekey)
@@ -121,6 +121,28 @@
if(config.show_event_managers)
msg += "\n<b> Current Miscellaneous ([num_event_managers_online]):</b>\n" + eventMmsg
var/num_mentors_online = 0
var/mmsg = ""
for(var/client/C in GLOB.mentors)
num_mentors_online++
mmsg += "\t[C] is a Mentor"
if(holder)
if(isobserver(C.mob))
mmsg += " - Observing"
else if(istype(C.mob,/mob/new_player))
mmsg += " - Lobby"
else
mmsg += " - Playing"
if(C.is_afk())
var/seconds = C.last_activity_seconds()
mmsg += " (AFK - [round(seconds / 60)] minutes, [seconds % 60] seconds)"
mmsg += "\n"
if(config.show_mentors)
msg += "\n<b> Current Mentors ([num_mentors_online]):</b>\n" + mmsg
msg += "\n<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.</span>"
to_chat(src, msg)