mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
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
This commit is contained in:
@@ -141,7 +141,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)
|
||||
@@ -170,9 +170,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("<B>You remember that</B> [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("<B>You remember that</B> [wordblood] is blood,[wordjoin] is join, and [wordself] is self", 0, 0)
|
||||
|
||||
|
||||
/datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE
|
||||
|
||||
@@ -28,3 +28,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)
|
||||
@@ -941,11 +941,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
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
dat += "<A href='?src=\ref[src];rune=conceal'>Kla'atu barada nikt'o!</A> - Allows you to conceal the runes you placed on the floor.<BR>"
|
||||
dat += "<A href='?src=\ref[src];rune=communicate'>O bidai nabora se'sma!</A> - Allows you to coordinate with others of your cult.<BR>"
|
||||
dat += "<A href='?src=\ref[src];rune=runestun'>Fuu ma'jin</A> - Allows you to stun a person by attacking them with the talisman.<BR>"
|
||||
dat += "<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armoured robes and an unholy blade<BR>"
|
||||
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
|
||||
uses = 5
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user