Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PORT] Removes vampire race, replaces them with vampire antagonist (bloodsuckers) #12092

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6c88297
initial
mrmanlikesbt Dec 20, 2024
6951f0f
stuff, log in desc
mrmanlikesbt Dec 22, 2024
5718167
Merge branch 'BeeStation:master' into bloodsucker
mrmanlikesbt Dec 22, 2024
6659b41
i need this file space ok?
mrmanlikesbt Dec 27, 2024
306234c
Merge branch 'bloodsucker' of https://github.com/mrmanlikesbt/BeeStat…
mrmanlikesbt Dec 27, 2024
a6f4e70
Merge branch 'master' into bloodsucker
mrmanlikesbt Dec 27, 2024
bb1bc66
Merge branch 'bloodsucker' of https://github.com/mrmanlikesbt/BeeStat…
mrmanlikesbt Dec 28, 2024
d09c897
fixes compilation errors + grammar
mrmanlikesbt Dec 28, 2024
07ec2c7
stuff
mrmanlikesbt Dec 28, 2024
efe0d1c
mostly code cleanup
mrmanlikesbt Dec 29, 2024
8bf2e41
🍎
mrmanlikesbt Jan 3, 2025
69273ed
lets fix this before i forget
mrmanlikesbt Jan 3, 2025
fc8928d
Merge branch 'BeeStation:master' into bloodsucker
mrmanlikesbt Jan 3, 2025
056878f
im tired
mrmanlikesbt Jan 4, 2025
15af799
whoops
mrmanlikesbt Jan 4, 2025
7bf4a0c
am i stupid?
mrmanlikesbt Jan 4, 2025
10a35f7
i am a vampire
mrmanlikesbt Jan 8, 2025
c497464
soulstone
mrmanlikesbt Jan 8, 2025
77d6f5f
Update malkavian.dm
mrmanlikesbt Jan 8, 2025
9bf58f6
lets fix this before it becomes a problem
mrmanlikesbt Jan 8, 2025
4e74ce7
will this fix linters?
mrmanlikesbt Jan 8, 2025
1fb65bd
going to bed now. hope this fixes it
mrmanlikesbt Jan 8, 2025
50631e8
cleanup + bugfixes
mrmanlikesbt Jan 10, 2025
c6b3b6a
oops
mrmanlikesbt Jan 10, 2025
6d08842
removes vampire race, fix linters (probably)
mrmanlikesbt Jan 10, 2025
3e5db7e
fixes
mrmanlikesbt Jan 11, 2025
1ac4a52
tgui, rewrote power explanations, fixed problem with final_death
mrmanlikesbt Jan 11, 2025
173d1bc
fix runtime + bloodshield fix
mrmanlikesbt Jan 11, 2025
0d817b4
rename bloodsuckers to vampires
mrmanlikesbt Jan 11, 2025
25d9a46
fix checks probably
mrmanlikesbt Jan 11, 2025
db42371
linter
mrmanlikesbt Jan 11, 2025
61561e0
what the FUCK IS A KILOMETER
mrmanlikesbt Jan 11, 2025
f1ada62
im freaking it
mrmanlikesbt Jan 11, 2025
8bf8f1e
plz
mrmanlikesbt Jan 11, 2025
8b4dac7
need this file space
mrmanlikesbt Jan 12, 2025
c215cf2
fix checks probably
mrmanlikesbt Jan 13, 2025
840b225
humanity is kind of stupid. goodbye
mrmanlikesbt Jan 14, 2025
2dfec30
last commit kind of looks like a suicide note :trollface:
mrmanlikesbt Jan 14, 2025
a64a8e5
tgui looks a lot cooler with the narsie theme
mrmanlikesbt Jan 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
going to bed now. hope this fixes it
  • Loading branch information
mrmanlikesbt committed Jan 8, 2025
commit 1fb65bdb3e5b7761816ae4ead56628a465864c57
2 changes: 1 addition & 1 deletion code/datums/brain_damage/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
/// The person able to see this tear.
var/mob/living/carbon/seer

/obj/effect/hallucination/simple/phobetor/Initialize()
/obj/effect/hallucination/simple/phobetor/Initialize(mapload)
. = ..()
created_on = world.time

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/bloodsucker_crypt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
var/mutable_appearance/armrest

// Add rotating and armrest
/obj/structure/bloodsucker/bloodthrone/Initialize()
/obj/structure/bloodsucker/bloodthrone/Initialize(mapload)
AddComponent(/datum/component/simple_rotation)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/bloodsucker/powers/_power.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
/datum/action/cooldown/bloodsucker/proc/ActivatePower(trigger_flags)
active = TRUE
if(power_flags & BP_AM_TOGGLE)
RegisterSignal(owner, COMSIG_LIVING_LIFE, .proc/UsePower)
RegisterSignal(owner, COMSIG_LIVING_LIFE, PROC_REF(UsePower))

owner.log_message("used [src][bloodcost != 0 ? " at the cost of [bloodcost]" : ""].", LOG_ATTACK, color="red")
UpdateButtonIcon()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
righthand_file = 'icons/bloodsuckers/bs_rightinhand.dmi'
block_power = 75

/obj/item/shield/bloodsucker/Initialize()
/obj/item/shield/bloodsucker/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/library/lib_codex_gigas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
///Boolean on whether the book is currently being used, so you can only use it on one person at a time.
var/in_use = FALSE

/obj/item/book/kindred/Initialize()
/obj/item/book/kindred/Initialize(mapload)
. = ..()
AddComponent(/datum/component/stationloving, FALSE, TRUE)

Expand Down
Loading