cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Succlet adjust

Browse Source
This commit is contained in:
Novacat
2023-02-09 08:19:55 -05:00
committed by CHOMPStation2
parent f81a4f1bd1
commit 74d23471f5
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm
View File

@@ -101,6 +101,8 @@
return return
if(client) if(client)
return return
if(isbelly(loc)) //No teleporting out of bellies
return
if(prob(succlet_move_chance) || health < succlet_last_health) //This chance can be adjusted, but moving is probably pretty resource expensive on the server, so the chance should stay low if(prob(succlet_move_chance) || health < succlet_last_health) //This chance can be adjusted, but moving is probably pretty resource expensive on the server, so the chance should stay low
var/list/mylist = list() //Look I'm just saying, you can make it higher if you want but don't cry to me if the server lags, I made this as a joke var/list/mylist = list() //Look I'm just saying, you can make it higher if you want but don't cry to me if the server lags, I made this as a joke
for(var/mob/M in view(world.view, get_turf(src))) //Is there anyone nearby to target? for(var/mob/M in view(world.view, get_turf(src))) //Is there anyone nearby to target?
@@ -108,6 +110,8 @@
continue continue
if(isobserver(M)) if(isobserver(M))
continue continue
if(M.stat)
continue
if(ismob(M)) if(ismob(M))
mylist |= M mylist |= M
if(mylist.len > 0) if(mylist.len > 0)
@@ -124,10 +128,18 @@
spawn(10) spawn(10)
qdel(src) qdel(src)
/mob/living/simple_mob/vore/alienanimals/succlet/attackby(var/obj/item/O, var/mob/user)
if(istype(O, /obj/item/weapon/newspaper) && !ckey && isturf(user.loc))
user.visible_message("<span class='info'>[user] swats [src] with [O]!</span>")
release_vore_contents()
else
..()
/mob/living/simple_mob/vore/alienanimals/succlet/proc/succlet_move(var/target) /mob/living/simple_mob/vore/alienanimals/succlet/proc/succlet_move(var/target)
if(!target) if(!target)
return return
if(isbelly(loc)) //No teleporting out of bellies
return
var/turf/target_turf var/turf/target_turf
var/mob/living/l var/mob/living/l

24
config/jukebox.json
View File

@@ -4734,7 +4734,31 @@
"artist": "Tom Jones", "artist": "Tom Jones",
"secret": false, "secret": false,
"lobby": false, "lobby": false,
<<<<<<< HEAD
"jukebox": true, "jukebox": true,
"genre": "Pop" "genre": "Pop"
=======
"jukebox": true
},
{
"url": "https://files.catbox.moe/n10l5v.mp3",
"title": "Sucklet's Song",
"duration": 1840,
"artist": "emamouse",
"genre": "Folk and Indie",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/6m88w6.mp3",
"title": "King Sucklet",
"duration": 1370,
"artist": "emamouse",
"genre": "Folk and Indie",
"secret": true,
"lobby": false,
"jukebox": true
>>>>>>> 1444784d2a... Merge pull request #14467 from Very-Soft/succlet
} }
] ]