diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 5d11df81fb3..4efde66d321 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -380,6 +380,11 @@
desc = "Holds the word of religion."
icon_state ="bible"
+/obj/item/weapon/storage/bible/tajaran
+ name = "The Holy Book of S'rendarr"
+ desc = "Holds the word of religion."
+ icon_state ="koran"
+
/obj/item/weapon/storage/mousetraps
name = "Pest-B-Gon Mousetraps"
desc = "WARNING: Keep out of reach of children."
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 50ea240979e..24f9392808b 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -393,6 +393,14 @@
heal_brute = 40
origin_tech = "biotech=1"
+/obj/item/stack/medical/bruise_pack/tajaran
+ name = "S'rendarr's Hand leaf"
+ singular_name = "S'rendarr's Hand leaf"
+ desc = "A soft leaf that is rubbed on bruises."
+ icon = 'harvest.dmi'
+ icon_state = "cabbage"
+ heal_brute = 30
+
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Used to treat those nasty burns."
@@ -401,6 +409,14 @@
heal_burn = 40
origin_tech = "biotech=1"
+/obj/item/stack/medical/ointment/tajaran
+ name = "Messa's Tear leaf"
+ singular_name = "Messa's Tear leaf"
+ desc = "A cold leaf that is rubbed on burns."
+ icon = 'harvest.dmi'
+ icon_state = "ambrosiavulgaris"
+ heal_burn = 30
+
/obj/item/stack/medical/advanced/bruise_pack
name = "advanced trauma kit"
singular_name = "advanced bruise pack"
diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm
index d34001e15df..d1faf34a854 100644
--- a/code/game/objects/storage/bible.dm
+++ b/code/game/objects/storage/bible.dm
@@ -6,6 +6,16 @@
new /obj/item/weapon/spacecash(src)
new /obj/item/weapon/spacecash(src)
+/obj/item/weapon/storage/bible/tajaran/New()
+ ..()
+ new /obj/item/stack/medical/bruise_pack/tajaran(src)
+ new /obj/item/stack/medical/bruise_pack/tajaran(src)
+ new /obj/item/stack/medical/ointment/tajaran(src)
+ new /obj/item/stack/medical/ointment/tajaran(src)
+ new /obj/item/weapon/reagent_containers/pill/antitox/tajaran(src)
+ new /obj/item/weapon/reagent_containers/pill/antitox/tajaran(src)
+ new /obj/item/clothing/suit/monk(src)
+
/obj/item/weapon/storage/bible/proc/bless(mob/living/carbon/M as mob)
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 70266ea0627..686856f8c02 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -2867,6 +2867,15 @@
..()
reagents.add_reagent("anti_toxin", 50)
+/obj/item/weapon/reagent_containers/pill/antitox/tajaran
+ name = "peacebody plant powder"
+ desc = "A powder ingested to rid the body of poisons."
+ icon = 'food.dmi'
+ icon_state = "nettlesoup"
+ New()
+ ..()
+ reagents.add_reagent("anti_toxin", 100)
+
/obj/item/weapon/reagent_containers/pill/tox
name = "Toxins pill"
desc = "Highly toxic."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 547c57d1997..819a2b6c457 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -83,6 +83,12 @@
item_state = "nun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+/obj/item/clothing/suit/monk
+ name = "monk's robe"
+ desc = "A humble robe."
+ icon_state = "monk"
+ item_state = "monk"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/storage/chaplain_hoodie
name = "chaplain hoodie"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 22170299534..d1fba66d7ca 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -650,6 +650,9 @@
else
attack_verb = "punch"
+ if(M.type == /mob/living/carbon/human/tajaran)
+ attack_verb = "slash"
+
if (prob(90))
if (M.mutations & HULK)//HULK SMASH
damage += 14
@@ -658,8 +661,11 @@
step_away(src,M,15)
sleep(3)
step_away(src,M,15)
-
- playsound(loc, "punch", 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, "punch", 25, 1, -1)
+ else if (M.type == /mob/living/carbon/human/tajaran)
+ damage += 10
+ playsound(loc, 'slice.ogg', 25, 1, -1)
visible_message("\red [M] has [attack_verb]ed [src]!")
if (damage > 9||prob(5))//Regular humans have a very small chance of weakening an alien.
Weaken(1,5)
@@ -669,7 +675,10 @@
bruteloss += damage
updatehealth()
else
- playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ else if (M.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] []!", M, src), 1)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index a1c3c500375..10c1e4a6832 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -424,6 +424,10 @@
attack_verb = "slash"
else
attack_verb = "punch"
+
+ if(M.type == /mob/living/carbon/human/tajaran)
+ attack_verb = "slash"
+
if (prob(90))
if (M.mutations & HULK)
damage += 5
@@ -432,7 +436,11 @@
step_away(src,M,15)
sleep(3)
step_away(src,M,15)
- playsound(loc, "punch", 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, "punch", 25, 1, -1)
+ else if (M.type == /mob/living/carbon/human/tajaran)
+ damage += 10
+ playsound(loc, 'slice.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red [] has [attack_verb]ed []!", M, src), 1)
@@ -444,7 +452,10 @@
bruteloss += damage
updatehealth()
else
- playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ else if (M.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] []!", M, 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 f431379122c..994713e28ae 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -72,10 +72,16 @@
return 1
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: [M] ([M.ckey]) punched [src] ([src.ckey]).")
- message_admins("ATTACK: [M] ([M.ckey]) punched [src] ([src.ckey]).")
+ if(M.type != /mob/living/carbon/human/tajaran)
+ 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: [M] ([M.ckey]) punched [src] ([src.ckey]).")
+ message_admins("ATTACK: [M] ([M.ckey]) punched [src] ([src.ckey]).")
+ else if(M.type == /mob/living/carbon/human/tajaran)
+ M.attack_log += text("\[[time_stamp()]\] Slashed [src.name] ([src.ckey])")
+ src.attack_log += text("\[[time_stamp()]\] Has been slashed by [M.name] ([M.ckey])")
+ log_admin("ATTACK: [M] ([M.ckey]) slashed [src] ([src.ckey]).")
+ message_admins("ATTACK: [M] ([M.ckey]) slashed [src] ([src.ckey]).")
var/attack_verb
switch(M.mutantrace)
@@ -104,6 +110,7 @@
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, "punch", 25, 1, -1)
else if (M.type == /mob/living/carbon/human/tajaran)
+ damage += 10
playsound(loc, 'slice.ogg', 25, 1, -1)
visible_message("\red [M] has [attack_verb]ed [src]!")
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 15dc154c9a7..7cf25f4b493 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -503,6 +503,9 @@
else
attack_verb = "punch"
+ if(M.type == /mob/living/carbon/human/tajaran)
+ attack_verb = "slash"
+
attacked += 10
if (prob(90))
if (M.mutations & HULK)
@@ -519,7 +522,11 @@
step_away(src,M,15)
- playsound(loc, "punch", 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, "punch", 25, 1, -1)
+ else if (M.type == /mob/living/carbon/human/tajaran)
+ damage += 10
+ playsound(loc, 'slice.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red [] has [attack_verb]ed []!", M, src), 1)
@@ -527,7 +534,10 @@
bruteloss += damage
updatehealth()
else
- playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ if(M.type != /mob/living/carbon/human/tajaran)
+ playsound(loc, 'punchmiss.ogg', 25, 1, -1)
+ else if (M.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] []!", M, src), 1)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 01d1c09d6d6..4bb7830e025 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -230,11 +230,12 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\red [] has [attack_verb]ed [name]!", M), 1)
+ var/damage = rand(5, 10)
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, "punch", 25, 1, -1)
else if(M.type == /mob/living/carbon/human/tajaran)
+ damage += 10
playsound(loc, 'slice.ogg', 25, 1, -1)
- var/damage = rand(5, 10)
if (prob(40))
damage = rand(10, 15)
if (paralysis < 5)
diff --git a/config/custom_items.txt b/config/custom_items.txt
index 45ff0f9e8e9..06831904006 100644
--- a/config/custom_items.txt
+++ b/config/custom_items.txt
@@ -6,4 +6,5 @@ eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
searif: Yuki Matsuda: /obj/item/weapon/paper/certificate, /obj/item/clothing/under/jumpsuitdown
erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red
compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
-tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
\ No newline at end of file
+tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
+misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
\ No newline at end of file
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index bf584569a1e..02e255825e0 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index cbb72d8553a..0c2407b628f 100755
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ