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

fixes the marked one (#4302)

Browse Source 
de-lobotomizes everyone's favorite megafauna

## About The Pull Request

Essentially makes him capable of speech and fighting again- he will no
longer just stand there like a potato and take hits for no reason.
Basically: no one else wanted to maintain this code, so I'm kinda taking
it upon myself to get the marked one acting as he should.

## Why It's Good For The Game

Megafauna should *probably* hit you back when your hitting them. 

## Proof Of Testing

<img width="493" height="297" alt="yupheskillingme"
src="https://github.com/user-attachments/assets/c6b6096c-6572-4103-abf0-314ce37f563e"
/>

I spawned him in in his arena on a private server, and watched as my ass
majestically flew across the room and was promptly gutted by Markiplier

## Changelog


🆑

fix: fixed the marked one's ability to do anything, as well as his
ability to speak.

/🆑
This commit is contained in:
DatBurner
2025-07-26 02:32:31 -04:00
committed by GitHub
parent 1b215ef12c
commit 9ed83bbb47
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm
+8 -8
View File
@@ -76,7 +76,7 @@
get_calm()
return ..()
/mob/living/simple_animal/hostile/megafauna/gladiator/Life()
/mob/living/simple_animal/hostile/megafauna/gladiator/Life(seconds_per_tick = SSMOBS_DT, times_fired)
. = ..()
if(stat >= DEAD)
return
@@ -227,7 +227,7 @@
"Show me a good time, miner!",
"I'll give you the first hit.",
)
//say(message = pick(human_messages))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(human_messages))
introduced |= WEAKREF(target)
else if(targetspecies.id == SPECIES_LIZARD_ASH)
var/static/list/ashie_messages = list(
@@ -237,7 +237,7 @@
"GET OVER HERE!!",
)
//say(message = pick(ashie_messages), language = /datum/language/ashtongue)
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(ashie_messages), language = /datum/language/ashtongue)
introduced |= WEAKREF(target)
get_angry()
GiveTarget(target)
@@ -249,13 +249,13 @@
"You will make a fine rug!",
"For the necropolis!"
)
//say(message = pick(other_humanoid_messages))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(other_humanoid_messages))
introduced |= WEAKREF(target)
get_angry()
GiveTarget(target)
else
//simplemobs beware
//say("It's berserkin' time!")
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "It's berserkin' time!")
introduced |= WEAKREF(target)
/// Checks against the Marked One's current health and updates his phase accordingly. Uses variable shitcode to make sure his phase updates only ever happen *once*
@@ -318,7 +318,7 @@
"Come on, HIT ME!",
"CLANG!!",
)
say(message = pick(spin_messages))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(spin_messages))
spinning = TRUE
animate(src, color = "#ff6666", 1 SECONDS)
SLEEP_CHECK_DEATH(5, src)
@@ -365,7 +365,7 @@
"Looking for this?!",
"COME ON!!",
)
say(message = pick(charge_messages))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(charge_messages))
animate(src, color = "#ff6666", 0.3 SECONDS)
SLEEP_CHECK_DEATH(4, src)
face_atom(target)
@@ -416,7 +416,7 @@
)
if(prob(TELE_QUIP_CHANCE))
say(message = pick(tele_messages))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), message = pick(tele_messages))
/// Bone Knife Throw makes him throw bone knives. woah.
/mob/living/simple_animal/hostile/megafauna/gladiator/proc/bone_knife_throw(atom/target)