cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Space Ghost and SD Mining spawn tweaks (#9568)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-30 14:08:29 +01:00
committed by GitHub
co-authored by Heroman3003
parent 238f91970e
commit 3fe0b5d5f3
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm
+4 -2
View File
@@ -99,7 +99,8 @@
/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(var/atom/A)
var/mob/living/L = A
L.hallucination += 50
if(L.hallucination <= 100)
L.hallucination += rand(1,10)
/mob/living/simple_mob/vore/alienanimals/space_ghost/shoot(atom/A) //We're shooting ghosts at people and need them to have the same faction as their parent, okay?
if(!projectiletype)
@@ -211,7 +212,8 @@
/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(var/atom/A)
var/mob/living/L = A
if(L && istype(L))
L.hallucination += rand(1,50)
if(L.hallucination <= 100)
L.hallucination += rand(1,10)
/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Life()
. = ..()
maps/submaps/space_rocks/space_rocks_stuff.dm
+6 -4
View File
@@ -19,11 +19,13 @@
prob_fall = 40
//guard = 20
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/bats = 10,
/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15,
/mob/living/simple_mob/vore/alienanimals/startreader = 15,
/mob/living/simple_mob/vore/alienanimals/space_ghost = 6,
/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 1,
/mob/living/simple_mob/vore/alienanimals/startreader = 3,
/mob/living/simple_mob/vore/alienanimals/space_ghost = 2,
/mob/living/simple_mob/vore/oregrub = 1,
/mob/living/simple_mob/animal/space/ray = 10,
/mob/living/simple_mob/animal/space/bats = 10,
/mob/living/simple_mob/animal/space/gnat = 15,
/mob/living/simple_mob/animal/space/carp = 3,
/mob/living/simple_mob/animal/space/carp/large = 1,
/mob/living/simple_mob/animal/space/carp/large/huge = 1