From 89f10e834c1b59e1c2f89ae10242068b2c10c55b Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 4 Apr 2017 23:46:55 +0100 Subject: [PATCH 1/2] boom --- code/game/objects/items/weapons/cigs.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 810b5a95749..2b1a991a220 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -95,6 +95,17 @@ LIGHTERS ARE IN LIGHTERS.DM else if(istype(W, /obj/item/device/assembly/igniter)) light("[user] fiddles with [W], and manages to light their [name].") + else if(istype(W, /obj/item/weapon/gun/magic/wand/fireball)) + var/obj/item/weapon/gun/magic/wand/fireball/F = W + if(F.charges) + if(prob(50)) + light("Trying painfully hard to be cool, [user] manages to light their [name] with [W], singing their eyebrows.") + else + to_chat(user, "You aren't cool enough to light your [name] with [W].") + explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) + F.charges-- + + //can't think of any other way to update the overlays :< user.update_inv_wear_mask() user.update_inv_l_hand() From 4fc96b7d219eee7034b090a05e7476d8ba4924e5 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Apr 2017 00:59:04 +0100 Subject: [PATCH 2/2] Wizards always succeed By request of Fox. --- code/game/objects/items/weapons/cigs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 2b1a991a220..cf28c47a719 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -98,10 +98,10 @@ LIGHTERS ARE IN LIGHTERS.DM else if(istype(W, /obj/item/weapon/gun/magic/wand/fireball)) var/obj/item/weapon/gun/magic/wand/fireball/F = W if(F.charges) - if(prob(50)) - light("Trying painfully hard to be cool, [user] manages to light their [name] with [W], singing their eyebrows.") + if(prob(50) || user.mind.assigned_role == "Wizard") + light("Holy shit, did [user] just manage to light their [name] with [W], with only moderate eyebrow singing?") else - to_chat(user, "You aren't cool enough to light your [name] with [W].") + to_chat(user, "Unsure which end of the wand is which, [user] fails to light [name] with [W].") explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) F.charges--