cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some mob changes (#15737)

Browse Source
This commit is contained in:
TheDanseMacabre
2023-02-08 11:28:49 +01:00
committed by GitHub
parent a07be45cf9
commit 2a0b326ade
4 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/randomstock.dm
+1 -24
View File
@@ -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 (<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[cratey.x];Y=[cratey.y];Z=[cratey.z]'>JMP</a>)")
else
new ctype(T)
msg_admin_attack("Rare cargo warehouse critter [ctype] spawned coords (<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)")
return
code/modules/hydroponics/seed_datums/mushrooms.dm
+1 -1
View File
@@ -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"
code/modules/reagents/Chemistry-Recipes.dm
+3 -1
View File
@@ -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