cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Crushes some Ethereal bugs and adds bloodbags for them (#41745)

Browse Source 
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
This commit is contained in:
Qustinnus
2018-12-09 23:09:24 +13:00
committed by oranges
parent 445bcf110b
commit 9d28bd7244
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crates.dm
+1
View File
@@ -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)
code/modules/cargo/packs.dm
+2 -1
View File
@@ -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
code/modules/mob/living/carbon/human/species_types/ethereal.dm
+1 -1
View File
@@ -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
code/modules/power/lighting.dm
+1
View File
@@ -617,6 +617,7 @@
to_chat(H, "<span class='notice'>You receive some charge from the [fitting].</span>")
H.dna?.species.adjust_charge(5)
return
return
if(H.gloves)
var/obj/item/clothing/gloves/G = H.gloves
code/modules/reagents/reagent_containers/blood_pack.dm
+3 -1
View File
@@ -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"