From 9189573630315bf3eb7818806bb1b0f404d141a8 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Fri, 10 Jun 2016 12:14:51 -0400 Subject: [PATCH 1/2] Makes cult magic more effective against servants --- code/game/gamemodes/cult/cult.dm | 2 + code/game/gamemodes/cult/cult_items.dm | 52 +++++++++++++++++++------- code/game/gamemodes/cult/runes.dm | 9 ++++- code/game/gamemodes/cult/talisman.dm | 9 ++++- 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2cb5b365149..9668197b02e 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -31,6 +31,8 @@ return 0 if(mind.enslaved_to) return 0 + if(is_servant_of_ratvar(mind.current)) + return 0 return 1 /datum/game_mode/cult diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 5607b1f6bdf..0e942c5f2fc 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -29,9 +29,19 @@ /obj/item/weapon/melee/cultblade/pickup(mob/living/user) ..() if(!iscultist(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" - user.Dizzy(120) + if(!is_servant_of_ratvar(user)) + user << "\"I wouldn't advise that.\"" + user << "An overwhelming sense of nausea overpowers you!" + user.Dizzy(120) + else + user << "\"One of Ratvar's toys is trying to play with things \he shouldn't. Cute.\"" + user << "A horrible force yanks at your arm!" + user.emote("scream") + if(user.l_hand == src) + user.apply_damage(30, BRUTE, "l_arm") + else if(user.r_hand == src) + user.apply_damage(30, BRUTE, "r_arm") + user.drop_item() /obj/item/weapon/melee/cultblade/dagger name = "sacrificial dagger" @@ -48,6 +58,8 @@ if(iscarbon(target)) var/mob/living/carbon/C = target C.bleed(50) + if(is_servant_of_ratvar(C) && C.reagents) + C.reagents.add_reagent("heparin", 1) /obj/item/weapon/restraints/legcuffs/bola/cult @@ -169,11 +181,18 @@ /obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/user, slot) ..() if(!iscultist(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" - user.unEquip(src, 1) - user.Dizzy(30) - user.Weaken(5) + if(!is_servant_of_ratvar(user)) + user << "\"I wouldn't advise that.\"" + user << "An overwhelming sense of nausea overpowers you!" + user.unEquip(src, 1) + user.Dizzy(30) + user.Weaken(5) + else + user << "\"Putting on things you don't own is bad, you know.\"" + user << "The armor squeezes at your body!" + user.emote("scream") + user.adjustBruteLoss(25) + user.unEquip(src, 1) /obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands) if(current_charges) @@ -216,11 +235,18 @@ /obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/user, slot) ..() if(!iscultist(user)) - user << "\"I wouldn't advise that.\"" - user << "An overwhelming sense of nausea overpowers you!" - user.unEquip(src, 1) - user.Dizzy(30) - user.Weaken(5) + if(!is_servant_of_ratvar(user)) + user << "\"I wouldn't advise that.\"" + user << "An overwhelming sense of nausea overpowers you!" + user.unEquip(src, 1) + user.Dizzy(30) + user.Weaken(5) + else + user << "\"Putting on things you don't own is bad, you know.\"" + user << "The robes squeeze at your body!" + user.emote("scream") + user.adjustBruteLoss(25) + user.unEquip(src, 1) /obj/item/clothing/glasses/night/cultblind desc = "May nar-sie guide you through the darkness and shield you from the light." diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 54f0d5e39f3..3909c2c31e3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -319,6 +319,10 @@ var/list/teleport_runes = list() else if(is_sacrifice_target(M.mind)) for(var/C in invokers) C << "\"I desire this one for myself. SACRIFICE THEM!\"" + else if(is_servant_of_ratvar(M)) + M.visible_message("[M]'s eyes glow a defiant yellow!", \ + "\"Stop resisting. You will be mi-\" \"Give up and you will feel pain unlike anything you've ever felt!\"") + M.Weaken(4) if(!convertees.len) fail_invoke() log_game("Convert rune failed - no eligible convertees") @@ -634,7 +638,7 @@ var/list/teleport_runes = list() playsound(E, 'sound/magic/Disable_Tech.ogg', 100, 1) for(var/M in invokers) var/mob/living/L = M - L << "You chant in unison and a colossal burst of energy knocks you backward!" + L << "You chant in unison and a colossal burst of energy knocks you backward!" L.Weaken(2) qdel(src) //delete before pulsing because it's a delay reee empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters @@ -815,6 +819,9 @@ var/list/teleport_runes = list() C << "Your blood boils in your veins!" C.take_overall_damage(45,45) C.Stun(7) + if(is_servant_of_ratvar(C)) + C << "You feel unholy darkness dimming the Justiciar's light!" + C.adjustStaminaLoss(30) for(var/M in invokers) var/mob/living/L = M L.apply_damage(15, BRUTE, pick("l_arm", "r_arm")) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index e1c5f6c3350..eca56e0ffd5 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -249,12 +249,14 @@ if(issilicon(target)) var/mob/living/silicon/S = target S.emp_act(1) - if(iscarbon(target)) + else if(iscarbon(target)) var/mob/living/carbon/C = target C.silent += 5 C.stuttering += 15 C.cultslurring += 15 C.Jitter(15) + if(is_servant_of_ratvar(target)) + target.adjustBruteLoss(15) user.drop_item() qdel(src) return @@ -302,6 +304,11 @@ if(iscarbon(target)) var/mob/living/carbon/H = target H.reagents.add_reagent("mindbreaker", 25) + if(is_servant_of_ratvar(target)) + target << "You see a brief but horrible vision of Ratvar, rusted and scrapped, being torn apart." + target.emote("scream") + target.confused = max(0, target.confused + 3) + target.flash_eyes() qdel(src) From a31f1e3722959b59dc5233c0a1afcb3fa04abb6b Mon Sep 17 00:00:00 2001 From: Xhuis Date: Fri, 10 Jun 2016 12:27:52 -0400 Subject: [PATCH 2/2] Now it compiles! --- code/game/gamemodes/cult/cult_items.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 0e942c5f2fc..012255bf82a 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -34,14 +34,11 @@ user << "An overwhelming sense of nausea overpowers you!" user.Dizzy(120) else - user << "\"One of Ratvar's toys is trying to play with things \he shouldn't. Cute.\"" + user << "\"One of Ratvar's toys is trying to play with things [user.gender == FEMALE ? "s" : ""]he shouldn't. Cute.\"" user << "A horrible force yanks at your arm!" user.emote("scream") - if(user.l_hand == src) - user.apply_damage(30, BRUTE, "l_arm") - else if(user.r_hand == src) - user.apply_damage(30, BRUTE, "r_arm") - user.drop_item() + user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) + user.unEquip(src) /obj/item/weapon/melee/cultblade/dagger name = "sacrificial dagger" @@ -178,7 +175,7 @@ flags = NODROP flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS -/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/user, slot) +/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot) ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) @@ -232,7 +229,7 @@ flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS armor = list(melee = -100, bullet = -100, laser = -100,energy = -100, bomb = -100, bio = -100, rad = -100) -/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/user, slot) +/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot) ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user))