From c7b4179e4676c1ce2cd1c5c705cdb21e847c560e Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Mon, 8 Apr 2019 19:10:10 +0200 Subject: [PATCH] Make reinforcements spawn with basic gear and 0 telecrystals --- code/game/gamemodes/nuclear/nuclear.dm | 5 ++--- code/modules/antagonists/_common/antag_spawner.dm | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b4e797b97d5..d19d2dd7cc5 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -252,7 +252,7 @@ proc/issyndicate(mob/living/M as mob) return 1337 // WHY??? -- Doohl -/datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob) +/datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob, uplink_uses = 20) var/radio_freq = SYND_FREQ var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob) @@ -269,7 +269,7 @@ proc/issyndicate(mob/living/M as mob) synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), slot_wear_pda) var/obj/item/radio/uplink/nuclear/U = new /obj/item/radio/uplink/nuclear(synd_mob) U.hidden_uplink.uplink_owner="[synd_mob.key]" - U.hidden_uplink.uses = 20 + U.hidden_uplink.uses = uplink_uses synd_mob.equip_to_slot_or_del(U, slot_in_backpack) if(synd_mob.dna.species) @@ -307,7 +307,6 @@ proc/issyndicate(mob/living/M as mob) synd_mob.update_icons() return 1 - /datum/game_mode/nuclear/check_win() if(nukes_left == 0) return 1 diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index bc6276010ad..d2754af04fc 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -61,12 +61,14 @@ /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) - C.prefs.copy_to(M) + ticker.mode.create_syndicate(user) + ticker.mode.equip_syndicate(M, 0) var/agent_number = LAZYLEN(ticker.mode.syndicates) M.real_name = "[syndicate_name()] Operative #[agent_number]" set_syndicate_values(C, M) + ticker.mode.update_syndicate_id(user, FALSE) /obj/item/antag_spawner/nuke_ops/proc/set_syndicate_values(client/C, mob/living/M) M.key = C.key @@ -79,6 +81,7 @@ M.mind.offstation_role = TRUE M.faction = list("syndicate") + ticker.mode.forge_syndicate_objectives(M.mind) ticker.mode.greet_syndicate(M.mind) //////SYNDICATE BORG