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.

Sign up for GitHub

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

Cult 2020 Rework #2: Soul Stone cleanup and tweaks #28084

Merged
merged 14 commits into from
Nov 2, 2020
Merged

Cult 2020 Rework #2: Soul Stone cleanup and tweaks #28084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5c9a3e2
soulstone cleanup and shade tweak
DeityLink Oct 24, 2020
eff4384
fixing type path in code
DeityLink Oct 24, 2020
e9e3301
fixing type path in maps
DeityLink Oct 24, 2020
c29040a
suicide is painless
DeityLink Oct 24, 2020
2a7a83d
min blood
DeityLink Oct 24, 2020
593f196
shade speak human
DeityLink Oct 24, 2020
9a805de
fix mechanic scan
DeityLink Oct 24, 2020
cdbb453
derp
DeityLink Oct 26, 2020
8d1c3f9
unretardify construct spells
DeityLink Oct 26, 2020
0122c09
fixes soul stone not qdel after making construct
DeityLink Oct 26, 2020
245e489
better shade and construct language
DeityLink Oct 26, 2020
f02ae6a
fix
DeityLink Oct 26, 2020
2a2bc63
much better
DeityLink Oct 27, 2020
b3cf574
better sanity
DeityLink Oct 27, 2020
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
4 changes: 3 additions & 1 deletion code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
sleep (gem_delay/3)
altar_task = ALTARTASK_NONE
update_icon()
var/obj/item/device/soulstone/gem/gem = new (loc)
var/obj/item/soulstone/gem/gem = new (loc)
gem.pixel_y = 4

/obj/structure/cult/altar/proc/replace_target(var/mob/user)
Expand Down Expand Up @@ -705,6 +705,7 @@
to_chat(usr, "<span class='warning'>Another shade was faster, and is currently possessing \the [blade].</span>")
return
var/mob/living/simple_animal/shade/shadeMob = new(blade)
blade.shade = shadeMob
shadeMob.status_flags |= GODMODE
shadeMob.canmove = 0
var/datum/role/cultist/cultist = M.mind.GetRole(CULTIST)
Expand Down Expand Up @@ -754,6 +755,7 @@
blade.forceMove(loc)
blade.blood = blade.maxblood
new_shade.forceMove(blade)
blade.shade = new_shade
blade.update_icon()
blade = null

Expand Down
Loading