demonov na bazy

modular_meta/features/antagonists/includes.dm

@@ -66,7 +66,6 @@
 #include "bloodsuckers\code\vassal\vassal_datum.dm"
 #include "bloodsuckers\code\vassal\vassal_pinpointer.dm"
 #include "bloodsuckers\code\vassal\vassal_procs.dm"
-/* No shitdemons anymore
 #include "sinful_demon\code\powers\jaunt.dm"
 #include "sinful_demon\code\powers\lesserdemon.dm"
 #include "sinful_demon\code\powers\shapeshift.dm"
@@ -80,7 +79,6 @@
 #include "sinful_demon\code\demon_datum.dm"
 #include "sinful_demon\code\demon_objectives.dm"
 #include "sinful_demon\rulesets.dm"
-*/
 
 /datum/modpack/antogonists
 	id = "antagonists"

modular_meta/features/antagonists/sinful_demon/code/demon_datum.dm

@@ -53,7 +53,7 @@
 					L.visible_message(span_warning("[L]'s skin begins to heat up and darken!"), span_danger("Your flesh begins to sear..."))
 				if(60 to 85)
 					L.visible_message(span_warning("[L]'s skin begins to melt apart!"), span_danger("Your skin is melting!"), "You hear sizzling.")
-			L.adjustFireLoss(5)
+			L.adjust_fire_loss(5)
 		else if(L.health < 60)
 			if(!L.on_fire)
 				L.visible_message(span_warning("[L] lights up in a holy blaze!"), span_danger("Your skin catches fire!"))

modular_meta/features/antagonists/sinful_demon/code/powers/jaunt.dm

@@ -4,7 +4,8 @@
 	background_icon_state = "bg_demon"
 	overlay_icon_state = "bg_demon_border"
 	sound = 'sound/effects/magic/fireball.ogg'
-	spell_requirements = NONE
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED //blockin hands cuz deez shitty pants demon bouta run from bloody cuffs
+	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC
 
 	cooldown_time = 50 SECONDS
 

modular_meta/features/antagonists/sinful_demon/code/powers/lesserdemon.dm

@@ -45,7 +45,7 @@
 	if(istype(W, /obj/item/nullrod))
 		visible_message(span_warning("[src] screams in unholy pain from the blow!"), \
 						span_cult("As \the [W] hits you, you feel holy power blast through your form, tearing it apart!"))
-		adjustBruteLoss(22) //22(0) extra damage from the nullrod while in your true form of massmeta. On average this means 40 damage is taken now.
+		adjust_brute_loss(22) //22(0) extra damage from the nullrod while in your true form of massmeta. On average this means 40 damage is taken now.
 
 /mob/living/simple_animal/lesserdemon/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)//10 hp healed from landing a hit.
 	if(!isliving(attack_target))

modular_meta/features/antagonists/sinful_demon/code/powers/shapeshift.dm

@@ -7,8 +7,9 @@
 	button_icon_state = "daemontransform"
 	background_icon_state = "bg_demon"
 	overlay_icon_state = "bg_demon_border"
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED //blockin hands cuz deez shitty pants demon bouta run from bloody cuffs
 
 	invocation = "COWER, MORTALS!!"
 
 	possible_shapes = list(/mob/living/simple_animal/lesserdemon)
-	spell_requirements = NONE
+	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC

modular_meta/features/antagonists/sinful_demon/code/powers/torment.dm

@@ -36,7 +36,7 @@
 	victim.adjust_hallucinations(20 SECONDS)
 	victim.Immobilize(3 SECONDS)
 	victim.Stun(1 SECONDS)
-	victim.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
+	victim.adjust_organ_loss(ORGAN_SLOT_BRAIN, 10)
 	victim.visible_message(span_danger("[victim] cringes in pain as they hold their head for a second!"))
 	victim.emote("scream")
 	to_chat(victim, span_warning("You feel an explosion of pain erupt in your mind!"))

modular_meta/features/antagonists/sinful_demon/code/sins/gluttony.dm

@@ -44,7 +44,7 @@
 	visible_message(
 		span_danger("[src] devours [L]!"),
 		span_userdanger("You feast on [L], restoring your health!"))
-	adjustBruteLoss(-50)
+	adjust_brute_loss(-50)
 	L.gib()
 	return TRUE
 

modular_meta/features/antagonists/sinful_demon/code/sins/greed.dm

@@ -8,6 +8,7 @@
 
 	invocation = "Just one game?"
 	invocation_type = INVOCATION_WHISPER
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED
 	spell_requirements = NONE
 
 	cooldown_time = 30 SECONDS
@@ -29,6 +30,7 @@
 
 	invocation = "Power beyond measure"
 	invocation_type = INVOCATION_WHISPER
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED
 	spell_requirements = NONE
 
 	cooldown_time = 180 SECONDS //no farming a bunch of items

modular_meta/features/antagonists/sinful_demon/code/sins/pride.dm

@@ -1,13 +1,14 @@
 /datum/action/cooldown/spell/conjure/summon_mirror
 	name = "Summon Mirror"
 	desc = "Summon forth a temporary mirror of sin that will allow you and others to change anything they want about themselves."
-	button_icon = 'icons/mob/actions/actions_minor_antag.dmi'
+	button_icon = 'modular_meta/features/antagonists/icons/actions_minor_antag.dmi'
 	button_icon_state = "magic_mirror"
 	background_icon_state = "bg_demon"
 	overlay_icon_state = "bg_demon_border"
 
 	invocation = "Aren't I so amazing?"
 	invocation_type = INVOCATION_WHISPER
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED
 	spell_requirements = NONE
 
 	cooldown_time = 30 SECONDS
@@ -44,8 +45,8 @@
 		..()
 		return TRUE
 	playsound(caster, 'sound/effects/magic/demon_attack1.ogg', 75, TRUE)
-	victim.adjustBruteLoss(-20)
-	victim.adjustFireLoss(-20)
+	victim.adjust_brute_loss(-20)
+	victim.adjust_fire_loss(-20)
 	victim.visible_message(span_bold("[victim] appears to flash colors of red, before seemingly appearing healthier!"))
 	to_chat(victim, span_warning("You feel a sinister feeling of recovery."))
 	return TRUE

modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm

@@ -47,7 +47,7 @@
 	playsound(caster, 'sound/effects/magic/demon_attack1.ogg', 75, TRUE)
 	victim.adjust_eye_blur(20) //huge array of relatively minor effects.
 	victim.Stun(3 SECONDS)
-	victim.adjustOrganLoss(ORGAN_SLOT_EYES, 10)
+	victim.adjust_organ_loss(ORGAN_SLOT_EYES, 10)
 	victim.visible_message(span_danger("[victim] yawns and want close eyes!"))
 	victim.emote("yawn")
 	to_chat(victim, span_warning("You want to sleep!"))

modular_meta/features/antagonists/sinful_demon/code/sins/wrath.dm

@@ -19,6 +19,7 @@
 	button_icon_state = "generic_fire"
 	active_msg = "You prepare to ignite a target..."
 	ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi'
+	background_icon_state = "bg_demon"
 	overlay_icon_state = "bg_demon_border"
 
 	school = SCHOOL_TRANSMUTATION
@@ -37,7 +38,7 @@
 
 	if(!isliving(target))
 		return FALSE
-	
+
 	var/mob/living/T = target
 	T.adjust_fire_stacks(WRATHFUL_FIRE_AMOUNT)
 	T.ignite_mob()

modular_meta/features/antagonists/sinful_demon/rulesets.dm

@@ -10,8 +10,13 @@
 	pref_flag = ROLE_SINFULDEMON
 	jobban_flag = ROLE_TRAITOR
 	preview_antag_datum = /datum/antagonist/sinfuldemon
-	min_pop = 30 //Не самая лучшая идея была - пихать сакеров и дерьмодемонов в один модуль.
-	weight = 10
+	min_pop = 10
+	weight = alist(
+		DYNAMIC_TIER_LOW = 0,
+		DYNAMIC_TIER_LOWMEDIUM = 2,
+		DYNAMIC_TIER_MEDIUMHIGH = 3,
+		DYNAMIC_TIER_HIGH = 3,
+	)
 	max_antag_cap = list("denominator" = 24)
 	blacklisted_roles = list(
 		JOB_CHAPLAIN,
@@ -32,8 +37,8 @@
 	preview_antag_datum = /datum/antagonist/sinfuldemon
 	pref_flag = ROLE_DEMONINFILTRATION
 	jobban_flag = ROLE_TRAITOR
-	min_pop = 30 // Выставить на 10, когда дерьмодемоны опять понадобятся.
-	weight = 5
+	min_pop = 15
+	weight = 2
 	blacklisted_roles = list(
 		JOB_CHAPLAIN,
 	)