From 9d28bd7244844dba26ca213aca64f1295fc2eeeb Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Sun, 9 Dec 2018 11:09:24 +0100 Subject: [PATCH] Crushes some Ethereal bugs and adds bloodbags for them (#41745) cl Floyd / Qustinnus add: Bloodbags for ethereal filled with liquid electricity fix: Ethereals cant clone lightbulbs anymore fix: Fixes runtime in Ethereal charge handling /cl --- code/game/objects/structures/crates_lockers/crates.dm | 1 + code/modules/cargo/packs.dm | 3 ++- .../modules/mob/living/carbon/human/species_types/ethereal.dm | 2 +- code/modules/power/lighting.dm | 1 + code/modules/reagents/reagent_containers/blood_pack.dm | 4 +++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index df3df8ad145..efee51a3de3 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -107,6 +107,7 @@ new /obj/item/reagent_containers/blood/OMinus(src) new /obj/item/reagent_containers/blood/OPlus(src) new /obj/item/reagent_containers/blood/lizard(src) + new /obj/item/reagent_containers/blood/ethereal(src) for(var/i in 1 to 3) new /obj/item/reagent_containers/blood/random(src) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 279bdde625c..bb920aece09 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1098,7 +1098,8 @@ /obj/item/reagent_containers/blood/BMinus, /obj/item/reagent_containers/blood/OPlus, /obj/item/reagent_containers/blood/OMinus, - /obj/item/reagent_containers/blood/lizard) + /obj/item/reagent_containers/blood/lizard, + /obj/item/reagent_containers/blood/ethereal) crate_name = "blood freezer" crate_type = /obj/structure/closet/crate/freezer diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 11fa0af37af..685561ad49a 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -7,7 +7,7 @@ attack_sound = 'sound/weapons/etherealhit.ogg' miss_sound = 'sound/weapons/etherealmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal - exotic_bloodtype = "LE" //Liquid Electricity. fuck you think of something better gamer + exotic_blood = "liquidelectricity" //Liquid Electricity. fuck you think of something better gamer siemens_coeff = 0.5 //They thrive on energy brutemod = 1.25 //They're weak to punches attack_type = BURN //burn bish diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 00819694625..da878f07b5e 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -617,6 +617,7 @@ to_chat(H, "You receive some charge from the [fitting].") H.dna?.species.adjust_charge(5) return + return if(H.gloves) var/obj/item/clothing/gloves/G = H.gloves diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index a643391c627..27765be9c54 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -5,12 +5,13 @@ icon_state = "bloodpack" volume = 200 var/blood_type = null + var/unique_blood = null var/labelled = 0 /obj/item/reagent_containers/blood/Initialize() . = ..() if(blood_type != null) - reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) + reagents.add_reagent(unique_blood ? unique_blood : "blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() /obj/item/reagent_containers/blood/on_reagent_change(changetype) @@ -71,6 +72,7 @@ /obj/item/reagent_containers/blood/ethereal blood_type = "LE" + unique_blood = "liquidelectricity" /obj/item/reagent_containers/blood/universal blood_type = "U"