cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tajara stuff

Browse Source
This commit is contained in:
misterfox
2012-03-16 12:20:42 -04:00
parent 141cf0b5d4
commit 64f50d0d04
13 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/storage.dm
+5
View File
@@ -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."
code/defines/obj/weapon.dm
+16
View File
@@ -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"
code/game/objects/storage/bible.dm
+10
View File
@@ -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
code/modules/chemical/Chemistry-Tools.dm
+9
View File
@@ -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."
code/modules/clothing/suits/miscellaneous.dm
+6
View File
@@ -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"
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+12 -3
View File
@@ -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 <B>[M] has [attack_verb]ed [src]!</B>")
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 <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
code/modules/mob/living/carbon/alien/larva/larva.dm
+13 -2
View File
@@ -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 <B>[] has [attack_verb]ed []!</B>", 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 <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
code/modules/mob/living/carbon/human/human_attackhand.dm
+11 -4
View File
@@ -72,10 +72,16 @@
return 1
if("hurt")
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Punched [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been punched by [M.name] ([M.ckey])</font>")
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()]\] <font color='red'>Punched [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been punched by [M.name] ([M.ckey])</font>")
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()]\] <font color='red'>Slashed [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been slashed by [M.name] ([M.ckey])</font>")
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 <B>[M] has [attack_verb]ed [src]!</B>")
code/modules/mob/living/carbon/metroid/metroid.dm
+12 -2
View File
@@ -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 <B>[] has [attack_verb]ed []!</B>", 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 <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
code/modules/mob/living/carbon/monkey/monkey.dm
+2 -1
View File
@@ -230,11 +230,12 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has [attack_verb]ed [name]!</B>", 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)
config/custom_items.txt
+2 -1
View File
@@ -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
tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
icons/mob/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 213 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB