* dme and dmb

* Heeeere we gooo

* fasease

* Continued.

* AAAAAAAAAAAAAAAAAAAAAAAA

* Brain going numb

* agh

* The suffering will be worth it... right?

* Going blank...

* Am I done?

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes

* Should be everything I care about right now.
This commit is contained in:
Zandario
2022-05-26 01:37:55 -07:00
committed by GitHub
parent 7152e7ff2a
commit 5a7f357b85
383 changed files with 986 additions and 2585 deletions
+1 -7
View File
@@ -516,7 +516,6 @@
jobs += "</tr><tr align='center'>"
counter = 0
jobs += "</tr></table>"
//VOREStation Edit Start
//Exploration (Purple)
counter = 0
jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
@@ -537,7 +536,6 @@
jobs += "</tr><tr align='center'>"
counter = 0
jobs += "</tr></table>"
//VOREstation Edit End
//Civilian (Grey)
counter = 0
jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
@@ -691,14 +689,12 @@
var/datum/job/temp = job_master.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
//VOREStation Edit Start
if("explorationdept")
for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_PLANET))
if(!jobPos) continue
var/datum/job/temp = job_master.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
//VOREStation Edit End
if("civiliandept")
for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_CIVILIAN))
if(!jobPos) continue
@@ -1286,7 +1282,6 @@
if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights)
to_chat(X, take_msg)
to_chat(M, "<span class='notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
// VoreStation Edit Start
if (config_legacy.chat_webhook_url)
spawn(0)
var/query_string = "type=admintake"
@@ -1294,7 +1289,6 @@
query_string += "&admin=[url_encode(key_name(usr.client))]"
query_string += "&user=[url_encode(key_name(M))]"
world.Export("[config_legacy.chat_webhook_url]?[query_string]")
// VoreStation Edit End
else
to_chat(usr, "<span class='warning'>Unable to locate mob.</span>")
@@ -1927,7 +1921,7 @@
else if(href_list["cryoplayer"])
if(!check_rights(R_ADMIN)) return
var/mob/living/carbon/M = locate(href_list["cryoplayer"]) //VOREStation edit from just an all mob check to mob/living/carbon
var/mob/living/carbon/M = locate(href_list["cryoplayer"])
if(!istype(M))
to_chat(usr,"<span class='warning'>Mob doesn't exist!</span>")
return