From aa58ed31dd11bd43898319f370ee7bc500b71e09 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 21 Jul 2020 13:46:58 -0700 Subject: [PATCH] Phorochem removal test --- .../mob/living/carbon/human/human_attackhand.dm | 13 ------------- code/modules/power/power.dm | 5 ----- vorestation.dme | 10 ---------- 3 files changed, 28 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index c77c9a8ce3..1e2e0491a9 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -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 diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 5ea4fe4224..5c8ba5a8a4 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -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 << "Your hairs stand up, but you resist the shock for the most part" - 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. diff --git a/vorestation.dme b/vorestation.dme index cf1f443310..daae82b3d1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -424,7 +424,6 @@ #include "code\datums\supplypacks\materials.dm" #include "code\datums\supplypacks\materials_yw.dm" #include "code\datums\supplypacks\medical.dm" -#include "code\datums\supplypacks\medical_ch.dm" #include "code\datums\supplypacks\medical_vr.dm" #include "code\datums\supplypacks\misc.dm" #include "code\datums\supplypacks\misc_vr.dm" @@ -3190,15 +3189,6 @@ #include "code\modules\paperwork\silicon_photography.dm" #include "code\modules\paperwork\stamps.dm" #include "code\modules\persistence\persistence.dm" -#include "code\modules\Phorochemistry\electrical_field.dm" -#include "code\modules\Phorochemistry\misc_phoronics.dm" -#include "code\modules\Phorochemistry\phoroanalyzer.dm" -#include "code\modules\Phorochemistry\phorochemheat.dm" -#include "code\modules\Phorochemistry\Phorochemputer.dm" -#include "code\modules\Phorochemistry\phoronics_tile.dm" -#include "code\modules\Phorochemistry\phororeactions.dm" -#include "code\modules\Phorochemistry\phororeagent.dm" -#include "code\modules\Phorochemistry\phorotelepad.dm" #include "code\modules\planet\planet.dm" #include "code\modules\planet\sif.dm" #include "code\modules\planet\time.dm"