cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/ParadiseSS13/Paradise into WizardRevenge

Browse Source
This commit is contained in:
Arkatos1
2019-05-13 22:21:48 +02:00
parent c728743997 c639b5d0f6
commit e985bb672e
586 changed files with 12352 additions and 10897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/_common/antag_spawner.dm
+17 -14
View File
@@ -18,6 +18,7 @@
icon_state = "locator"
var/borg_to_spawn
var/checking = FALSE
var/rolename = "Syndicate Operative"
/obj/item/antag_spawner/nuke_ops/proc/before_candidate_search(user)
return TRUE
@@ -26,7 +27,7 @@
if(used)
to_chat(user, "<span class='warning'>[src] is out of power!</span>")
return FALSE
if(!(user.mind in ticker.mode.syndicates))
if(!(user.mind in SSticker.mode.syndicates))
to_chat(user, "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>")
return FALSE
if(checking)
@@ -45,7 +46,7 @@
checking = TRUE
to_chat(user, "<span class='notice'>You activate [src] and wait for confirmation.</span>")
var/list/nuke_candidates = pollCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg" : "operative"]?", ROLE_OPERATIVE, TRUE, 150)
var/list/nuke_candidates = pollCandidates("Do you want to play as a [rolename]?", ROLE_OPERATIVE, TRUE, 150)
if(LAZYLEN(nuke_candidates))
checking = FALSE
if(QDELETED(src) || !check_usability(user))
@@ -62,27 +63,27 @@
/obj/item/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T, kind, datum/mind/user)
var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
var/agent_number = LAZYLEN(ticker.mode.syndicates)
var/agent_number = LAZYLEN(SSticker.mode.syndicates) - 1
M.real_name = "[syndicate_name()] Operative #[agent_number]"
set_syndicate_values(C, M)
ticker.mode.create_syndicate(M.mind)
ticker.mode.equip_syndicate(M, 0)
ticker.mode.update_syndicate_id(M.mind, FALSE)
SSticker.mode.create_syndicate(M.mind)
SSticker.mode.equip_syndicate(M, 0)
SSticker.mode.update_syndicate_id(M.mind, FALSE)
/obj/item/antag_spawner/nuke_ops/proc/set_syndicate_values(client/C, mob/living/M)
M.key = C.key
ticker.mode.syndicates += M.mind
ticker.mode.update_synd_icons_added(M.mind)
SSticker.mode.syndicates += M.mind
SSticker.mode.update_synd_icons_added(M.mind)
M.mind.assigned_role = SPECIAL_ROLE_NUKEOPS
M.mind.special_role = SPECIAL_ROLE_NUKEOPS
M.mind.offstation_role = TRUE
M.faction = list("syndicate")
ticker.mode.forge_syndicate_objectives(M.mind)
ticker.mode.greet_syndicate(M.mind)
SSticker.mode.forge_syndicate_objectives(M.mind)
SSticker.mode.greet_syndicate(M.mind)
//////SYNDICATE BORG
/obj/item/antag_spawner/nuke_ops/borg_tele
@@ -109,13 +110,15 @@
if(switch_roles_choice == "Syndicate Cyborg")
switch_roles = TRUE
rolename = initial(rolename)
else
switch_roles = FALSE
rolename = "Syndicate [borg_to_spawn] Cyborg"
return TRUE
/obj/item/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T, datum/mind/user)
if(!(user in ticker.mode.syndicates))
if(!(user in SSticker.mode.syndicates))
used = FALSE
return
@@ -147,7 +150,7 @@
set_syndicate_values(user.current.client, R)
L.key = C.key
ticker.mode.greet_syndicate(L.mind)
SSticker.mode.greet_syndicate(L.mind)
///////////SLAUGHTER DEMON
@@ -198,7 +201,7 @@
S.key = C.key
S.mind.assigned_role = S.name
S.mind.special_role = S.name
ticker.mode.traitors += S.mind
SSticker.mode.traitors += S.mind
var/datum/objective/assassinate/KillDaWiz = new /datum/objective/assassinate
KillDaWiz.owner = S.mind
KillDaWiz.target = user.mind
@@ -266,7 +269,7 @@
M.mind.assigned_role = SPECIAL_ROLE_MORPH
M.mind.special_role = SPECIAL_ROLE_MORPH
to_chat(M, M.playstyle_string)
ticker.mode.traitors += M.mind
SSticker.mode.traitors += M.mind
var/datum/objective/assassinate/KillDaWiz = new /datum/objective/assassinate
KillDaWiz.owner = M.mind
KillDaWiz.target = user.mind