From faa9d5d1320514526a02bc9c3f5260fff3f7fc76 Mon Sep 17 00:00:00 2001
From: boy2mantwicethefam
<41342767+boy2mantwicethefam@users.noreply.github.com>
Date: Fri, 19 Dec 2025 03:50:37 +0200
Subject: [PATCH] no grue egg laying
---
code/controllers/configuration.dm | 6 +-
code/datums/gamemode/role/grue.dm | 12 +--
.../mob/living/simple_animal/hostile/grue.dm | 94 +++++++++----------
.../simple_animal/hostile/grue_powers.dm | 26 ++---
4 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 3b8459ed33e2..5e538e45a317 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -179,7 +179,7 @@
var/renders_url = ""
- var/grue_egglaying = 1 //Whether or not grues can lay eggs to reproduce
+// var/grue_egglaying = 1 //Whether or not grues can lay eggs to reproduce
var/skip_minimap_generation = 0 //If 1, don't generate minimaps
var/skip_holominimap_generation = 0 //If 1, don't generate holominimaps
@@ -423,8 +423,8 @@
if ("no_respawn_as_hobo")
config.respawn_as_hobo = 0
- if ("no_grue_egglaying")
- config.grue_egglaying = 0
+// if ("no_grue_egglaying")
+// config.grue_egglaying = 0
if ("servername")
config.server_name = value
diff --git a/code/datums/gamemode/role/grue.dm b/code/datums/gamemode/role/grue.dm
index 9a81d5f20f28..c2d1eb922d9b 100644
--- a/code/datums/gamemode/role/grue.dm
+++ b/code/datums/gamemode/role/grue.dm
@@ -20,13 +20,11 @@
AppendObjective(/datum/objective/grue/grue_basic)
else
AppendObjective(/datum/objective/grue/eat_sentients)
- if(prob(50) && config.grue_egglaying)
- AppendObjective(/datum/objective/grue/spawn_offspring)
+// if(prob(50) && config.grue_egglaying)
+// AppendObjective(/datum/objective/grue/spawn_offspring)
/datum/role/grue/GetScoreboard()
. = ..()
- . += "The grue ate [eatencount] sentient being[eatencount==1 ? "" : "s"]"
- if(config.grue_egglaying)
- . += " and spawned [spawncount] offspring"
- . += ".
"
-
+ . += "The grue ate [eatencount] sentient being[eatencount==1 ? "" : "s"].
"
+// if(config.grue_egglaying)
+// . += " and spawned [spawncount] offspring"
diff --git a/code/modules/mob/living/simple_animal/hostile/grue.dm b/code/modules/mob/living/simple_animal/hostile/grue.dm
index a838ea9e2f93..4e2a875a49d1 100644
--- a/code/modules/mob/living/simple_animal/hostile/grue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/grue.dm
@@ -40,8 +40,8 @@
var/lifestage=GRUE_ADULT //1=baby grue, 2=grueling, 3=(mature) grue
var/eatencount=0 //number of sentient carbons eaten, makes the grue more powerful
- var/eatencharge=0 //power charged by eating sentient carbons, increments with eatencount but is spent on upgrades
- var/spawncount=0 //how many eggs laid by this grue have successfully hatched
+// var/eatencharge=0 //power charged by eating sentient carbons, increments with eatencount but is spent on upgrades
+// var/spawncount=0 //how many eggs laid by this grue have successfully hatched
var/number = 1 //Appends a number to the grue to keep it distinguishable, the compiler doesn't play nicely with putting rand(1, 1000) here so it goes in New()
@@ -267,8 +267,8 @@
handle_feed(pick(feed_targets))
//Egglaying
- if(config.grue_egglaying && (lifestage==GRUE_ADULT) && (eatencharge>0) && (lightparams.dark_dim_light==GRUE_DARK))
- reproduce()
+// if(config.grue_egglaying && (lifestage==GRUE_ADULT) && (eatencharge>0) && (lightparams.dark_dim_light==GRUE_DARK))
+// reproduce()
//Movement
//
@@ -413,8 +413,8 @@
pass_flags = 0
reagents.maximum_volume = 1500
//Adult grue spells: eat, lay eggs, shadow shunt, and drain light
- if(config.grue_egglaying)
- add_spell(new /spell/aoe_turf/grue_egg, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
+// if(config.grue_egglaying)
+// add_spell(new /spell/aoe_turf/grue_egg, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/aoe_turf/grue_blink, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/aoe_turf/grue_drainlight/, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
add_spell(new /spell/targeted/grue_eat, "grue_spell_ready", /obj/abstract/screen/movable/spell_master/grue)
@@ -448,8 +448,8 @@
stat(null, "Nutritive energy: [round(nutrienergy,0.1)]/[round(maxnutrienergy,0.1)]")
if(lifestage>=GRUE_JUVENILE)
stat(null, "Sentient organisms eaten: [eatencount]")
- if(config.grue_egglaying && lifestage==GRUE_ADULT)
- stat(null, "Reproductive energy: [eatencharge]")
+// if(config.grue_egglaying && lifestage==GRUE_ADULT)
+// stat(null, "Reproductive energy: [eatencharge]")
/mob/living/simple_animal/hostile/grue/gruespawn
lifestage=GRUE_LARVA
@@ -523,8 +523,8 @@
var/hintstring=""
if(lifestage==GRUE_JUVENILE)
hintstring="a juvenile, and can eat sentient beings to gain their strength"
- else if(lifestage==GRUE_ADULT)
- hintstring="fully-grown[config.grue_egglaying ? ", and can lay eggs to spawn offspring" : ""]"
+// else if(lifestage==GRUE_ADULT)
+// hintstring="fully-grown[config.grue_egglaying ? ", and can lay eggs to spawn offspring" : ""]"
visible_message("The chrysalis shifts and morphs into a grue!","You finish moulting! You are now [hintstring].")
playsound(src, 'sound/effects/grue_moult.ogg', 50, 1)
else
@@ -540,42 +540,42 @@
..()
//Reproduction via egglaying.
-/mob/living/simple_animal/hostile/grue/proc/reproduce()
-
- if(lifestage==GRUE_ADULT) //must be adult
- if(eatencharge<=0)
- to_chat(src, "You need to feed more first.")
- return
- else if(!isturf(loc))
- to_chat(src, "You need more room to reproduce.")
- return
- else if(stat==UNCONSCIOUS)
- to_chat(src, "You must be awake to reproduce.")
- return
- else if(busy)
- to_chat(src, "You are already doing something.")
- return
- else
- handle_reproduce()
-
- else
- to_chat(src, "You haven't grown enough to reproduce yet.")
-
-/mob/living/simple_animal/hostile/grue/proc/handle_reproduce()
-
- if(eatencharge>=1)
- busy=TRUE
- visible_message("\The [src] tightens up...","You start to push out an egg...")
- if(do_after(src, src, 5 SECONDS))
- visible_message("\The [src] pushes out an egg!","You lay an egg.")
- eatencharge--
- var/mob/living/simple_animal/grue_egg/E = new /mob/living/simple_animal/grue_egg(get_turf(src))
- E.parent_grue=src //mark this grue as the parent of the egg
- busy=FALSE
-
- else
- to_chat(src, "You need to feed more first.")
- return
+// /mob/living/simple_animal/hostile/grue/proc/reproduce()
+
+// if(lifestage==GRUE_ADULT) //must be adult
+// if(eatencharge<=0)
+// to_chat(src, "You need to feed more first.")
+// return
+// else if(!isturf(loc))
+// to_chat(src, "You need more room to reproduce.")
+// return
+// else if(stat==UNCONSCIOUS)
+// to_chat(src, "You must be awake to reproduce.")
+// return
+// else if(busy)
+// to_chat(src, "You are already doing something.")
+// return
+// else
+// handle_reproduce()
+
+// else
+// to_chat(src, "You haven't grown enough to reproduce yet.")
+
+///mob/living/simple_animal/hostile/grue/proc/handle_reproduce()
+
+// if(eatencharge>=1)
+// busy=TRUE
+// visible_message("\The [src] tightens up...","You start to push out an egg...")
+// if(do_after(src, src, 5 SECONDS))
+// visible_message("\The [src] pushes out an egg!","You lay an egg.")
+// eatencharge--
+// var/mob/living/simple_animal/grue_egg/E = new /mob/living/simple_animal/grue_egg(get_turf(src))
+// E.parent_grue=src //mark this grue as the parent of the egg
+// busy=FALSE
+
+// else
+// to_chat(src, "You need to feed more first.")
+// return
//Procs for grabbing players.
/mob/living/simple_animal/hostile/grue/proc/request_player()
@@ -632,7 +632,7 @@
var/datum/role/grue/G = mind.GetRole(GRUE)
if(G)
G.eatencount++
- eatencharge++ //can be spent on egg laying
+// eatencharge++ //can be spent on egg laying
grue_stat_updates(TRUE)
else
if(isskellington(E))
diff --git a/code/modules/mob/living/simple_animal/hostile/grue_powers.dm b/code/modules/mob/living/simple_animal/hostile/grue_powers.dm
index 525db1582f0d..f5e1c660afe9 100644
--- a/code/modules/mob/living/simple_animal/hostile/grue_powers.dm
+++ b/code/modules/mob/living/simple_animal/hostile/grue_powers.dm
@@ -53,19 +53,19 @@
/spell/aoe_turf/grue_hide/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
user.hide()
-/spell/aoe_turf/grue_egg
- name = "Reproduce"
- desc = "Spawn offspring in the form of an egg."
- user_type = USER_TYPE_GRUE
- panel = "Grue"
- hud_state = "grue_egg"
- override_base = "grue"
- range = 0
- charge_type = SP_RECHARGE
- charge_cooldown_max = 0
-
-/spell/aoe_turf/grue_egg/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
- user.reproduce()
+///spell/aoe_turf/grue_egg
+// name = "Reproduce"
+// desc = "Spawn offspring in the form of an egg."
+// user_type = USER_TYPE_GRUE
+// panel = "Grue"
+// hud_state = "grue_egg"
+// override_base = "grue"
+// range = 0
+// charge_type = SP_RECHARGE
+// charge_cooldown_max = 0
+
+///spell/aoe_turf/grue_egg/cast(list/targets, mob/living/simple_animal/hostile/grue/user)
+// user.reproduce()
/spell/aoe_turf/grue_moult
name = "Moult"