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

Makes bloodcrawling a trait instead of a var (#49572)

Browse Source
This commit is contained in:
Jordan Brown
2020-03-05 01:57:58 -05:00
committed by GitHub
parent 2ac4b189b7
commit 024d4d8581
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/devil/imp/imp.dm
+1 -1
View File
@@ -41,7 +41,6 @@
deathmessage = "screams in agony as it sublimates into a sulfurous smoke."
deathsound = 'sound/magic/demon_dies.ogg'
var/boost = 0
bloodcrawl = BLOODCRAWL_EAT
var/list/consumed_mobs = list()
var/playstyle_string = "<span class='big bold'>You are an imp,</span><B> a mischievous creature from hell. You are the lowest rank on the hellish totem pole \
Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \
@@ -49,6 +48,7 @@
/mob/living/simple_animal/imp/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_BLOODCRAWL_EAT, "innate")
set_varspeed(1)
addtimer(CALLBACK(src, /mob/living/simple_animal/proc/set_varspeed, 0), 30)
code/modules/antagonists/slaughter/slaughter.dm
+1 -1
View File
@@ -38,7 +38,6 @@
melee_damage_upper = 30
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
bloodcrawl = BLOODCRAWL_EAT
var/playstyle_string = "<span class='big bold'>You are a slaughter demon,</span><B> a terrible creature from another realm. You have a single desire: To kill. \
You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \
Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \
@@ -52,6 +51,7 @@
/mob/living/simple_animal/slaughter/Initialize()
..()
ADD_TRAIT(src, TRAIT_BLOODCRAWL_EAT, "innate")
var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
AddSpell(bloodspell)
if(istype(loc, /obj/effect/dummy/phased_mob/slaughter))
code/modules/mob/living/bloodcrawl.dm
+1 -1
View File
@@ -60,7 +60,7 @@
forceMove(holder)
// if we're not pulling anyone, or we can't eat anyone
if(!pullee || bloodcrawl != BLOODCRAWL_EAT)
if(!pullee || !HAS_TRAIT(src, TRAIT_BLOODCRAWL_EAT))
notransform = FALSE
return
code/modules/mob/living/living_defines.dm
+5 -6
View File
@@ -59,10 +59,9 @@
var/on_fire = 0 ///The "Are we on fire?" var
var/fire_stacks = 0 ///Tracks how many stacks of fire we have on, max is usually 20
var/bloodcrawl = 0 ///0 No blood crawling, [BLOODCRAWL] for bloodcrawling, [BLOODCRAWL_EAT] for crawling+mob devour
var/holder = null ///The holder for blood crawling
var/ventcrawler = 0 ///0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/limb_destroyer = 0 ///1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
var/holder = null //The holder for blood crawling
var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/limb_destroyer = 0 //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
var/mob_size = MOB_SIZE_HUMAN
var/mob_biotypes = MOB_ORGANIC
@@ -128,10 +127,10 @@
var/list/ownedSoullinks //soullinks we are the owner of
var/list/sharedSoullinks //soullinks we are a/the sharer of
/// List of changes to body temperature, used by desease symtoms like fever
var/list/body_temp_changes = list()
//this stuff is here to make it simple for admins to mess with custom held sprites
var/icon/held_lh = 'icons/mob/pets_held_lh.dmi'//icons for holding mobs
var/icon/held_rh = 'icons/mob/pets_held_rh.dmi'