From 64f415d3512ec2a56453b095b4a1f0e95e08e8d1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 29 May 2016 00:54:34 -0400 Subject: [PATCH] stupid antag hud --- code/datums/mind.dm | 4 ++-- code/game/gamemodes/cult/cult.dm | 11 ++++++----- code/game/gamemodes/cult/cult_items.dm | 3 +-- code/game/gamemodes/cult/cult_objectives.dm | 15 ++++++++++++--- code/game/gamemodes/cult/runes.dm | 1 + code/game/gamemodes/cult/talisman.dm | 6 +++--- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 3173c201e12..d95b1424686 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -799,8 +799,8 @@ if(!(src in ticker.mode.cult)) ticker.mode.add_cultist(src) special_role = "Cultist" - to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") - to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.mode.cultdat.entity_title2] above all else. Bring It back.") + to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") + to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.mode.cultdat.entity_title2] above all else. Bring It back.") log_admin("[key_name(usr)] has culted [key_name(current)]") message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]") if("tome") diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 9771b1b64f0..1cbcf5ecbaf 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -41,7 +41,7 @@ var/global/list/all_cults = list() config_tag = "cult" restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician") protected_jobs = list() - required_players = 1 + required_players = 30 required_enemies = 3 recommended_enemies = 4 @@ -119,9 +119,11 @@ var/global/list/all_cults = list() for(var/datum/mind/cult_mind in cult) equip_cultist(cult_mind.current) + cult_mind.current.faction |= "cult" + var/datum/action/cultcomm/C = new() + C.Grant(cult_mind.current) update_cult_icons_added(cult_mind) - add_cultist(cult_mind) - to_chat(cult_mind.current, " You are a member of the cult!")//need fluffier text here... + to_chat(cult_mind.current, "You catch a glimpse of the Realm of [cultdat.entity_name], [cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [cultdat.entity_name].") first_phase() @@ -180,13 +182,13 @@ var/global/list/all_cults = list() return 0 if(!(cult_mind in cult) && is_convertable_to_cult(cult_mind)) cult += cult_mind - update_cult_icons_added(cult_mind) cult_mind.current.faction |= "cult" var/datum/action/cultcomm/C = new() C.Grant(cult_mind.current) cult_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the cult!" if(jobban_isbanned(cult_mind.current, ROLE_CULTIST)) replace_jobbaned_player(cult_mind.current, ROLE_CULTIST) + update_cult_icons_added(cult_mind) return 1 @@ -212,7 +214,6 @@ var/global/list/all_cults = list() /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind) - var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT] culthud.join_hud(cult_mind.current) set_antag_hud(cult_mind.current, "hudcultist") diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index c81d30ff3cd..69e3ad13212 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -48,11 +48,10 @@ H.drip(500) -/obj/item/weapon/legcuffs/bola/cult +/obj/item/weapon/legcuffs/bolas/cult name = "runed bola" desc = "A strong bola, bound with dark magic. Throw it to trip and slow your victim." icon_state = "bola_cult" - item_state = "bola_cult" breakouttime = 45 /obj/item/clothing/head/culthood diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index 2a60eed279e..6ef99ac0905 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -46,7 +46,6 @@ message_admins("Picking a new Cult objective.") var/new_objective = "eldergod" - var/dieanotherday = 0//if we have less then four cultists.. //the idea here is that if the cult performs well, the should get more objectives before they can summon Nar-Sie. if(cult.len >= 4)//if there are less than 4 remaining cultists, they get a free pass to the summon objective. if(current_objective <= prenarsie_objectives) @@ -62,7 +61,7 @@ else message_admins("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") log_admin("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") - dieanotherday = 1 + gtfo_phase() if(!sacrificed.len && (new_objective != "sacrifice")) sacrifice_target = null @@ -94,11 +93,21 @@ blood_check()//in case there are already enough blood covered tiles when the objective is given. +/datum/game_mode/cult/proc/gtfo_phase()//YOU HAD ONE JOB + var/explanation + objectives +="survive" + explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station." + for(var/datum/mind/cult_mind in cult) + to_chat(cult_mind.current, "You and your acolytes suddenly feel the urge to do your best, but survive!") + to_chat(cult_mind.current, "Objective Survive: [explanation]") + cult_mind.memory += "Objective Survive: [explanation]
" + + /datum/game_mode/cult/proc/second_phase() narsie_condition_cleared = 1 var/explanation - if(prob(50))//split the chance of this + if(prob(40))//split the chance of this objectives += "eldergod" explanation = "Summon [ticker.mode.cultdat.entity_name] on the Station via the use of the Tear Reality rune." else diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 15af74ca00c..ddc060c1cb9 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -595,6 +595,7 @@ var/list/teleport_runes = list() new /mob/living/simple_animal/slaughter/cult(T, pick(NORTHEAST, SOUTHEAST, NORTHWEST, SOUTHWEST)) cult_mode.demons_summoned = 1 shuttle_master.emergency.request(null, 0.5,null) + cult_mode.third_phase() qdel(src) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index a51404ffae7..8b44d526e99 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -247,7 +247,7 @@ var/mob/living/carbon/C = target C.silent += 5 C.stuttering += 15 - C.cultslurring += 15 + C.cultslurring += 5 C.Jitter(15) user.drop_item() qdel(src) @@ -270,7 +270,7 @@ user.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) user.drop_item() user.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) - user.put_in_hands(new /obj/item/weapon/legcuffs/bola/cult(user)) + user.put_in_hands(new /obj/item/weapon/legcuffs/bolas/cult(user)) /obj/item/weapon/paper/talisman/armor/attack(mob/living/target, mob/living/user) if(iscultist(user) && iscultist(target)) @@ -292,7 +292,7 @@ to_chat(user, "You disturb [target] with visons of the end!") if(iscarbon(target)) var/mob/living/carbon/H = target - H.reagents.add_reagent("lsd", 25) + H.reagents.add_reagent("lsd", 10) qdel(src)