From a31f1e3722959b59dc5233c0a1afcb3fa04abb6b Mon Sep 17 00:00:00 2001 From: Xhuis Date: Fri, 10 Jun 2016 12:27:52 -0400 Subject: [PATCH] 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))