Schlorrgo Powercreep (#19420)

Schlorrgo mob given various tweaks to increase resposiveness and QOL

Eggs now process growth as intended (let me know if the way i did it
wasn't the right way, far as I can tell eggs didnt process yet. Testing
shows eggs in cartoons not growing even went removed.)

- Look into Egg Wierdness (No longer doing since better to have that
handled in own PR)
- Make Schlorrgos roll down stairs (Stair PR reverted lol, maybe another
time)
- [x] Make Schlorrgos lay eggs (use ice tunnelers as baseline)
- [x] Kill Commander Nated
- [x] More Schlorrgo interactions?

---------

Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
This commit is contained in:
Ben
2024-09-29 15:29:53 +00:00
committed by GitHub
co-authored by Ben10083
parent 839bee6f4f
commit 6f1e1534b4
11 changed files with 275 additions and 82 deletions
@@ -1485,9 +1485,9 @@
description = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
taste_description = "sweet fatty yogurt"
glass_icon_state = "mutthir_glass"
glass_name = "glass of mutthir"
glass_desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
glass_icon_state = "mutthir_glass"
/singleton/reagent/drink/milk/beetle
name = "Hakhma Milk"
@@ -1502,7 +1502,7 @@
/singleton/reagent/drink/milk/schlorrgo
name = "Schlorrgo Milk"
description = "An opaque white liquid produced by the mammary glands of the Schlorrgo."
taste_description = "fatty milk"
taste_description = "bitter and fatty milk"
/singleton/reagent/drink/milk/schlorrgo/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
..()
+1 -1
View File
@@ -49,7 +49,7 @@
if(N)
amount_per_transfer_from_this = N
/obj/item/reagent_containers/Initialize()
/obj/item/reagent_containers/Initialize(mapload)
. = ..()
if(!possible_transfer_amounts)
src.verbs -= /obj/item/reagent_containers/verb/set_APTFT
@@ -70,6 +70,8 @@
if (amount_eaten)
bitecount++
shake_animation()
playsound(loc, pick('sound/effects/creatures/nibble1.ogg','sound/effects/creatures/nibble2.ogg'), 30, 1)
if (amount_eaten >= m_bitesize)
user.visible_message(SPAN_NOTICE("\The [user] feeds \the [target] \the [src]."))
if (!istype(target.loc, /turf))//held mobs don't see visible messages
@@ -7,7 +7,18 @@
filling_color = "#FDFFD1"
volume = 10
reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 3)
/// What can be hatched from this egg
var/hatchling = /mob/living/simple_animal/chick
/// Tracks how much the egg has grown. At 100, egg hatches
var/amount_grown = 0
/// If set to TRUE, egg is currently growing and will eventually spawn a hatchling if left alone on a turf.
/// Set to TRUE for eggs mapped in, but meant to be able to hatch.
var/fertile = FALSE
/obj/item/reagent_containers/food/snacks/egg/Initialize(mapload)
. = ..()
if(fertile)
fertilize()
/obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity)
if(!(proximity && O.is_open_container()))
@@ -40,9 +51,13 @@
return TRUE
return ..()
/obj/item/reagent_containers/food/snacks/egg
var/amount_grown = 0
/// Call this proc to have the given egg start growing. Should only be called if hatching is set
/obj/item/reagent_containers/food/snacks/egg/proc/fertilize()
if(hatchling)
fertile = TRUE
START_PROCESSING(SSprocessing,src)
/// Handles hatching. Eggs only grow when on a turf.
/obj/item/reagent_containers/food/snacks/egg/process()
if(isturf(loc))
amount_grown += rand(1,2)
@@ -51,8 +66,6 @@
new hatchling(get_turf(src))
STOP_PROCESSING(SSprocessing, src)
qdel(src)
else
STOP_PROCESSING(SSprocessing, src)
/obj/item/reagent_containers/food/snacks/egg/blue
icon_state = "egg-blue"
@@ -92,8 +105,13 @@
icon_state = "schlorrgo_egg"
filling_color = "#e9ffd1"
volume = 20
reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 6) // Big egg
hatchling = /mob/living/simple_animal/schlorrgo/baby
/// Cursed subtype due to cargo code. A subtype like this will be needed for any cargo orders of eggs that we want to be fertilized.
/obj/item/reagent_containers/food/snacks/egg/schlorrgo/fertile
fertile = TRUE
/obj/item/reagent_containers/food/snacks/egg/ice_tunnelers
name = "ice tunneler egg"
desc = "An egg laid by an Adhomian animal."