From a7824363f99d60dadf86fcc43249b21d534010b1 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 07:49:24 +0100 Subject: [PATCH 1/8] Liquid spidereggs Liquid spidereggs to inject. Unlike the nurse this first incubates the eggs in your bloodstream before they hatch, Process should work similiar to affect_blood --- .../Chemistry-Reagents_chomp.dm | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm index 5270d8101f..89ab2b45f3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm @@ -63,6 +63,44 @@ for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube(location) return + +//this kinda counts +//LIQUID EGG +/datum/chemical_reaction/liquidspideregg + name = "spider eggs" + id = "spideregg" + description = "These are eggs, spiders crawl out of these.. probably not healthy inside of a person." + taste_description = "SO MANY LEGS" + reagent_state = LIQUID + color = "#FFFFFF" + overdose = REAGENTS_OVERDOSE * 100 + metabolism = REM * 0.1 + scannable = 1 + var/amount_grown = 0 + var/min_growth = 0 + var/max_growth = 2 + var/spiders_min = 6 + var/spiders_max = 24 + var/spider_type = /obj/effect/spider/spiderling + +/datum/reagent/liquidspideregg/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(prob(1)) + M.custom_pain("You can feel movement within your body!",45) + amount_grown += rand(min_growth,max_growth) + if(amount_grown >= 100) + min_growth++ + max_growth++ + amount_grown = 0 + var/num = rand(spiders_min, spiders_max) + var/obj/item/organ/external/O = null + if(istype(loc, /obj/item/organ/external)) + O = loc + + for(var/i=0, i Date: Wed, 6 Mar 2019 07:56:16 +0100 Subject: [PATCH 2/8] The spider itself Based on frost spiders --- .../living/simple_animal/animals/giant_spider.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/giant_spider.dm b/code/modules/mob/living/simple_animal/animals/giant_spider.dm index 7fe6744c64..e4c3f91e57 100644 --- a/code/modules/mob/living/simple_animal/animals/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/animals/giant_spider.dm @@ -12,6 +12,7 @@ icon_state = "guard" icon_living = "guard" icon_dead = "guard_dead" + isEdible = 0 faction = "spiders" intelligence_level = SA_ANIMAL @@ -582,6 +583,19 @@ Spider Procs busy = 0 stop_automated_movement = 0 +//CHOMPEDIT LIQUID EGG INJECTORS +/mob/living/simple_animal/hostile/giant_spider/frost/liquidegg + desc = "Icy and blue. This one has brilliant blue eyes, to seduce you into accepting its eggs." + tt_desc = "X Brachypelma ovum pruinae" + icon_state = "frost" + icon_living = "frost" + icon_dead = "frost_dead" + + maxHealth = 175 + health = 175 + + poison_per_bite = 7 + poison_type = "spideregg" #undef SPINNING_WEB #undef LAYING_EGGS From a574f9a855260283351dc8caab5415623bbbaa67 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 07:58:13 +0100 Subject: [PATCH 3/8] Update Chemistry-Reagents_chomp.dm --- .../reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm index 89ab2b45f3..9b29fab075 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm @@ -66,7 +66,7 @@ //this kinda counts //LIQUID EGG -/datum/chemical_reaction/liquidspideregg +/datum/reagent/liquidspideregg name = "spider eggs" id = "spideregg" description = "These are eggs, spiders crawl out of these.. probably not healthy inside of a person." From 8a0098757f77f5b3d9dcfa6bed90ccfcb5b8fbfe Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 08:09:35 +0100 Subject: [PATCH 4/8] Update Chemistry-Reagents_chomp.dm --- .../reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm index 9b29fab075..bfc889a955 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm @@ -88,6 +88,7 @@ M.custom_pain("You can feel movement within your body!",45) amount_grown += rand(min_growth,max_growth) if(amount_grown >= 100) + src = M min_growth++ max_growth++ amount_grown = 0 From da1c4d079cd7a9eed63cb078c3d04b802a7e0524 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 08:23:37 +0100 Subject: [PATCH 5/8] Update Chemistry-Reagents_chomp.dm --- .../reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm index bfc889a955..0888ad1af4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm @@ -89,6 +89,7 @@ amount_grown += rand(min_growth,max_growth) if(amount_grown >= 100) src = M + loc = M.loc min_growth++ max_growth++ amount_grown = 0 From 84f5533f42f724e12af7c0eb319c5bce6211afaa Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 08:32:37 +0100 Subject: [PATCH 6/8] Update Chemistry-Reagents_chomp.dm --- .../Chemistry-Reagents/Chemistry-Reagents_chomp.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm index 0888ad1af4..a458b0fae3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm @@ -88,18 +88,16 @@ M.custom_pain("You can feel movement within your body!",45) amount_grown += rand(min_growth,max_growth) if(amount_grown >= 100) - src = M - loc = M.loc min_growth++ max_growth++ amount_grown = 0 var/num = rand(spiders_min, spiders_max) var/obj/item/organ/external/O = null - if(istype(loc, /obj/item/organ/external)) - O = loc + if(istype(M.loc, /obj/item/organ/external)) + O = M.loc for(var/i=0, i Date: Wed, 6 Mar 2019 08:35:27 +0100 Subject: [PATCH 7/8] Removing useless vars --- code/modules/vore/eating/bellymodes_vr.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 6812d7e813..c22732f91b 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -130,8 +130,6 @@ var/syntox = digest_brute+digest_burn var/old_tox = owner.getToxLoss() owner.adjustToxLoss(syntox) - var/actual_tox = M.getToxLoss() - old_tox - var/damage_gain = syntox if(M.health <= M.maxHealth) M.health = M.health + syntox*2 From 9343a0ac0bb3ebc0e3582bb509fbe22588358ee3 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 08:48:26 +0100 Subject: [PATCH 8/8] Update bellymodes_vr.dm --- code/modules/vore/eating/bellymodes_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index c22732f91b..2b1a0268a7 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -128,7 +128,6 @@ //CHOMPEDIT: Snowflake synx hook if(istype(M,/mob/living/simple_animal/retaliate/synx)) var/syntox = digest_brute+digest_burn - var/old_tox = owner.getToxLoss() owner.adjustToxLoss(syntox) if(M.health <= M.maxHealth) M.health = M.health + syntox*2