diff --git a/code/WorkInProgress/Cael_Aislinn/MultiZ.dm b/code/WorkInProgress/Cael_Aislinn/MultiZ.dm index 6efc1636191..b2faa092850 100644 --- a/code/WorkInProgress/Cael_Aislinn/MultiZ.dm +++ b/code/WorkInProgress/Cael_Aislinn/MultiZ.dm @@ -174,9 +174,36 @@ H.apply_damage(0.5*damage, BRUTE, "l_arm") H.apply_damage(0.5*damage, BRUTE, "r_arm") - //var/obj/effect/decal/cleanable/blood/B = new(src.loc) - //B.blood_DNA = H.dna.unique_enzymes - //B.blood_type = H.b_type +/* +/obj/effect/decal/cleanable/blood + name = "Blood" + desc = "It's red and disgusting." + density = 0 + anchored = 1 + layer = 2 + icon = 'blood.dmi' + icon_state = "floor1" + random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") + var/list/viruses = list() + blood_DNA = list() + var/datum/disease2/disease/virus2 = null + var/OriginalMob = null + + Del() + for(var/datum/disease/D in viruses) + D.cure(0) + ..() +*/ + + var/obj/effect/decal/cleanable/blood/B = new(src.loc) + var/list/blood_DNA_temp[1] + blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type) + B.blood_DNA = blood_DNA_temp + B.virus2 = H.virus2 + for(var/datum/disease/D in H.viruses) + var/datum/disease/newDisease = new D.type + B.viruses += newDisease + newDisease.holder = B H:weakened = max(H:weakened,2) H:updatehealth() diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 9658feb8b1b..081416a10f2 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -291,12 +291,3 @@ proc/check_can_reach(atom/user, atom/target) del(D) // ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE ------- return ok - -//cael - not sure if there's an equivalent proc, but if there is i couldn't find it -//searches to see if M contains O somewhere -proc/is_carrying(var/M as mob, var/O as obj) - while(!istype(O,/area)) - if(O:loc == M) - return 1 - O = O:loc - return 0 \ No newline at end of file diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e577f862809..bd0643e680c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -118,7 +118,7 @@ return var/obj/mecha/Mech = M.loc spawn() //this helps prevent clickspam fest. - if (Mech && !(is_carrying(M,object)) ) //cael - make sure you cant drill shit in your invent + if (Mech && !(object in M.get_contents()) ) //cael - make sure you cant drill shit in your invent Mech.click_action(object,M) else return ..()