Fixes for e0bdfc3f5f part one

This commit is contained in:
Roxy
2025-06-29 00:10:41 -04:00
parent 26fb7e008e
commit 656656bf96
45 changed files with 309 additions and 820 deletions
+1 -36
View File
@@ -57,41 +57,6 @@
handle_job_exempt_menu_topic(usr, href, href_list, target_ckey)
// BUBBER EDIT END
// SKYRAT EDIT BEGIN -- ONE CLICK ANTAG
else if(href_list["makeAntag"])
message_admins("[key_name_admin(usr)] is attempting to make [href_list["makeAntag"]]")
if(!check_rights(R_ADMIN))
return
if (!SSticker.HasRoundStarted())
to_chat(usr, span_danger("Not until the round starts!"), confidential = TRUE)
return
var/opt = null
switch(href_list["makeAntag"])
if(ROLE_BLOB)
opt = input("Set Blob Resource Gain Rate","Set Resource Rate",1) as num|null
if(ROLE_TRAITOR)
opt = input("How Many", ROLE_TRAITOR, 1) as num|null
if(ROLE_CHANGELING)
opt = input("How Many", ROLE_CHANGELING, 1) as num|null
if(ROLE_CULTIST)
opt = input("How Many", ROLE_CULTIST, 2) as num|null
if(ROLE_HERETIC)
opt = input("How Many", ROLE_HERETIC, 2) as num|null
if(ROLE_REV)
opt = input("How Many", ROLE_REV, 1) as num|null
if(ROLE_OPERATIVE)
opt = input("How Many", ROLE_OPERATIVE, 3) as num|null
if(ROLE_BROTHER)
opt = input("How Many", ROLE_BROTHER, 2) as num|null
if(src.make_antag(href_list["makeAntag"], opt))
message_admins("[key_name_admin(usr)] created '[href_list["makeAntag"]]' with a parameter of '[opt]'.")
else message_admins("[key_name_admin(usr)] FAILED to create '[href_list["makeAntag"]]' with a parameter of '[opt]'.")
// SKYRAT EDIT END -- ONE CLICK ANTAG
else if(href_list["editrightsbrowser"])
edit_admin_permissions(0)
@@ -1617,7 +1582,7 @@
if(!check_rights(R_ADMIN))
return
if(!SSdynamic.picking_specific_rule(/datum/dynamic_ruleset/midround/from_living/opfor_candidate, forced = TRUE, ignore_cost = TRUE))
if(!SSdynamic.force_run_midround(/datum/dynamic_ruleset/midround/from_living/opfor_candidate, admin = usr))
message_admins("An OPFOR candidate could not be selected.")
// SKYRAT EDIT ADDITION END
else if(href_list["play_internet"])