mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
A lot more Cult fixes (#15161)
* Some fixes 1: ERT members can no longer be given as an assassinate/sacrifice antag objective. 2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace. 3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty) * Cult stuff 1: Cultists can no longer be chosen as a sacrifice target 2: Rune drawing is limited to one at a time (No spamming on one tile) 3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations 4: Changed a couple of colours to use defines * QDELETED() * Eye colour fix * Reorganisation, Objectives, and Gender The majority of the changes here are just reordering the procs, but there's a few fixes too: 1. Roundstart cultists now get given the 'servecult' objective. 2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes. 3. Stopped summoned ghosts from experiencing a spontaneous gender change. * Screwdriver fix * Prayer bead stripping * Some more construct fixes 1: Fixed *all* holy constructs getting the 'Summon soulstone' ability 2: Fixed Wraiths getting their blue light reset to red after jaunting 3: Added a 'holy' variable to constructs, and made the holyification its own proc. * qdeleted * Construct Converting Apparently you can convert holy constructs. Who knew! * Another two weeks Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect. * Grab fix Fixed upgrading a grab having the ability to potentially transport the victim across dimensions. * Not actually a cult fix but eh Fixes: Runtime in outfit.dm, 114: bad number And updates the cult corpse from legion spawns * Teleport spell effect Fixed the teleport effect for the spell being attached to the wrong mob. * Small cleanup * Eye colour cloning fix * Veil Shifter Fixed: Runtime in cult_items.dm,355: pick() from empty list Veil shifters not retaining any grabs after teleporting. * Adjacent
This commit is contained in:
@@ -265,16 +265,11 @@
|
||||
M.SetConfused(0)
|
||||
return
|
||||
if(iscultist(M))
|
||||
SSticker.mode.remove_cultist(M.mind)
|
||||
SSticker.mode.remove_cultist(M.mind, TRUE, TRUE)
|
||||
holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
|
||||
M.SetJitter(0)
|
||||
M.SetStuttering(0)
|
||||
M.SetConfused(0)
|
||||
if(ishuman(M)) // Unequip all cult clothing
|
||||
var/mob/living/carbon/human/H = M
|
||||
for(var/I in H.contents)
|
||||
if(is_type_in_list(I, CULT_CLOTHING))
|
||||
H.unEquip(I)
|
||||
return
|
||||
if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80))
|
||||
var/mob/living/carbon/V = M
|
||||
|
||||
Reference in New Issue
Block a user