From 81b5e7bcd08cecb573af1e4b1216b20b7877341d Mon Sep 17 00:00:00 2001 From: eyespy <104491498+eyespy2222@users.noreply.github.com> Date: Fri, 12 May 2023 00:22:30 +1000 Subject: [PATCH 1/3] chocolate slimes no longer hurt you what it says on the tin. this just makes the damage chocolate slimes do when they attack you really small, as if it basically never hit you in the first place --- GainStation13/code/mobs/chocoslime.dm | 4 ++-- code/datums/components/crafting/craft.dm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index 8e963585..df62f15f 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -29,8 +29,8 @@ maxHealth = 100 health = 100 obj_damage = 0 - melee_damage_lower = 1 - melee_damage_upper = 1 + melee_damage_lower = 0.001 + melee_damage_upper = 0.001 faction = list("slime") pass_flags = PASSTABLE move_to_delay = 7 diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 35966e18..ba6e5228 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -39,10 +39,12 @@ CAT_SANDWICH, CAT_SOUP, CAT_SPAGHETTI, + CAT_MEGAFOODS, //GS13 change, big foods for bigger people -Eye ), CAT_DRINK = CAT_NONE, CAT_CLOTHING = CAT_NONE, CAT_CARPENTRY = CAT_NONE, + ) var/cur_category = CAT_NONE From 0b351c1e9e083592e2d78f3a73ce76348f0a37e0 Mon Sep 17 00:00:00 2001 From: eyespy <104491498+eyespy2222@users.noreply.github.com> Date: Fri, 12 May 2023 00:29:46 +1000 Subject: [PATCH 2/3] Revert "chocolate slimes no longer hurt you" This reverts commit 81b5e7bcd08cecb573af1e4b1216b20b7877341d. --- GainStation13/code/mobs/chocoslime.dm | 4 ++-- code/datums/components/crafting/craft.dm | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index df62f15f..8e963585 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -29,8 +29,8 @@ maxHealth = 100 health = 100 obj_damage = 0 - melee_damage_lower = 0.001 - melee_damage_upper = 0.001 + melee_damage_lower = 1 + melee_damage_upper = 1 faction = list("slime") pass_flags = PASSTABLE move_to_delay = 7 diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index ba6e5228..35966e18 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -39,12 +39,10 @@ CAT_SANDWICH, CAT_SOUP, CAT_SPAGHETTI, - CAT_MEGAFOODS, //GS13 change, big foods for bigger people -Eye ), CAT_DRINK = CAT_NONE, CAT_CLOTHING = CAT_NONE, CAT_CARPENTRY = CAT_NONE, - ) var/cur_category = CAT_NONE From f3bc1758258b2cff729a3b9c0c739a1b0bdba4fd Mon Sep 17 00:00:00 2001 From: eyespy <104491498+eyespy2222@users.noreply.github.com> Date: Fri, 12 May 2023 00:32:07 +1000 Subject: [PATCH 3/3] Update chocoslime.dm --- GainStation13/code/mobs/chocoslime.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index 8e963585..14417108 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/hostile/feed - var/food_per_feeding = 5 + var/food_per_feeding = 10 var/food_fed = /datum/reagent/consumable/nutriment /mob/living/simple_animal/hostile/feed/AttackingTarget() @@ -26,11 +26,11 @@ response_help = "pets" response_disarm = "shoos" response_harm = "hits" - maxHealth = 100 - health = 100 + maxHealth = 20 + health = 20 obj_damage = 0 - melee_damage_lower = 1 - melee_damage_upper = 1 + melee_damage_lower = 0.001 + melee_damage_upper = 0.001 faction = list("slime") pass_flags = PASSTABLE move_to_delay = 7