From 12c3112d21475a55e9908252a3f9a9d9d4b71085 Mon Sep 17 00:00:00 2001 From: misterfox Date: Thu, 15 Mar 2012 14:44:52 -0400 Subject: [PATCH] Chaplain has a regular bible instead of one filled with space cash and booze. (non-working) Code included for slashing messages/sounds to replace punching for the Tajaran. Unable to make work yet. Tajaran have universal_speak to 1 by default now. Tajaran are able to see in the dark now. --- .../Tajara/tajara_transformation.dm | 1 + .../Cael_Aislinn/Tajara/tajaran.dm | 1 + code/WorkInProgress/SkyMarshal/wardrobes.dm | 2 +- code/game/jobs/job/civilian_chaplain.dm | 9 +-------- code/game/objects/closets/secure/civilian.dm | 2 +- code/modules/critters/critter_defenses.dm | 5 +++++ .../mob/living/carbon/human/human_attackhand.dm | 17 +++++++++++++---- code/modules/mob/living/carbon/human/life.dm | 5 +++++ code/modules/mob/living/carbon/monkey/monkey.dm | 13 +++++++++++-- 9 files changed, 39 insertions(+), 16 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm index 62c1877b7d..c1102ae0c8 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm @@ -31,6 +31,7 @@ for(var/datum/disease/D in O.viruses) D.affected_mob = O O.flavor_text = flavor_text + O.universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans if (client) client.mob = O diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm index 73f2c0fd74..3ac7e6364e 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm @@ -5,6 +5,7 @@ icon = 'tajaran.dmi' var/list/tajspeak_letters // + universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans taj_talk_understand = 1 voice_message = "mrowls" diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index 54779d7317..314047105e 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -185,7 +185,7 @@ var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src) new /obj/item/weapon/storage/box(BPK) new /obj/item/weapon/pen(src) - new /obj/item/weapon/storage/bible/booze(src) + new /obj/item/weapon/storage/bible(src) new /obj/item/device/pda/chaplain(src) new /obj/item/device/radio/headset(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index b24719b92b..2dcb5f33db 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -13,7 +13,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(H) + var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) H.equip_if_possible(B, H.slot_l_hand) H.equip_if_possible(new /obj/item/device/pda/chaplain(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/under/rank/chaplain(H), H.slot_w_uniform) @@ -44,13 +44,6 @@ B.name = "The Book of Lorgar" if("imperium") B.name = "Uplifting Primer" - if("toolboxia") - B.name = "Toolbox Manifesto" - if("homosexuality") - B.name = "Guys Gone Wild" - if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") - B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") - H.brainloss = 100 // starts off retarded as fuck if("science") B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") else diff --git a/code/game/objects/closets/secure/civilian.dm b/code/game/objects/closets/secure/civilian.dm index 690c6eaa94..f5409963ac 100644 --- a/code/game/objects/closets/secure/civilian.dm +++ b/code/game/objects/closets/secure/civilian.dm @@ -123,7 +123,7 @@ var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src) var/obj/item/weapon/storage/box/B = new(BPK) new /obj/item/weapon/pen(B) - new /obj/item/weapon/storage/bible/booze(src) + new /obj/item/weapon/storage/bible(src) new /obj/item/device/pda/chaplain(src) new /obj/item/device/radio/headset(src) new /obj/item/weapon/candlepack(src) diff --git a/code/modules/critters/critter_defenses.dm b/code/modules/critters/critter_defenses.dm index b69b4fbc5a..fc50e9f02a 100644 --- a/code/modules/critters/critter_defenses.dm +++ b/code/modules/critters/critter_defenses.dm @@ -32,6 +32,11 @@ Contains the procs that control attacking critters O.show_message("\red [user] has slashed at [src]!", 1) playsound(src.loc, 'slice.ogg', 25, 1, -1) + else if(user.type == /mob/living/carbon/human/tajaran) + for(var/mob/O in viewers(src, null)) + O.show_message("\red [user] has slashed at [src]!", 1) + playsound(src.loc, 'slice.ogg', 25, 1, -1) + else for(var/mob/O in viewers(src, null)) O.show_message("\red [user] has bit [src]!", 1) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 9f420b2992..09492c5a66 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -74,8 +74,8 @@ if("hurt") M.attack_log += text("\[[time_stamp()]\] Punched [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been punched by [M.name] ([M.ckey])") - log_admin("ATTACK: [src] ([src.ckey]) punched [M] ([M.ckey]).") - message_admins("ATTACK: [src] ([src.ckey]) punched [M] ([M.ckey]).") + log_admin("ATTACK: [M] ([M.ckey]) punched [src] ([src.ckey]).") + message_admins("ATTACK: [M] ([M.ckey]) punched [src] ([src.ckey]).") var/attack_verb switch(M.mutantrace) @@ -86,16 +86,25 @@ else attack_verb = "punch" + if(src.type == /mob/living/carbon/human/tajaran) + attack_verb = "slash" + var/damage = rand(0, 9) if(!damage) - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + if(src.type != /mob/living/carbon/human/tajaran) + playsound(loc, 'punchmiss.ogg', 25, 1, -1) + else if (src.type == /mob/living/carbon/human/tajaran) + playsound(loc, 'slashmiss.ogg', 25, 1, -1) visible_message("\red [M] has attempted to [attack_verb] [src]!") return 0 var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") if(M.mutations & HULK) damage += 5 - playsound(loc, "punch", 25, 1, -1) + if(src.type != /mob/living/carbon/human/tajaran) + playsound(loc, "punch", 25, 1, -1) + else if (src.type == /mob/living/carbon/human/tajaran) + playsound(loc, 'slice.ogg', 25, 1, -1) visible_message("\red [M] has [attack_verb]ed [src]!") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7323802d91..66c15cd8ae 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -975,6 +975,11 @@ if(!druggy) see_invisible = 2 + else if (type == /mob/living/carbon/human/tajaran) +// sight |= SEE_MOBS +// sight |= SEE_OBJS + see_in_dark = 8 + else if (seer) var/obj/effect/rune/R = locate() in loc if (istype(R) && R.word1 == wordsee && R.word2 == wordhell && R.word3 == wordjoin) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 79e6d2f9c6..75f6fe417c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -222,12 +222,18 @@ else attack_verb = "punch" + if(src.type == /mob/living/carbon/human/tajaran) + attack_verb = "slash" + if ((prob(75) && health > 0)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has [attack_verb]ed [name]!", M), 1) - playsound(loc, "punch", 25, 1, -1) + if(src.type != /mob/living/carbon/human/tajaran) + playsound(loc, "punch", 25, 1, -1) + else if(src.type == /mob/living/carbon/human/tajaran) + playsound(loc, 'slice.ogg', 25, 1, -1) var/damage = rand(5, 10) if (prob(40)) damage = rand(10, 15) @@ -242,7 +248,10 @@ updatehealth() react_to_attack(M) else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + if(src.type != /mob/living/carbon/human/tajaran) + playsound(loc, 'punchmiss.ogg', 25, 1, -1) + else if(src.type == /mob/living/carbon/human/tajaran) + playsound(loc, 'slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to [attack_verb] [name]!", M), 1)