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

Mutiny fixes

Browse Source
This commit is contained in:
ZomgPonies
2014-05-15 03:16:48 -04:00
parent a545590f68
commit a2b05d96f5
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/mutiny/mutiny.dm
+4 -4
View File
@@ -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 = {"
<h5>Context:</h5>
<p>
@@ -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")
code/game/objects/items.dm
+2
View File
@@ -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)
code/modules/mob/living/carbon/human/life.dm
+4
View File
@@ -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