mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
Datumizes Cult. (#24379)
* cult 1 * massive data refactor * progress * More crap * IM SCARED IT COMPILES * oops * more fixes * good comment * hell yeah, team control * lol * blamo * blam * More stuff * team refactor * epic merge fail * src not _src_ * more * progress * cult * more stuff * water * goodbye __IMPLIED_TYPE__ * time to undraft * FUCK FUCK FUCK * okay this is better * goodbye todos * fix * order of operations * last fix? maybe * yeah * oops * okay this should be ALL the fixes * wow * hell yeah * wow * fixes duplicate teams + adds more team safeties * how the fuck did this happen * admin objective improvements * wah more bullshit * guh * fuuuuck * fucking hell * fixes
This commit is contained in:
@@ -180,11 +180,27 @@
|
||||
return
|
||||
if(M.stat != CONSCIOUS)
|
||||
to_chat(user, "<span class='warning'>They must be conscious before you can convert [M.p_them()]!</span>")
|
||||
else if(SSticker.mode.add_revolutionary(M.mind))
|
||||
else if(add_revolutionary(M.mind))
|
||||
times_used-- //Flashes less likely to burn out for headrevs when used for conversion
|
||||
else
|
||||
to_chat(user, "<span class='warning'>This mind seems resistant to [src]!</span>")
|
||||
|
||||
/obj/item/flash/proc/add_revolutionary(datum/mind/converting_mind)
|
||||
var/mob/living/carbon/human/conversion_target = converting_mind.current
|
||||
if(converting_mind.assigned_role in GLOB.command_positions)
|
||||
return FALSE
|
||||
if(!istype(conversion_target))
|
||||
return FALSE
|
||||
if(ismindshielded(conversion_target))
|
||||
return FALSE
|
||||
if(converting_mind.has_antag_datum(/datum/antagonist/rev))
|
||||
return FALSE
|
||||
converting_mind.add_antag_datum(/datum/antagonist/rev)
|
||||
|
||||
conversion_target.Silence(10 SECONDS)
|
||||
conversion_target.Stun(10 SECONDS)
|
||||
return TRUE
|
||||
|
||||
/obj/item/flash/cyborg
|
||||
origin_tech = null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user