cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Integrates spider eggs into the mob spawners (#6502)

Browse Source 
* Integrates spider eggs into the mob spawners

* Update corpse.dm

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-27 16:01:04 +01:00
committed by GitHub
co-authored by Arkatos1 Gandalf
parent 221bc79f7c
commit 73fdf1fa20
9 changed files with 195 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+13 -13
View File
@@ -59,7 +59,7 @@
///The message that the mother spider left for this spider when the egg was layed.
var/directive = ""
/// Short description of what this mob is capable of, for radial menu uses
var/menu_description = "Versatile spider variant for frontline combat. Jack of all trades, master of none. Does not inject toxin."
var/menu_description = "Versatile spider variant for frontline combat with high health and damage. Does not inject toxin."
/mob/living/simple_animal/hostile/giant_spider/Initialize()
. = ..()
@@ -91,7 +91,7 @@
*
* A subtype of the giant spider with purple eyes and toxin injection.
*
* A subtype of the giant spider which is faster, has toxin injection, but less health. This spider is only slightly slower than a human.
* A subtype of the giant spider which is faster, has toxin injection, but less health and damage. This spider is only slightly slower than a human.
*/
/mob/living/simple_animal/hostile/giant_spider/hunter
name = "hunter spider"
@@ -106,7 +106,7 @@
poison_per_bite = 10
move_to_delay = 5
speed = -0.1
menu_description = "Fast spider variant specializing in catching running prey, but has less health. Toxin injection of 10u per bite."
menu_description = "Fast spider variant specializing in catching running prey and toxin injection, but has less health and damage. Toxin injection of 10u per bite."
/**
* # Spider Nurse
@@ -130,7 +130,7 @@
melee_damage_upper = 10
poison_per_bite = 3
web_speed = 0.25
menu_description = "Support spider variant specializing in healing their brethren and placing webbings swiftly, but has very low amount of health and deals low damage. Toxin injection of 3u per bite."
menu_description = "Support spider variant specializing in healing their brethren and placing webbings very swiftly, but has very low amount of health and deals low damage. Toxin injection of 3u per bite."
///The health HUD applied to the mob.
var/health_hud = DATA_HUD_MEDICAL_ADVANCED
@@ -506,10 +506,10 @@
if(spider.is_busy)
eggs = locate() in get_turf(spider)
if(!eggs || !isturf(spider.loc))
var/egg_choice = enriched ? /obj/structure/spider/eggcluster/enriched : /obj/structure/spider/eggcluster
var/obj/structure/spider/eggcluster/new_eggs = new egg_choice(get_turf(spider))
var/egg_choice = enriched ? /obj/effect/mob_spawn/spider/enriched : /obj/effect/mob_spawn/spider
var/obj/effect/mob_spawn/spider/new_eggs = new egg_choice(get_turf(spider))
new_eggs.directive = spider.directive
new_eggs.faction = spider.faction.Copy()
new_eggs.faction = spider.faction
if(enriched)
spider.fed--
UpdateButtonIcon(TRUE)
@@ -595,7 +595,7 @@
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
gold_core_spawnable = NO_SPAWN
menu_description = "Versatile ice spider variant for frontline combat. Jack of all trades, master of none. Immune to temperature damage. Does not inject frost oil."
menu_description = "Versatile ice spider variant for frontline combat with high health and damage. Immune to temperature damage. Does not inject frost oil."
/**
* # Ice Nurse Spider
@@ -611,7 +611,7 @@
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
menu_description = "Support ice spider variant specializing in healing their brethren and placing webbings swiftly, but has very low amount of health and deals low damage. Immune to temperature damage. Frost oil injection of 3u per bite."
menu_description = "Support ice spider variant specializing in healing their brethren and placing webbings very swiftly, but has very low amount of health and deals low damage. Immune to temperature damage. Frost oil injection of 3u per bite."
/**
* # Ice Hunter Spider
@@ -628,7 +628,7 @@
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
gold_core_spawnable = NO_SPAWN
menu_description = "Fast ice spider variant specializing in catching running prey, but has less health. Immune to temperature damage. Frost oil injection of 10u per bite."
menu_description = "Fast ice spider variant specializing in catching running prey and frost oil injection, but has less health and damage. Immune to temperature damage. Frost oil injection of 10u per bite."
/**
* # Scrawny Hunter Spider
@@ -645,7 +645,7 @@
melee_damage_lower = 5
melee_damage_upper = 10
desc = "Furry and black, it makes you shudder to look at it. This one has sparkling purple eyes, and looks abnormally thin and frail."
menu_description = "Fast spider variant specializing in catching running prey, but has less damage than a normal hunter spider at the cost of more health. Toxin injection of 10u per bite."
menu_description = "Fast spider variant specializing in catching running prey and toxin injection, but has less damage than a normal hunter spider at the cost of a little more health. Toxin injection of 10u per bite."
/**
* # Scrawny Tarantula
@@ -677,7 +677,7 @@
health = 30
maxHealth = 30
desc = "Furry and black, it makes you shudder to look at it. This one has brilliant green eyes, and looks abnormally thin and frail."
menu_description = "Weaker version of the nurse spider, specializing in healing their brethren and placing webbings swiftly, but has very low amount of health and deals low damage. Toxin injection of 3u per bite."
menu_description = "Weaker version of the nurse spider, specializing in healing their brethren and placing webbings very swiftly, but has very low amount of health and deals low damage. Toxin injection of 3u per bite."
/**
* # Flesh Spider
@@ -693,7 +693,7 @@
icon_living = "flesh_spider"
icon_dead = "flesh_spider_dead"
web_speed = 0.7
menu_description = "Self-sufficient spider variant capable of healing themselves and producing webbbing fast, but has less health. Toxin injection of 10u per bite."
menu_description = "Self-sufficient spider variant capable of healing themselves and producing webbbing fast, but has less health and damage. Toxin injection of 10u per bite."
/mob/living/simple_animal/hostile/giant_spider/hunter/flesh/Moved(atom/oldloc, dir)
. = ..()