From 0d5b5ebe0e2bccd8c69923b0698297ff1bc1c854 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Tue, 2 Mar 2021 09:53:42 +0000 Subject: [PATCH 1/5] Hisssss --- _maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm | 3 +++ code/datums/diseases/transformation.dm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm index 97dd5564..2956f317 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm @@ -563,6 +563,9 @@ /obj/item/clothing/gloves/color/black, /obj/item/radio/headset/headset_cargo/mining, /obj/item/clothing/mask/facehugger/impregnated, +/obj/item/gps/mining{ + gpstag = "Distress Signal" + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "VZ" = ( diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 26bc7897..37bd28cf 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -200,7 +200,7 @@ stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") stage5 = list("Your skin feels as if it's about to burst off!") - new_form = /mob/living/carbon/alien/humanoid/hunter + new_form = /mob/living/carbon/alien/larva bantype = ROLE_ALIEN /datum/disease/transformation/xeno/stage_act() From 7f7186dfd3b0d979abcabe7fd4fd1bfd047a42ec Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Tue, 2 Mar 2021 11:24:07 +0000 Subject: [PATCH 2/5] Unga weapons --- .../simple_animal/hostile/megafauna/blood_drunk_miner.dm | 4 ++-- code/modules/projectiles/guns/energy/kinetic_accelerator.dm | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index ac99c71d..5f6b6855 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -39,8 +39,8 @@ Difficulty: Medium ranged = 1 ranged_cooldown_time = 16 pixel_x = -16 - crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator, /obj/item/crusher_trophy/miner_eye) - loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator) + crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/bdmka, /obj/item/crusher_trophy/miner_eye) + loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/bdmka) wander = FALSE del_on_death = TRUE blood_volume = BLOOD_VOLUME_NORMAL diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 58f52f81..66073dbd 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -60,6 +60,11 @@ else cut_overlays() +/obj/item/gun/energy/kinetic_accelerator/bdmka + name = "blood infused kinetic accelerator" + desc = "A cursed kinetic accelerator, once wielded by the blood drunk miner. It still pulses with a dark energy" + max_mod_capacity = 200 + /obj/item/gun/energy/kinetic_accelerator/examine(mob/user) . = ..() if(max_mod_capacity) From 2a05f81f12936a40e1a2ad2b0c8d9410a6479c10 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Tue, 2 Mar 2021 11:24:21 +0000 Subject: [PATCH 3/5] Boil the hell in to it --- code/modules/reagents/chemistry/recipes/others.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 9c67fc5e..aab9ba5f 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -721,3 +721,11 @@ required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/iron = 1, /datum/reagent/stable_plasma = 1) mix_message = "The mixture congeals and gives off a faint copper scent." required_temp = 350 + +/datum/chemical_reaction/hellwater + name = "Hell Water" + id = /datum/reagent/hellwater + results = list(/datum/reagent/hellwater = 1) + required_reagents = list(/datum/reagent/water/holywater = 1) + required_temp = 700 + mob_react = FALSE \ No newline at end of file From d84d3ae2fd7dbd812dcf59c026e7006c87c86523 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Tue, 2 Mar 2021 13:26:44 +0000 Subject: [PATCH 4/5] HE LIVES --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index aab9ba5f..823a1b9a 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -727,5 +727,5 @@ id = /datum/reagent/hellwater results = list(/datum/reagent/hellwater = 1) required_reagents = list(/datum/reagent/water/holywater = 1) - required_temp = 700 + required_temp = 666 mob_react = FALSE \ No newline at end of file From a1d566f57d4980cc62686a068ba7f819884f470e Mon Sep 17 00:00:00 2001 From: Chloe Date: Thu, 4 Mar 2021 23:43:56 +0000 Subject: [PATCH 5/5] Update transformation.dm --- code/datums/diseases/transformation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 37bd28cf..9d468419 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -200,7 +200,7 @@ stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") stage5 = list("Your skin feels as if it's about to burst off!") - new_form = /mob/living/carbon/alien/larva + new_form = /mob/living/carbon/alien/humanoid/sentinel bantype = ROLE_ALIEN /datum/disease/transformation/xeno/stage_act()