cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4790 from Sebbe9123/upstream-merge-5735

Browse Source 
More AI fixes, fixes crates, spawners, adds ION spiders and MORE.
This commit is contained in:
Spades
2019-02-22 20:42:29 -05:00
committed by GitHub
parent eabe9a0107 aabb168bf4
commit 172f2088db
14 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
+23
View File
@@ -0,0 +1,23 @@
// Slightly placeholder, mostly to replace ion hivebots on V4
/mob/living/simple_mob/animal/giant_spider/ion
desc = "Furry and green, it makes you shudder to look at it. This one has brilliant green eyes and a hint of static discharge."
tt_desc = "X Brachypelma phorus ionus"
icon_state = "webslinger"
icon_living = "webslinger"
icon_dead = "webslinger_dead"
maxHealth = 90
health = 90
base_attack_cooldown = 10
projectilesound = 'sound/weapons/taser2.ogg'
projectiletype = /obj/item/projectile/ion/small
melee_damage_lower = 8
melee_damage_upper = 15
poison_chance = 15
poison_per_bite = 2
poison_type = "psilocybin"
ai_holder_type = /datum/ai_holder/simple_mob/ranged/electric_spider
code/modules/rogueminer_vr/asteroid.dm
+3 -3
View File
@@ -113,7 +113,7 @@
New()
..()
spot_add(2,2,/obj/random/cargopod) //EXTRA loot!
//spot_add(2,2,/mob/living/simple_mob/hostile/alien) //GRRR //VORESTATION AI TEMPORARY REMOVAL
spot_add(2,2,/mob/living/simple_mob/animal/space/alien) //GRRR
//Longer cargo container for higher difficulties
/datum/rogue/asteroid/predef/cargo_large
@@ -146,5 +146,5 @@
spot_add(3,3,/obj/random/cargopod) //Mid loot
spot_add(4,3,/obj/random/cargopod) //Right loot
//if(prob(30))
//spot_add(3,3,/mob/living/simple_mob/hostile/alien) //And maybe a friend. //VORESTATION AI TEMPORARY REMOVAL
if(prob(30))
spot_add(3,3,/mob/living/simple_mob/animal/space/alien) //And maybe a friend.
code/modules/xenoarcheaology/artifacts/autocloner.dm
+2 -2
View File
@@ -26,8 +26,8 @@
/mob/living/simple_mob/animal/space/alien,
/mob/living/simple_mob/animal/space/bear,
/mob/living/simple_mob/creature,
/mob/living/simple_mob/slime/xenobio)
// /mob/living/simple_mob/carp, // Vorestation edit //VORESTATION AI TEMPORARY REMOVAL, REPLACE BACK IN LIST WHEN FIXED
/mob/living/simple_mob/slime/xenobio,
/mob/living/simple_mob/animal/space/carp)// Vorestation edit
else
spawn_type = pick(\
/mob/living/simple_mob/animal/passive/cat,