mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-03 05:51:56 +00:00
Species now have individual punch damages.
This commit is contained in:
@@ -105,7 +105,6 @@
|
||||
|
||||
M.attack_log += text("\[[time_stamp()]\] <font color='red'>[M.species.attack_verb]ed [src.name] ([src.ckey])</font>")
|
||||
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [M.species.attack_verb]ed by [M.name] ([M.ckey])</font>")
|
||||
|
||||
log_attack("[M.name] ([M.ckey]) [M.species.attack_verb]ed [src.name] ([src.ckey])")
|
||||
|
||||
var/damage = rand(0, 5)//BS12 EDIT
|
||||
@@ -136,7 +135,8 @@
|
||||
visible_message("\red <B>[M] has weakened [src]!</B>")
|
||||
apply_effect(2, WEAKEN, armor_block)
|
||||
|
||||
if(M.species.attack_verb != "punch") damage += 5
|
||||
if(M.species.punch_damage)
|
||||
damage += M.species.punch_damage
|
||||
apply_damage(damage, BRUTE, affecting, armor_block)
|
||||
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
var/tail // Name of tail image in species effects icon file.
|
||||
var/language // Default racial language, if any.
|
||||
var/attack_verb = "punch" // Empty hand hurt intent verb.
|
||||
var/punch_damage = 0 // Extra empty hand attack damage.
|
||||
var/mutantrace // Safeguard due to old code.
|
||||
|
||||
var/breath_type = "oxygen" // Non-oxygen gas breathed, if any.
|
||||
@@ -49,9 +50,18 @@
|
||||
language = "Sinta'unathi"
|
||||
tail = "sogtail"
|
||||
attack_verb = "scratch"
|
||||
punch_damage = 5
|
||||
primitive = /mob/living/carbon/monkey/unathi
|
||||
darksight = 3
|
||||
|
||||
cold_level_1 = 280 //Default 260 - Lower is better
|
||||
cold_level_2 = 220 //Default 200
|
||||
cold_level_3 = 130 //Default 120
|
||||
|
||||
heat_level_1 = 420 //Default 360 - Higher is better
|
||||
heat_level_2 = 480 //Default 400
|
||||
heat_level_3 = 1100 //Default 1000
|
||||
|
||||
flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
|
||||
|
||||
/datum/species/tajaran
|
||||
@@ -61,15 +71,16 @@
|
||||
language = "Siik'tajr"
|
||||
tail = "tajtail"
|
||||
attack_verb = "scratch"
|
||||
punch_damage = 5
|
||||
darksight = 8
|
||||
|
||||
cold_level_1 = 200
|
||||
cold_level_2 = 140
|
||||
cold_level_3 = 80
|
||||
cold_level_1 = 200 //Default 260
|
||||
cold_level_2 = 140 //Default 200
|
||||
cold_level_3 = 80 //Default 120
|
||||
|
||||
heat_level_1 = 330
|
||||
heat_level_2 = 380
|
||||
heat_level_3 = 800
|
||||
heat_level_1 = 330 //Default 360
|
||||
heat_level_2 = 380 //Default 400
|
||||
heat_level_3 = 800 //Default 1000
|
||||
|
||||
primitive = /mob/living/carbon/monkey/tajara
|
||||
|
||||
@@ -108,6 +119,7 @@
|
||||
deform = 'icons/mob/human_races/r_def_plant.dmi'
|
||||
language = "Rootspeak"
|
||||
attack_verb = "slash"
|
||||
punch_damage = 5
|
||||
primitive = /mob/living/carbon/monkey/diona
|
||||
|
||||
warning_low_pressure = 50
|
||||
|
||||
Reference in New Issue
Block a user