Schlorrgo Powercreep

code/modules/mob/living/simple_animal/friendly/schlorrgo.dm

@@ -14,6 +14,7 @@
 	icon_dead = "schlorrgo_dead"
 	speak = list("Ough!")
 	speak_emote = list("moans", "moans raucously")
+	speak_chance = 1
 	emote_hear = list("moans", "moans raucously")
 	emote_see = list("rolls around")
 
@@ -30,6 +31,7 @@
 	milk_type = /singleton/reagent/drink/milk/schlorrgo
 
 	friendly = "bumped"
+	response_help = "pets"
 
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
 	organ_names = list("head", "chest", "fatty core", "blubberous torso", "thick centre", "left leg", "right leg")
@@ -38,10 +40,9 @@
 	holder_type = /obj/item/holder/schlorrgo
 
 	max_nutrition = 100
-
 	stomach_size_mult = 10
-
 	metabolic_factor = 0.3
+	forbidden_foods = list(/obj/item/reagent_containers/food/snacks/egg/schlorrgo)
 
 	faction = "Hro'zamal"
 
@@ -60,15 +61,19 @@
 	var/obj/item/organ/external/right_leg = user.get_organ(BP_R_LEG)
 
 	if(left_leg?.is_usable() && right_leg?.is_usable())
+		user.do_attack_animation(src)
+		make_noise()
+		audible_emote("[pick(emote_hear)].",0)
 		if(current_size >= WIDE_SCHLORRGO)
-			user.visible_message(SPAN_WARNING("[user] harmlessly kicks \the [src]!"))
+			user.visible_message(SPAN_WARNING("[user] kicks \the [src], but it doesn't move an inch!"), SPAN_DANGER("Your kick is suddenly stopped by \the [src]'s sheer fat!"))
 			var/obj/item/organ/external/leg = pick(right_leg, left_leg)
 			if(leg)
+				if(current_size == COLOSSAL_SCHLORRGO) //break leg
+					leg.fracture()
+					leg.take_damage(10)
 				leg.take_damage(5)
 		else
 			user.visible_message(SPAN_WARNING("[user] punts \the [src]!"))
-			user.do_attack_animation(src)
-			make_noise()
 			throw_at(get_edge_target_turf(user, get_dir(user, src)), 4, 1)
 			poke(TRUE)
 	else
@@ -77,10 +82,12 @@
 /mob/living/simple_animal/schlorrgo/turf_collision(var/turf/T, var/speed = THROWFORCE_SPEED_DIVISOR)
 	visible_message(SPAN_WARNING("[src] harmlessly bounces off \the [T]!"))
 	playsound(T, 'sound/effects/bangtaper.ogg', 50, 1, 1)
-	make_noise()
 
 /mob/living/simple_animal/schlorrgo/fall_impact()
 	visible_message(SPAN_NOTICE("\The [src] bounces after landing!"))
+	playsound(src, 'sound/effects/bangtaper.ogg', 50, 1, 1)
+	audible_emote("[pick(emote_hear)].",0)
+	make_noise()
 	step(src, pick(GLOB.alldirs), 1)
 	return FALSE
 
@@ -162,8 +169,8 @@
 			attacktext = "crushed"
 			environment_smash = 1
 			resistance = 2
-			mob_swap_flags = HUMAN|SIMPLE_ANIMAL|SLIME|MONKEY
-			mob_push_flags = ALLMOBS
+			mob_swap_flags = HUMAN|ROBOT
+			mob_push_flags = HUMAN|ROBOT
 			a_intent = I_HURT
 			emote_sounds = list('sound/effects/creatures/schlorrgo_scream.ogg')
 			holder_type = null
@@ -182,15 +189,17 @@
 			icon_state = "schlorrgo_colossal"
 			icon_living = "schlorrgo_colossal"
 			icon_dead = "schlorrgo_colossal_dead"
+			response_help = "rubs a part of the [name]'s fat mass"
 			pixel_x = -8
 			anchored = TRUE
 			opacity = TRUE
 			melee_damage_lower = 25
 			melee_damage_upper = 25
 			environment_smash = 2
 			resistance = 3
-			mob_swap_flags = HUMAN|SIMPLE_ANIMAL|SLIME|MONKEY
-			mob_push_flags = ALLMOBS
+			mob_bump_flag = HEAVY // Oh lord he comin
+			mob_swap_flags = HEAVY
+			mob_push_flags = HEAVY
 			a_intent = I_HURT
 			emote_sounds = list('sound/effects/creatures/schlorrgo_scream.ogg')
 			holder_type = null
@@ -278,7 +287,7 @@
 	emote_hear = list("beeps", "beeps maliciously")
 	emote_sounds = list('sound/effects/creatures/evil_cybeough.ogg')
 
-	faction = "Hro'zamal"
+	faction = "PRA" // Evil PRA Machine
 
 	maxHealth = 80
 	health = 80

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -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

code/modules/reagents/reagent_containers/food/snacks/eggs.dm

@@ -9,6 +9,10 @@
 	reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 3)
 	var/hatchling = /mob/living/simple_animal/chick
 
+/obj/item/reagent_containers/food/snacks/egg/Initialize()
+	. = ..()
+	START_PROCESSING(SSprocessing, src)
+
 /obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity)
 	if(!(proximity && O.is_open_container()))
 		return ..()

html/changelogs/Ben10083 Schlorrgo Buffs.yml

@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Ben10083
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - qol: "Various tweaks to Schlorrgos to have better responses and increased density."
+  - bugfix: "Eggs now slowly hatch, as intended."