cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports baystation armor system (#2954)

Browse Source 
Ports Baystation12/Baystation12#12658

Changing how the calculation of armor works , instead of just being a check if it is protected fully, half or nothing. Making armor more reliable and less rng dependant.

Also, uranium meteors will irradiate nearby people when they explode.
This commit is contained in:
Alberyk
2017-07-15 10:24:03 -03:00
committed by skull132
parent 41e39f52d1
commit 2f949ecb45
52 changed files with 274 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tables/interactions.dm
+7 -6
View File
@@ -82,10 +82,12 @@
if(occupied)
user << "<span class='danger'>There's \a [occupied] in the way.</span>"
return
if (G.state < 2)
if (G.state >= GRAB_AGGRESSIVE)
if(user.a_intent == I_HURT)
if (prob(15)) M.Weaken(5)
M.apply_damage(8,def_zone = "head")
var/blocked = M.run_armor_check("head", "melee")
if (prob(30 * BLOCKED_MULT(blocked)))
M.Weaken(5)
M.apply_damage(8, BRUTE, "head", blocked)
visible_message("<span class='danger'>[G.assailant] slams [G.affecting]'s face against \the [src]!</span>")
if(material)
playsound(loc, material.tableslam_noise, 50, 1)
@@ -97,9 +99,8 @@
if(prob(50))
M.visible_message("<span class='danger'>\The [S] slices [M]'s face messily!</span>",
"<span class='danger'>\The [S] slices your face messily!</span>")
M.apply_damage(10, def_zone = "head")
if(prob(2))
M.embed(S, def_zone = "head")
M.apply_damage(10, BRUTE, "head", blocked)
M.standard_weapon_hit_effects(S, G.assailant, 10, blocked, "head")
else
user << "<span class='danger'>You need a better grip to do that!</span>"
return