diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index faa547d1278..d7f8528c11c 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -180,8 +180,8 @@ datum/game_mode/mutiny return 1 proc/check_antagonists_ui(admins) - var/turf/captains_key_loc = captains_key ? captains_key.get_turf() : "Lost or Destroyed" - var/turf/secondary_key_loc = secondary_key ? secondary_key.get_turf() : "Lost or Destroyed" + var/turf/captains_key_loc = captains_key ? get_turf(captains_key) : "Lost or Destroyed" + var/turf/secondary_key_loc = secondary_key ? get_turf(secondary_key) : "Lost or Destroyed" var/txt = {"
@@ -305,7 +305,7 @@ datum/game_mode/mutiny log_admin("[src]([src.ckey]) attempted to recruit [M] as a loyalist.") message_admins("\red [src]([src.ckey]) attempted to recruit [M] as a loyalist.") - var/choice = alert(M, "Asked by [src]: Will you help me complete Directive X?", "Loyalist recruitment", "No", "Yes") + var/choice = alert(M, "Asked by [src]: Will you help me complete Directive X?", "Loyalist recruitment", "Yes", "No") if(choice == "Yes") mode.add_loyalist(M.mind) else if(choice == "No") @@ -336,7 +336,7 @@ datum/game_mode/mutiny log_admin("[src]([src.ckey]) attempted to recruit [M] as a mutineer.") message_admins("\red [src]([src.ckey]) attempted to recruit [M] as a mutineer.") - var/choice = alert(M, "Asked by [src]: Will you help me stop Directive X?", "Mutineer recruitment", "No", "Yes") + var/choice = alert(M, "Asked by [src]: Will you help me stop Directive X?", "Mutineer recruitment", "Yes", "No") if(choice == "Yes") mode.add_mutineer(M.mind) else if(choice == "No") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9cb71a6f0bd..2e27cc699fb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -543,11 +543,13 @@ /obj/item/proc/IsShield() return 0 +/* /obj/item/proc/get_turf() var/atom/L = loc while(L && !istype(L, /turf/)) L = L.loc return loc +*/ /obj/item/proc/eyestab(mob/living/carbon/M as mob, mob/living/carbon/user as mob) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index df2c7ff826b..b0bcd11105f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1889,6 +1889,10 @@ holder.icon_state = "hudvampire" if("VampThrall") holder.icon_state = "hudvampthrall" + if("head_loyalist") + holder.icon_state = "loyalist" + if("head_mutineer") + holder.icon_state = "mutineer" hud_list[SPECIALROLE_HUD] = holder