From 82aa9d9a4f4256fc78121a86f1b4561d4a554d63 Mon Sep 17 00:00:00 2001 From: "Superxpdude@gmail.com" Date: Mon, 22 Aug 2011 17:43:21 +0000 Subject: [PATCH] NEW CULT RUNE: Equip Armor Can be imbued into talismans, and when invoked equips the user with a set of cult armor (Credit to Kor for making it). Arcane Tomes can now fit in pockets. Cult armor can now hold the cult sword and arcane tomes in suit storage. The cult hood obscures your face, so while wearing it people can not see your identity unless you speak. Checked the cult items file in tgstation.dme. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2039 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/cult/cult_items.dm | 2 ++ code/game/magic/cultist/ritual.dm | 17 +++++++++++++++-- code/game/magic/cultist/runes.dm | 25 ++++++++++++++++++++++++- tgstation.dme | 2 -- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 928f0416c2c..c7665bce5c0 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -13,6 +13,7 @@ name = "cult hood" icon_state = "culthood" desc = "A hood worn by the followers of Nar-Sie." + see_face = 0 flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES armor = list(melee = 30, bullet = 10, laser = 5, taser = 5, bomb = 0, bio = 0, rad = 0) @@ -25,4 +26,5 @@ item_state = "cultrobes" 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, taser = 20, bomb = 25, bio = 10, rad = 0) diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index aa5ce166b8d..f82b12f837f 100644 --- a/code/game/magic/cultist/ritual.dm +++ b/code/game/magic/cultist/ritual.dm @@ -125,6 +125,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return teleport(src.word3) if(word1 == wordsee && word2 == wordblood && word3 == wordhell) return tomesummon() + if(word1 == wordhell && word2 == worddestr && word3 == wordother) + return armor() if(word1 == wordjoin && word2 == wordblood && word3 == wordself) return convert() if(word1 == wordhell && word2 == wordjoin && word3 == wordself) @@ -276,7 +278,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", icon_state ="tome" throw_speed = 1 throw_range = 5 - w_class = 3.0 + w_class = 2.0 flags = FPRINT | TABLEPASS var/notedat = "" var/tomedat = "" @@ -321,7 +323,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", Blind: Destroy See Other
Blood Boil: Destroy See Blood
Communicate: Self other technology
- Stun: join hide technology
+ Stun: Join hide technology
+ Summon Cultist Armor: Hell destroy other

Rune Descriptions

Teleport self

@@ -368,6 +371,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", Invoking this rune allows you to relay a message to all cultists on the station and nearby space objects.

Stun

Unlike other runes, this ons is supposed to be used in talisman form. When invoked directly, it simply releases some dark energy, briefly stunning everyone around. When imbued into a talisman, you can force all of its energy into one person, stunning him so hard he cant even speak. However, effect wears off rather fast.
+

Equip Armor

+ When this rune is invoked, either from a rune or a talisman, it will equip the user with the armor of the followers of Nar-Sie. To use this rune to it's fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands.
"} @@ -601,6 +606,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.word3=wordhell R.loc = user.loc R.check_icon() + if("armor") + R.word1=wordhell + R.word2=worddestr + R.word3=wordother + R.loc = user.loc + R.check_icon() if("convert") R.word1=wordjoin R.word2=wordblood @@ -752,6 +763,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", switch(imbue) if("newtome") call(/obj/rune/proc/tomesummon)() + if("armor") + call(/obj/rune/proc/armor)() if("emp") call(/obj/rune/proc/emp)(usr.loc,3) if("conceal") diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 5e97cc852f2..845a713b4b7 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -463,6 +463,11 @@ var/list/sacrificed = list() T.imbue = "conceal" imbued_from = R break + if(R.word1==wordhell && R.word2==worddestr && R.word3==wordother) //armor + T = new(src.loc) + T.imbue = "armor" + imbued_from = R + break if(R.word1==wordblood && R.word2==wordsee && R.word3==wordhide) //reveal T = new(src.loc) T.imbue = "revealrunes" @@ -930,4 +935,22 @@ var/list/sacrificed = list() T.weakened += 25 if (!(T.mutations & HULK)) T.stunned += 25 - return \ No newline at end of file + return + +/////////////////////////////////////////TWENTY-FIFTH RUNE + + armor() + var/mob/living/carbon/human/user = usr + if(istype(src,/obj/rune)) + usr.say("N'ath reth sh'yro eth d'raggathnor!") + else + 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/weapon/melee/cultblade(user), user.slot_r_hand) + user.equip_if_possible(new /obj/item/clothing/gloves/black(user), user.slot_gloves) + del(src) + return diff --git a/tgstation.dme b/tgstation.dme index 5e901fad4d7..85ac03e2a35 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -832,8 +832,6 @@ #include "code\WorkInProgress\recycling\disposal-construction.dm" #include "code\WorkInProgress\recycling\disposal.dm" #include "code\WorkInProgress\recycling\sortingmachinery.dm" -#include "code\WorkInProgress\thehive\mhivebot.dm" -#include "code\WorkInProgress\thehive\transport.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\virus2\Disease2\analyser.dm" #include "code\WorkInProgress\virus2\Disease2\base.dm"