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

Merge pull request #678 from MisterFox/master

Browse Source 
Horrible alternate reality prevention
This commit is contained in:
Mloc
2012-03-15 14:01:13 -07:00
parent 8d72141427 225b9f4224
commit 353384efd0
9 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/critters/critter_defenses.dm
+5
View File
@@ -32,6 +32,11 @@ Contains the procs that control attacking critters
O.show_message("\red <B>[user] has slashed at [src]!</B>", 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 <B>[user] has slashed at [src]!</B>", 1)
playsound(src.loc, 'slice.ogg', 25, 1, -1)
else
for(var/mob/O in viewers(src, null))
O.show_message("\red <B>[user] has bit [src]!</B>", 1)
code/modules/mob/living/carbon/human/human_attackhand.dm
+13 -4
View File
@@ -74,8 +74,8 @@
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: [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(M.type == /mob/living/carbon/human/tajaran)
attack_verb = "slash"
var/damage = rand(0, 9)
if(!damage)
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)
visible_message("\red <B>[M] has attempted to [attack_verb] [src]!</B>")
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(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, "punch", 25, 1, -1)
else if (M.type == /mob/living/carbon/human/tajaran)
playsound(loc, 'slice.ogg', 25, 1, -1)
visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
code/modules/mob/living/carbon/human/life.dm
+5
View File
@@ -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)
code/modules/mob/living/carbon/monkey/monkey.dm
+11 -2
View File
@@ -222,12 +222,18 @@
else
attack_verb = "punch"
if(M.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 <B>[] has [attack_verb]ed [name]!</B>", M), 1)
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)
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(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] [name]!</B>", M), 1)