Phorochem removal test

This commit is contained in:
Razgriz
2020-07-21 13:46:58 -07:00
parent 5efc531f7f
commit aa58ed31dd
3 changed files with 0 additions and 28 deletions
@@ -41,13 +41,6 @@
..()
var/lacertusol = 0
if(istype(M,/mob/living/carbon))
for(var/datum/reagent/phororeagent/R in M.reagents.reagent_list)
if(R.id == "lacertusol")
lacertusol = 1
break
// Should this all be in Touch()?
if(istype(H))
if(H.get_accuracy_penalty() && H != src) //Should only trigger if they're not aiming well
@@ -155,8 +148,6 @@
return
var/rand_damage = rand(1, 5)
if(lacertusol)
rand_damage = rand(5, 12)
var/block = 0
var/accurate = 0
var/hit_zone = H.zone_sel.selecting
@@ -170,8 +161,6 @@
if(I_HELP)
// We didn't see this coming, so we get the full blow
rand_damage = 5
if(lacertusol)
rand_damage = 12
accurate = 1
if(I_HURT, I_GRAB)
// We're in a fighting stance, there's a chance we block
@@ -185,8 +174,6 @@
if(src.grabbed_by.len || src.buckled || !src.canmove || src==H)
accurate = 1 // certain circumstances make it impossible for us to evade punches
rand_damage = 5
if(lacertusol)
rand_damage = 12
// Process evasion and blocking
var/miss_type = 0
-5
View File
@@ -309,11 +309,6 @@
if(H.gloves)
var/obj/item/clothing/gloves/G = H.gloves
if(G.siemens_coefficient == 0) return 0 //to avoid spamming with insulated glvoes on
//Phorochemistry DM: Allows chemicalresistant shocking -Radiantflash
for(var/datum/reagent/phororeagent/R in M.reagents.reagent_list)
if(R.id == "fulguracin")
M << "<span class='notice'>Your hairs stand up, but you resist the shock for the most part</span>"
return 0 //no shock for you
//Checks again. If we are still here subject will be shocked, trigger standard 20 tick warning
//Since this one is longer it will override the original one.