mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-05 23:13:06 +00:00
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
This commit is contained in:
@@ -105,7 +105,7 @@ var/list/sacrificed = list()
|
||||
continue
|
||||
usr.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!")
|
||||
M.visible_message("\red [M] writhes in pain as the markings below \him glow a bloody red.", \
|
||||
"\red AAAAAAHHHH!.", \
|
||||
"\red AAAAAAHHHH!", \
|
||||
"\red You hear an anguished scream.")
|
||||
if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
set name = "System Override"
|
||||
set desc = "Start the victory timer"
|
||||
if (!istype(ticker.mode,/datum/game_mode/malfunction))
|
||||
usr << "You cannot begin a takeover in this round type!."
|
||||
usr << "You cannot begin a takeover in this round type!"
|
||||
return
|
||||
if (ticker.mode:malf_mode_declared)
|
||||
usr << "You've already begun your takeover."
|
||||
|
||||
Reference in New Issue
Block a user