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

updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books

Browse Source
This commit is contained in:
Tastyfish
2011-12-21 03:55:16 -05:00
parent 376d207435
commit 619ebeba66
11 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+13 -4
View File
@@ -635,6 +635,16 @@
if ("hurt")
var/damage = rand(1, 9)
var/attack_verb
switch(M.mutantrace)
if("lizard")
attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
if (prob(90))
if (M.mutations & HULK)//HULK SMASH
damage += 14
@@ -643,10 +653,9 @@
step_away(src,M,15)
sleep(3)
step_away(src,M,15)
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 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.
if (weakened < 10)
weakened = rand(1,5)
@@ -659,7 +668,7 @@
playsound(loc, 'punchmiss.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 punch []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
if ("disarm")
if (!lying)
code/modules/mob/living/carbon/alien/larva/larva.dm
+10 -2
View File
@@ -416,6 +416,14 @@
else
var/damage = rand(1, 9)
var/attack_verb
switch(M.mutantrace)
if("lizard")
attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
if (prob(90))
if (M.mutations & HULK)
damage += 5
@@ -427,7 +435,7 @@
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has [attack_verb]ed []!</B>", M, src), 1)
if (damage > 4.9)
if (weakened < 10)
weakened = rand(10, 15)
@@ -440,7 +448,7 @@
playsound(loc, 'punchmiss.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 punch []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
return
/mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
code/modules/mob/living/carbon/human/human_attackhand.dm
+11 -2
View File
@@ -73,10 +73,19 @@
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>")
var/attack_verb
switch(M.mutantrace)
if("lizard")
attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
var/damage = rand(0, 9)
if(!damage)
playsound(loc, 'punchmiss.ogg', 25, 1, -1)
visible_message("\red <B>[M] has attempted to punch [src]!</B>")
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")
@@ -84,7 +93,7 @@
if(M.mutations & HULK) damage += 5
playsound(loc, "punch", 25, 1, -1)
visible_message("\red <B>[M] has punched [src]!</B>")
visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
apply_damage(damage, BRUTE, affecting, armor_block)
if(damage >= 9)
code/modules/mob/living/carbon/metroid/metroid.dm
+11 -2
View File
@@ -494,6 +494,15 @@
else
var/damage = rand(1, 9)
var/attack_verb
switch(M.mutantrace)
if("lizard")
attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
attacked += 10
if (prob(90))
if (M.mutations & HULK)
@@ -513,7 +522,7 @@
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has [attack_verb]ed []!</B>", M, src), 1)
bruteloss += damage
updatehealth()
@@ -521,7 +530,7 @@
playsound(loc, 'punchmiss.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 punch []!</B>", M, src), 1)
O.show_message(text("\red <B>[] has attempted to [attack_verb] []!</B>", M, src), 1)
return
code/modules/mob/living/carbon/monkey/monkey.dm
+11 -2
View File
@@ -179,10 +179,19 @@
help_shake_act(M)
else
if (M.a_intent == "hurt")
var/attack_verb
switch(M.mutantrace)
if("lizard")
attack_verb = "scratch"
if("plant")
attack_verb = "slash"
else
attack_verb = "punch"
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 punched [name]!</B>", M), 1)
O.show_message(text("\red <B>[] has [attack_verb]ed [name]!</B>", M), 1)
playsound(loc, "punch", 25, 1, -1)
var/damage = rand(5, 10)
@@ -201,7 +210,7 @@
playsound(loc, 'punchmiss.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 punch [name]!</B>", M), 1)
O.show_message(text("\red <B>[] has attempted to [attack_verb] [name]!</B>", M), 1)
else
if (M.a_intent == "grab")
if (M == src)
code/modules/research/designs.dm
+1 -1
View File
@@ -442,7 +442,7 @@ datum
build_path = "/obj/item/weapon/aiModule/asimov"
nanotrasen
name = "Core Module Design (Nanotrasen)"
name = "Core Module Design (NT Default)"
desc = "Allows for the construction of a NanoTrasen AI Core Module."
id = "nanotrasen_module"
req_tech = list("programming" = 3, "materials" = 6)