From 2a0b326ade332c22207238c9d8d3cccb2fe7372b Mon Sep 17 00:00:00 2001
From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com>
Date: Wed, 8 Feb 2023 05:28:49 -0500
Subject: [PATCH] Some mob changes (#15737)
---
code/modules/cargo/randomstock.dm | 25 +----------
.../hydroponics/seed_datums/mushrooms.dm | 2 +-
code/modules/reagents/Chemistry-Recipes.dm | 4 +-
html/changelogs/dansemacabre-nomoremimics.yml | 43 +++++++++++++++++++
4 files changed, 48 insertions(+), 26 deletions(-)
create mode 100644 html/changelogs/dansemacabre-nomoremimics.yml
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index 69734b09be3..393f9c686dd 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -112,10 +112,7 @@ var/list/global/random_stock_large = list()
var/list/infest_mobs_severe = list(
/mob/living/simple_animal/hostile/giant_spider/hunter = 1,
/mob/living/simple_animal/hostile/retaliate/shantak = 0.7,
- /mob/living/simple_animal/hostile/bear = 0.5,
/mob/living/simple_animal/hostile/carp = 1.5,
- /mob/living/simple_animal/hostile/carp/russian = 0.3,
- "cratey" = 1
)
/datum/cargospawner/New()
@@ -235,28 +232,8 @@ var/list/global/random_stock_large = list()
if (turfs.len)
T = pick(turfs)
- var/ctype = pickweight(infest_mobs_severe)
+ var/ctype = pickweight(infest_mobs_severe)
- if (ctype == "cratey")
- var/obj/C = pick(containers)
-
- var/mob/living/simple_animal/hostile/mimic/copy/cratey
-
- cratey = new /mob/living/simple_animal/hostile/mimic/copy(C.loc, C, null)
-
-
- //Cratey is kinda tough but slow, easy to run away from
- cratey.name = "Cratey"
- cratey.health = 150
- cratey.maxHealth = 150
- cratey.melee_damage_lower = 7
- cratey.melee_damage_upper = 18
- cratey.knockdown_people = 1
- cratey.move_to_delay = 12
-
- msg_admin_attack("Cratey spawned coords (JMP)")
-
- else
new ctype(T)
msg_admin_attack("Rare cargo warehouse critter [ctype] spawned coords (JMP)")
return
diff --git a/code/modules/hydroponics/seed_datums/mushrooms.dm b/code/modules/hydroponics/seed_datums/mushrooms.dm
index 24fe2206776..c10e4d93c16 100644
--- a/code/modules/hydroponics/seed_datums/mushrooms.dm
+++ b/code/modules/hydroponics/seed_datums/mushrooms.dm
@@ -107,7 +107,7 @@
name = "plumphelmet"
seed_name = "plump helmet"
display_name = "plump helmet mushrooms"
- mutants = list("walkingmushroom","towercap")
+ mutants = list("towercap")
chems = list(/singleton/reagent/nutriment = list(2,10))
kitchen_tag = "plumphelmet"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 3225d5b2c3e..e798567d4bf 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1179,7 +1179,9 @@
/mob/living/simple_animal/hostile/hivebotbeacon/incendiary,
/mob/living/simple_animal/hostile/republicon,
/mob/living/simple_animal/hostile/republicon/ranged,
- /mob/living/simple_animal/hostile/spider_queen
+ /mob/living/simple_animal/hostile/spider_queen,
+ /mob/living/simple_animal/hostile/tree,
+ /mob/living/simple_animal/hostile/mimic
)
//exclusion list for things you don't want the reaction to create.
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
diff --git a/html/changelogs/dansemacabre-nomoremimics.yml b/html/changelogs/dansemacabre-nomoremimics.yml
new file mode 100644
index 00000000000..9a60d0ce6d6
--- /dev/null
+++ b/html/changelogs/dansemacabre-nomoremimics.yml
@@ -0,0 +1,43 @@
+################################
+# 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
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: TheDanseMacabre
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Some monsters can no longer spawn in the warehouse."
+ - tweak: "Some monsters can no longer be spawned by golden slime cores."
+ - tweak: "Living mushrooms are now adminspawn only."