From fa9933a80bbab138fc6f6913caba7178369bdac3 Mon Sep 17 00:00:00 2001 From: Daniel0Mclovin <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Sat, 23 Sep 2017 16:59:58 -0500 Subject: [PATCH 1/7] Podpeople as roundstart Essentially it allows podmen to be roundstart along with editing them so they take slightly more fire damage and more damage from plant-b-gone --- .../carbon/human/species_types/podpeople.dm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index f5f59ae829..e0c97e9f98 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -10,8 +10,11 @@ burnmod = 1.25 heatmod = 1.5 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant - disliked_food = NONE - liked_food = NONE + disliked_food = MEAT + liked_food = VEGETABLES | FRUIT + toxic_food = TOXIC | RAW + roundstart = 1 + /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() @@ -38,14 +41,17 @@ H.adjustToxLoss(-1) H.adjustOxyLoss(-1) - if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) - H.take_overall_damage(2,0) + if(H.nutrition < NUTRITION_LEVEL_STARVING + 55) + H.take_overall_damage(2,5) + /datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(chem.id == "plantbgone") - H.adjustToxLoss(3) + H.adjustToxLoss(5) H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM) return 1 + H.confused = max(H.confused, 1) + /datum/species/pod/on_hit(obj/item/projectile/P, mob/living/carbon/human/H) switch(P.type) From 7054cf01ea4bca055c8be8314f5416976db5fc93 Mon Sep 17 00:00:00 2001 From: Daniel0Mclovin <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Thu, 28 Sep 2017 20:02:17 -0500 Subject: [PATCH 2/7] changed a few 1's to TRUE's, removed food prefs --- .../mob/living/carbon/human/species_types/podpeople.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index e0c97e9f98..bc5a875d48 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -10,10 +10,10 @@ burnmod = 1.25 heatmod = 1.5 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant - disliked_food = MEAT - liked_food = VEGETABLES | FRUIT - toxic_food = TOXIC | RAW - roundstart = 1 + disliked_food = NONE + liked_food = NONE + toxic_food = NONE + roundstart = TRUE /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) @@ -49,8 +49,8 @@ if(chem.id == "plantbgone") H.adjustToxLoss(5) H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM) - return 1 H.confused = max(H.confused, 1) + return TRUE /datum/species/pod/on_hit(obj/item/projectile/P, mob/living/carbon/human/H) From d3ae434b563ef9693c9f3bfd13ff4c910e993162 Mon Sep 17 00:00:00 2001 From: Daniel0Mclovin <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Sun, 1 Oct 2017 17:20:44 -0500 Subject: [PATCH 3/7] Changed a few stats Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food. --- .../mob/living/carbon/human/species_types/podpeople.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index bc5a875d48..5cf48bf0a5 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -8,7 +8,7 @@ attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' burnmod = 1.25 - heatmod = 1.5 + heatmod = 1.55 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant disliked_food = NONE liked_food = NONE @@ -38,11 +38,11 @@ H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 0.2) //if there's enough light, heal H.heal_overall_damage(1,1) - H.adjustToxLoss(-1) - H.adjustOxyLoss(-1) + H.adjustOxyLoss(-0.5) if(H.nutrition < NUTRITION_LEVEL_STARVING + 55) - H.take_overall_damage(2,5) + H.adjustOxyLoss(5,5) //can eat to negate this unfortunately + H.adjustToxLoss(3,0) /datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) From 2d835e1d732d7dfd015a087d475132ac18b7c43e Mon Sep 17 00:00:00 2001 From: Daniel0Mclovin <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Sun, 1 Oct 2017 17:25:20 -0500 Subject: [PATCH 4/7] Nerfed overall healing dialed down to 0.7 --- code/modules/mob/living/carbon/human/species_types/podpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 5cf48bf0a5..36cb95f755 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -37,7 +37,7 @@ if(H.nutrition > NUTRITION_LEVEL_FULL) H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(1,1) + H.heal_overall_damage(0,7) H.adjustOxyLoss(-0.5) if(H.nutrition < NUTRITION_LEVEL_STARVING + 55) From d4321ac0b56cdc33e264aee14fe26d326938e8b5 Mon Sep 17 00:00:00 2001 From: Daniel0Mclovin <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Sun, 1 Oct 2017 17:26:45 -0500 Subject: [PATCH 5/7] Accidentally put a comma --- code/modules/mob/living/carbon/human/species_types/podpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 36cb95f755..4c86a0f74f 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -37,7 +37,7 @@ if(H.nutrition > NUTRITION_LEVEL_FULL) H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0,7) + H.heal_overall_damage(0.7) H.adjustOxyLoss(-0.5) if(H.nutrition < NUTRITION_LEVEL_STARVING + 55) From 221404bffb552a4b01761fbd3e814037d4a99a48 Mon Sep 17 00:00:00 2001 From: John <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Tue, 3 Oct 2017 01:42:18 -0500 Subject: [PATCH 6/7] cleaned up some things --- .../mob/living/carbon/human/species_types/podpeople.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 4c86a0f74f..3b589d05a2 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -37,12 +37,12 @@ if(H.nutrition > NUTRITION_LEVEL_FULL) H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0.7) + H.heal_overall_damage(0,5) H.adjustOxyLoss(-0.5) if(H.nutrition < NUTRITION_LEVEL_STARVING + 55) - H.adjustOxyLoss(5,5) //can eat to negate this unfortunately - H.adjustToxLoss(3,0) + H.adjustOxyLoss(5) //can eat to negate this unfortunately + H.adjustToxLoss(3) /datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) From 42cfb61f42d5c7ee08f2cf7b2fde54e9b7c46e54 Mon Sep 17 00:00:00 2001 From: John <31661882+Daniel0Mclovin@users.noreply.github.com> Date: Tue, 3 Oct 2017 01:55:50 -0500 Subject: [PATCH 7/7] Edited regen Made it proper --- code/modules/mob/living/carbon/human/species_types/podpeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 3b589d05a2..ef044e462b 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -37,7 +37,7 @@ if(H.nutrition > NUTRITION_LEVEL_FULL) H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0,5) + H.heal_overall_damage(0.05,0) H.adjustOxyLoss(-0.5) if(H.nutrition < NUTRITION_LEVEL_STARVING + 55)