diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 933d8ff2db8..e90d8b98c50 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -488,20 +488,20 @@ if(ticker.mode.config_tag == "handofgod") text = uppertext(text) text = "[text]: " - if(src in ticker.mode.red_deity_prophets) - text += "RED PROPHET|red follower|employee|blue follower|blue prophet|red god|blue god" + if (src in ticker.mode.red_deities) + text += "RED GOD|red prophet|red follower|employee|blue god|blue prophet|blue follower" + else if(src in ticker.mode.red_deity_prophets) + text += "red god|RED PROPHET|red follower|employee|blue god|blue prophet|blue follower" else if (src in ticker.mode.red_deity_followers) - text += "red prophet|RED FOLLOWER|employee|blue follower|blue prophet|red god|blue god" - else if (src in ticker.mode.blue_deity_followers) - text += "red prophet|red follower|employee|BLUE FOLLOWER|blue prophet|red god|blue god" - else if (src in ticker.mode.blue_deity_prophets) - text += "red prophet|red follower|employee|blue follower|BLUE PROPHET|red god|blue god" - else if (src in ticker.mode.red_deities) - text += "red prophet|red follower|employee|blue follower|blue prophet|RED GOD|blue god" + text += "red god|red prophet|RED FOLLOWER|employee|blue god|blue prophet|blue follower" else if (src in ticker.mode.blue_deities) - text += "red prophet|red follower|employee|blue follower|blue prophet|red god|BLUE GOD" + text += "red god|red prophet|red follower|employee|BLUE GOD|blue prophet|blue follower" + else if (src in ticker.mode.blue_deity_prophets) + text += "red god|red prophet|red follower|employee|blue god|BLUE PROPHET|blue follower" + else if (src in ticker.mode.blue_deity_followers) + text += "red god|red prophet|red follower|employee|blue god|blue prophet|BLUE FOLLOWER" else - text += "red prophet|red follower|EMPLOYEE|blue follower|blue prophet|red god|blue god" + text += "red god|red prophet|red follower|EMPLOYEE|blue god|blue prophet|blue follower" if(current && current.client && (ROLE_HOG_GOD in current.client.prefs.be_special)) text += "|HOG God Enabled in Prefs" diff --git a/code/game/gamemodes/handofgod/_handofgod.dm b/code/game/gamemodes/handofgod/_handofgod.dm index d5375834943..afba1ce73cf 100644 --- a/code/game/gamemodes/handofgod/_handofgod.dm +++ b/code/game/gamemodes/handofgod/_handofgod.dm @@ -358,7 +358,7 @@ var/global/list/global_handofgod_structuretypes = list() text += "
Red follower count: [red_deity_followers.len]" text += "
Red followers: " for(var/datum/mind/player in red_deity_followers) - text += "[player.name] ([player.key])" + text += "[player.name] ([player.key]), " var/objectives = "" if(red_god.objectives.len) diff --git a/code/game/gamemodes/handofgod/actions.dm b/code/game/gamemodes/handofgod/actions.dm index 762a8b4d683..9f6b01f8dff 100644 --- a/code/game/gamemodes/handofgod/actions.dm +++ b/code/game/gamemodes/handofgod/actions.dm @@ -1,6 +1,4 @@ - - - +/* Prophet's innate godspeak */ /datum/action/innate/godspeak name = "Godspeak" button_icon_state = "godspeak" @@ -17,8 +15,12 @@ var/msg = input(owner,"Speak to your god","Godspeak","") as null|text if(!msg) return - god << "[owner]: [msg]" - owner << "You say: [msg]" + var/rendered = "Prophet [owner]: [msg]" + god << rendered + owner << rendered + for(var/mob/M in mob_list) + if(isobserver(M)) + M << "(F) [rendered]" /datum/action/innate/godspeak/Destroy() god = null diff --git a/code/game/gamemodes/handofgod/god.dm b/code/game/gamemodes/handofgod/god.dm index 7dcd5b5f933..39deb470840 100644 --- a/code/game/gamemodes/handofgod/god.dm +++ b/code/game/gamemodes/handofgod/god.dm @@ -31,9 +31,9 @@ update_icons() build_hog_construction_lists() - //Force nexuses after 2 minutes in hand of god mode + //Force nexuses after 15 minutes in hand of god mode if(ticker && ticker.mode && ticker.mode.name == "hand of god") - addtimer(src, "forceplacenexus", 1200, FALSE) + addtimer(src, "forceplacenexus", 9000, FALSE) //Rebuilds the list based on the gamemode's lists @@ -197,12 +197,13 @@ return msg = say_quote(msg, get_spans()) - var/rendered = "Divine Telepathy, [name] [msg]" + var/rendered = "Divine Telepathy, [name] [msg]" for(var/mob/M in mob_list) - if(is_handofgod_myfollowers(M) || isobserver(M)) - M.show_message(rendered, 2) - src << rendered + if(is_handofgod_god(M) || is_handofgod_myfollowers(M)) + M << rendered + if(isobserver(M)) + M << "(F) [rendered]" /mob/camera/god/emote(act,m_type = 1 ,msg = null) diff --git a/code/game/gamemodes/handofgod/items.dm b/code/game/gamemodes/handofgod/items.dm index 9d63f86c773..f512c5c11cb 100644 --- a/code/game/gamemodes/handofgod/items.dm +++ b/code/game/gamemodes/handofgod/items.dm @@ -1,5 +1,3 @@ - - /obj/item/weapon/banner name = "banner" icon = 'icons/obj/items.dmi' diff --git a/code/game/gamemodes/handofgod/powers.dm b/code/game/gamemodes/handofgod/powers.dm index a783595352d..30b3365cfcd 100644 --- a/code/game/gamemodes/handofgod/powers.dm +++ b/code/game/gamemodes/handofgod/powers.dm @@ -1,4 +1,3 @@ - /mob/camera/god/proc/ability_cost(cost = 0,structures = 0, requires_conduit = 0, can_place_near_enemy_nexus = 0) if(faith < cost) src << "You lack the faith!" @@ -127,7 +126,7 @@ var/mob/living/carbon/human/H = choice.current var/popehat = null var/popestick = null - + var/success = "" switch(side) if("red") popehat = /obj/item/clothing/head/helmet/plate/crusader/prophet/red @@ -139,22 +138,28 @@ if(popehat) var/obj/item/clothing/head/helmet/plate/crusader/prophet/P = new popehat() - H.unEquip(H.head) - H << "A powerful hat has been bestowed upon your head, you will need to wear this to utilize your staff fully.." - H.equip_to_slot_or_del(P,slot_head) + if(H.equip_to_slot_if_possible(P,slot_in_backpack,0,1,1)) + success = "It is in your backpack." + else + H.unEquip(H.head) + H.equip_to_slot_or_del(P,slot_head) + success = "It is on your head." + + if(success) + H << "A powerful hat has been bestowed upon you, you will need to wear it to utilize your staff fully." + H << "[success]" if(popestick) var/obj/item/weapon/godstaff/G = new popestick() G.god = src - var/success = "" - if(!H.put_in_hands(G)) - if(!H.equip_to_slot_if_possible(G,slot_in_backpack,0,1,1)) + if(!H.equip_to_slot_if_possible(G,slot_in_backpack,0,1,1)) + if(!H.put_in_hands(G)) G.loc = get_turf(H) success = "It is on the floor..." else - success = "It is in your backpack..." + success = "It is in your hands..." else - success = "It is in your hands..." + success = "It is in your backpack..." if(success) H << "A powerful staff has been bestowed upon you, you can use this to convert the false god's structures!" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index d0aae03c7b1..b8e4aee8728 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -474,6 +474,8 @@ var/mob/M = N.current if(M) dat += "Red Deity: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.blue_deities.len) @@ -482,6 +484,8 @@ var/mob/M = N.current if(M) dat += "Blue Deity: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.red_deity_prophets.len) @@ -490,6 +494,8 @@ var/mob/M = N.current if(M) dat += "Red Deity Prophet: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.blue_deity_prophets.len) @@ -498,6 +504,8 @@ var/mob/M = N.current if(M) dat += "Blue Deity Prophet: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.red_deity_followers.len) @@ -506,6 +514,8 @@ var/mob/M = N.current if(M) dat += "Red Deity Followers: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.blue_deity_followers.len) @@ -514,6 +524,8 @@ var/mob/M = N.current if(M) dat += "Blue Deity Followers: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" + dat += "PM" + dat += "FLW" dat += "" if(ticker.mode.traitors.len > 0) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 7108940c287..094bcb2cc40 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -284,6 +284,7 @@ health = INFINITY maxhealth = INFINITY var/team = WHITE_TEAM + constructable = FALSE time_between_triggers = 1 alpha = 255