From 2b9f242659ca43c8a9ba788fed55f781ec26f19b Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 7 Jun 2015 11:04:57 -0700 Subject: [PATCH] Spellbook Overhaul; Remove rightandwrong antag making, href sanitizing Rightandwrong will no longer have a 25% chance to make people antags, since the spellbook overhaul makes it give a spellslot. --- code/game/gamemodes/wizard/rightandwrong.dm | 12 ------------ code/game/gamemodes/wizard/spellbook.dm | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 6d27d3fd636..33425ebd135 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -10,18 +10,6 @@ if(H.stat == 2 || !(H.client)) continue if(H.mind) if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice") continue - if(prob(25) && !(H.mind in ticker.mode.traitors)) - ticker.mode.traitors += H.mind - H.mind.special_role = "traitor" - var/datum/objective/survive/survive = new - survive.owner = H.mind - H.mind.objectives += survive - H.attack_log += "\[[time_stamp()]\] Was made into a survivor, and trusts no one!" - H << "You are the survivor! Your own safety matters above all else, trust no one and kill anyone who gets in your way. However, armed as you are, now would be the perfect time to settle that score or grab that pair of yellow gloves you've been eyeing..." - var/obj_count = 1 - for(var/datum/objective/OBJ in H.mind.objectives) - H << "Objective #[obj_count]: [OBJ.explanation_text]" - obj_count++ var/randomizeguns = pick(gunslist) var/randomizemagic = pick(magiclist) var/randomizemagicspecial = pick(magicspeciallist) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index ea8de301e07..2692e711333 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -500,7 +500,7 @@ if(result > 0) uses += result else if(href_list["page"]) - tab = href_list["page"] + tab = sanitize(href_list["page"]) attack_self(H) return