cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wizard latejoin antag prompt (#31982)

Browse Source 
* Wizard latejoin antag prompt

* Even more code cut down

* Fix

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-02-06 04:23:29 +00:00
committed by GitHub
parent db76741188
commit eff171e1e3
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/gamemode/dynamic/dynamic_rulesets.dm
View File

@@ -352,9 +352,13 @@
return 0
return ..()
/datum/dynamic_ruleset/proc/latejoinprompt(var/mob/user, var/ruleset)
if(alert(user,"The gamemode is trying to select you for [ruleset], do you want this?",,"Yes","No") == "Yes")
/datum/dynamic_ruleset/proc/latejoinprompt(var/mob/user)
var/turf/oldloc = get_turf(user)
user.forceMove(null)
if(alert(user,"The gamemode is trying to select you for [src], do you want this?",,"Yes","No") == "Yes")
return 1
user.forceMove(oldloc)
message_admins("[user.key] has opted out of [src].")
return 0
/datum/dynamic_ruleset/proc/generate_ruleset_body(mob/applicant)

28
code/datums/gamemode/dynamic/dynamic_rulesets_latejoin.dm
View File

@@ -91,10 +91,12 @@
return ..()
/datum/dynamic_ruleset/latejoin/raginmages/execute()
var/mob/M = pick(assigned)
if(!latejoinprompt(M))
return 0
var/datum/faction/wizard/federation = find_active_faction_by_type(/datum/faction/wizard)
if (!federation)
federation = ticker.mode.CreateFaction(/datum/faction/wizard, null, 1)
var/mob/M = pick(assigned)
var/datum/role/wizard/newWizard = new
M.forceMove(pick(wizardstart))
newWizard.AssignToRole(M.mind,1)
@@ -126,11 +128,7 @@
/datum/dynamic_ruleset/latejoin/ninja/execute()
var/mob/M = pick(assigned)
var/turf/oldloc = get_turf(M)
M.forceMove(null)
if(!latejoinprompt(M,src))
message_admins("[M.key] has opted out of becoming a ninja.")
M.forceMove(oldloc)
if(!latejoinprompt(M))
return 0
var/datum/faction/spider_clan/spoider = find_active_faction_by_type(/datum/faction/spider_clan)
if (!spoider)
@@ -180,11 +178,7 @@
/datum/dynamic_ruleset/latejoin/pulse_demon/execute()
var/mob/M = pick(assigned)
var/turf/oldloc = get_turf(M)
M.forceMove(null)
if(!latejoinprompt(M,src))
message_admins("[M.key] has opted out of becoming a pulse demon.")
M.forceMove(oldloc)
if(!latejoinprompt(M))
return 0
var/obj/structure/cable/our_cable = pick(cables_to_spawn_at)
M.forceMove(get_turf(our_cable))
@@ -244,11 +238,7 @@
/datum/dynamic_ruleset/latejoin/grue/execute()
var/mob/M = pick(assigned)
var/turf/oldloc = get_turf(M)
M.forceMove(null)
if(!latejoinprompt(M,src))
message_admins("[M.key] has opted out of becoming a grue.")
M.forceMove(oldloc)
if(!latejoinprompt(M))
return 0
var/our_spawnspot = pick(grue_spawn_spots)
M.forceMove(our_spawnspot)
@@ -337,11 +327,7 @@
/datum/dynamic_ruleset/latejoin/time_agent/execute()
var/mob/M = pick(assigned)
var/turf/oldloc = get_turf(M)
M.forceMove(null)
if(!latejoinprompt(M,src))
message_admins("[M.key] has opted out of becoming a time agent.")
M.forceMove(oldloc)
if(!latejoinprompt(M))
return 0
var/datum/faction/time_agent/agency = find_active_faction_by_type(/datum/faction/time_agent)
if (!agency)