From 748c1b8990d1f98390bb9cd0d8a42b19ee608ee2 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Tue, 20 Dec 2011 04:45:46 +0000 Subject: [PATCH] TG Updates: Sprited/added the blue magus and red magus robes The blue version functions as wizard robes and spawns on the wizard's shuttle, the red versions replace the old cultist robe sprites. Cultists now each start with join/blood/self instead of one random word each. Cultist supply talisman now has five uses and can spawn armor talismans. Updated the changelog git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2749 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/cult/cult.dm | 8 ++++---- code/game/gamemodes/cult/cult_items.dm | 19 +++++++++++++++++++ code/game/magic/cultist/runes.dm | 10 ++++++---- code/game/magic/cultist/talisman.dm | 6 +++++- code/modules/clothing/suits/robe.dm | 7 +++++++ 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index a4900fb0670..c3bc296f684 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -147,7 +147,7 @@ /datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) - if(!wordtravel) + /*if(!wordtravel) runerandom() if (!word) word=pick(allwords) @@ -176,9 +176,9 @@ // if("free") // wordexp = "[wordfree] is free..." if("hide") - wordexp = "[wordhide] is hide..." - cult_mob << "\red You remember one thing from the dark teachings of your master... [wordexp]" - cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) + wordexp = "[wordhide] is hide..."*/ + cult_mob << "\red You remember the basics from the dark teachings of your master... [wordblood] is blood,[wordjoin] is join, and [wordself] is self..." + cult_mob.mind.store_memory("You remember that [wordblood] is blood,[wordjoin] is join, and [wordself] is self", 0, 0) /datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 60bc235f938..f3c08a7b67d 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -27,3 +27,22 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) + +/obj/item/clothing/head/magus + name = "magus helm" + icon_state = "magus" + item_state = "magus" + desc = "A helm worn by the followers of Nar-Sie." + see_face = 0 + flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0) + +/obj/item/clothing/suit/magusred + name = "magus robes" + desc = "A set of armored robes worn by the followers of Nar-Sie" + icon_state = "magusred" + item_state = "magusred" + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) + armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) \ No newline at end of file diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 1afd008da7a..bb4a1bb858c 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -951,11 +951,13 @@ var/list/sacrificed = list() usr.whisper("N'ath reth sh'yro eth d'raggathnor!") usr.visible_message("\red Rune disappears with a flash of red light, and a set of armor appears on you..", \ "\red You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.") - user.equip_if_possible(new /obj/item/clothing/shoes/jackboots(user), user.slot_shoes) - user.equip_if_possible(new /obj/item/clothing/suit/cultrobes(user), user.slot_wear_suit) - user.equip_if_possible(new /obj/item/clothing/head/culthood(user), user.slot_head) + //user.equip_if_possible(new /obj/item/clothing/shoes/jackboots(user), user.slot_shoes) + //user.equip_if_possible(new /obj/item/clothing/suit/cultrobes(user), user.slot_wear_suit) + //user.equip_if_possible(new /obj/item/clothing/head/culthood(user), user.slot_head) + //user.equip_if_possible(new /obj/item/clothing/gloves/black(user), user.slot_gloves) + user.equip_if_possible(new /obj/item/clothing/suit/magusred(user), user.slot_wear_suit) + user.equip_if_possible(new /obj/item/clothing/head/magus(user), user.slot_head) user.equip_if_possible(new /obj/item/weapon/melee/cultblade(user), user.slot_r_hand) - user.equip_if_possible(new /obj/item/clothing/gloves/black(user), user.slot_gloves) user.equip_if_possible(new /obj/item/weapon/storage/backpack/cultpack(user), user.slot_back) del(src) return diff --git a/code/game/magic/cultist/talisman.dm b/code/game/magic/cultist/talisman.dm index 6cd5434259c..7f5b8fefbbf 100644 --- a/code/game/magic/cultist/talisman.dm +++ b/code/game/magic/cultist/talisman.dm @@ -71,6 +71,7 @@ dat += "Kla'atu barada nikt'o! - Allows you to conceal the runes you placed on the floor.
" dat += "O bidai nabora se'sma! - Allows you to coordinate with others of your cult.
" dat += "Fuu ma'jin - Allows you to stun a person by attacking them with the talisman.
" + dat += "Sa tatha najin - Allows you to summon armoured robes and an unholy blade
" usr << browse(dat, "window=id_com;size=350x200") return @@ -100,6 +101,9 @@ if("runestun") var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) T.imbue = "runestun" + if("armor") + var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + T.imbue = "armor" src.uses-- supply() return @@ -107,4 +111,4 @@ /obj/item/weapon/paper/talisman/supply imbue = "supply" - uses = 3 \ No newline at end of file + uses = 5 \ No newline at end of file diff --git a/code/modules/clothing/suits/robe.dm b/code/modules/clothing/suits/robe.dm index f393718186d..7f9cd4d9879 100644 --- a/code/modules/clothing/suits/robe.dm +++ b/code/modules/clothing/suits/robe.dm @@ -52,6 +52,13 @@ icon_state = "marisa" item_state = "marisarobe" +/obj/item/clothing/suit/wizrobe/magusblue + name = "Magus Robe" + desc = "A set of armoured robes that seem to radiate a dark power" + icon_state = "magusblue" + item_state = "magusblue" + + /obj/item/clothing/suit/wizrobe/fake name = "wizard robe"