diff --git a/baystation12.dme b/baystation12.dme index 3b1b41b84db..bebb3c16233 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -983,16 +983,16 @@ #include "code\WorkInProgress\mapload\reader.dm" #include "code\WorkInProgress\Mini\customitems.dm" #include "code\WorkInProgress\SkyMarshal\policetape.dm" -#include "code\WorkInProgress\virus2\Prob.dm" -#include "code\WorkInProgress\virus2\Disease2\analyser.dm" -#include "code\WorkInProgress\virus2\Disease2\base.dm" -#include "code\WorkInProgress\virus2\Disease2\biohazard destroyer.dm" -#include "code\WorkInProgress\virus2\Disease2\cureimplanter.dm" -#include "code\WorkInProgress\virus2\Disease2\curer.dm" -#include "code\WorkInProgress\virus2\Disease2\diseasesplicer.dm" -#include "code\WorkInProgress\virus2\Disease2\dishincubator.dm" -#include "code\WorkInProgress\virus2\Disease2\isolator.dm" -#include "code\WorkInProgress\virus2\Disease2\monkeydispensor.dm" +#include "code\WorkInProgress\virus2\analyser.dm" +#include "code\WorkInProgress\virus2\antibodies.dm" +#include "code\WorkInProgress\virus2\base.dm" +#include "code\WorkInProgress\virus2\biohazard destroyer.dm" +#include "code\WorkInProgress\virus2\cureimplanter.dm" +#include "code\WorkInProgress\virus2\curer.dm" +#include "code\WorkInProgress\virus2\diseasesplicer.dm" +#include "code\WorkInProgress\virus2\dishincubator.dm" +#include "code\WorkInProgress\virus2\isolator.dm" +#include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" // END_INCLUDE diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a782d1d3903..decdd5f4a70 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -84,7 +84,7 @@ allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) -ng/suit/armor/reactive/IsShield() +/obj/item/clothing/suit/armor/reactive/IsShield() if(active) return 1 return 0