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

[MIRROR] Removed effect/dummy/phased_mob copypasta. Fixed squeak component triggering from abstract effects & co. (#1784)

Browse Source 
* Removed effect/dummy/phased_mob copypasta. Fixed squeak component triggering from abstract effects & co. (#54783)

* Removed effect/dummy/phased_mob copypasta. Fixed squeak component triggering from abstract effects & co.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-23 18:29:54 +00:00
committed by GitHub
co-authored by Ghom
parent de54ebf14c
commit 3f22ac0cee
11 changed files with 91 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/_common/antag_spawner.dm
+1 -1
View File
@@ -247,7 +247,7 @@
/obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, kind = "", datum/mind/user)
var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(T)
var/obj/effect/dummy/phased_mob/holder = new /obj/effect/dummy/phased_mob(T)
var/mob/living/simple_animal/hostile/imp/slaughter/S = new demon_type(holder)
S.key = C.key
S.mind.assigned_role = S.name
code/modules/antagonists/slaughter/slaughter.dm
+3 -3
View File
@@ -99,15 +99,15 @@
/// How much our wound_bonus hitstreak bonus caps at (peak demonry)
var/wound_bonus_hitstreak_max = 12
/mob/living/simple_animal/hostile/imp/slaughter/Initialize(mapload, obj/effect/dummy/phased_mob/slaughter/bloodpool)//Bloodpool is the blood pool we spawn in
/mob/living/simple_animal/hostile/imp/slaughter/Initialize(mapload, obj/effect/dummy/phased_mob/bloodpool)//Bloodpool is the blood pool we spawn in
..()
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))
if(istype(loc, /obj/effect/dummy/phased_mob))
bloodspell.phased = TRUE
if(bloodpool)
bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), /obj/effect/dummy/phased_mob/slaughter/.proc/deleteself)
bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), /obj/effect/dummy/phased_mob/.proc/deleteself)
/mob/living/simple_animal/hostile/imp/slaughter/CtrlShiftClickOn(atom/A)
if(!isliving(A))
code/modules/antagonists/slaughter/slaughterevent.dm
+1 -1
View File
@@ -31,7 +31,7 @@
message_admins("No valid spawn locations found, aborting...")
return MAP_ERROR
var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter((pick(spawn_locs)))
var/obj/effect/dummy/phased_mob/holder = new /obj/effect/dummy/phased_mob((pick(spawn_locs)))
var/mob/living/simple_animal/hostile/imp/slaughter/S = new (holder)
player_mind.transfer_to(S)
player_mind.assigned_role = "Slaughter Demon"
code/modules/mob/living/bloodcrawl.dm
+1 -28
View File
@@ -1,30 +1,3 @@
/obj/effect/dummy/phased_mob/slaughter //Can't use the wizard one, blocked by jaunt/slow
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/canmove = TRUE
/obj/effect/dummy/phased_mob/slaughter/relaymove(mob/living/user, direction)
forceMove(get_step(src,direction))
/obj/effect/dummy/phased_mob/slaughter/ex_act()
return
/obj/effect/dummy/phased_mob/slaughter/bullet_act()
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/slaughter/singularity_act()
return
/obj/effect/dummy/phased_mob/slaughter/proc/deleteself(mob/living/source, obj/effect/decal/cleanable/phase_in_decal)
SIGNAL_HANDLER
qdel(src)
/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
if(iscarbon(src))
var/mob/living/carbon/C = src
@@ -54,7 +27,7 @@
playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 50, TRUE, -1)
// Extinguish, unbuckle, stop being pulled, set our location into the
// dummy object
var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(mobloc)
var/obj/effect/dummy/phased_mob/holder = new /obj/effect/dummy/phased_mob(mobloc)
extinguish_mob()
// Keep a reference to whatever we're pulling, because forceMove()
code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+2 -24
View File
@@ -66,31 +66,9 @@
name = "Burrow"
desc = "Burrow under soft ground, evading predators and increasing your speed."
/obj/effect/dummy/phased_mob/goldgrub
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/canmove = TRUE
/obj/effect/dummy/phased_mob/goldgrub/relaymove(mob/living/user, direction)
forceMove(get_step(src,direction))
/obj/effect/dummy/phased_mob/goldgrub/ex_act()
return
/obj/effect/dummy/phased_mob/goldgrub/bullet_act()
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/goldgrub/singularity_act()
return
/datum/action/innate/goldgrub/burrow/Activate()
var/mob/living/simple_animal/hostile/asteroid/goldgrub/G = owner
var/obj/effect/dummy/phased_mob/goldgrub/holder = null
var/obj/effect/dummy/phased_mob/holder = null
if(G.stat == DEAD)
return
var/turf/T = get_turf(G)
@@ -110,7 +88,7 @@
else
G.visible_message("<span class='danger'>[G] buries into the ground, vanishing from sight!</span>")
playsound(get_turf(G), 'sound/effects/break_stone.ogg', 50, TRUE, -1)
holder = new /obj/effect/dummy/phased_mob/goldgrub(T)
holder = new /obj/effect/dummy/phased_mob(T)
G.forceMove(holder)
G.is_burrowed = TRUE
code/modules/mob/living/simple_animal/hostile/netherworld.dm
+2 -24
View File
@@ -39,31 +39,9 @@
name = "Teleport"
desc = "Teleport to wherever you want, as long as you aren't seen."
/obj/effect/dummy/phased_mob/creature
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/canmove = TRUE
/obj/effect/dummy/phased_mob/creature/relaymove(mob/living/user, direction)
forceMove(get_step(src,direction))
/obj/effect/dummy/phased_mob/creature/ex_act()
return
/obj/effect/dummy/phased_mob/creature/bullet_act()
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/creature/singularity_act()
return
/datum/action/innate/creature/teleport/Activate()
var/mob/living/simple_animal/hostile/netherworld/N = owner
var/obj/effect/dummy/phased_mob/creature/holder = null
var/obj/effect/dummy/phased_mob/holder = null
if(N.stat == DEAD)
return
var/turf/T = get_turf(N)
@@ -81,7 +59,7 @@
playsound(get_turf(N), 'sound/effects/podwoosh.ogg', 50, TRUE, -1)
else
playsound(get_turf(N), 'sound/effects/podwoosh.ogg', 50, TRUE, -1)
holder = new /obj/effect/dummy/phased_mob/creature(T)
holder = new /obj/effect/dummy/phased_mob(T)
N.forceMove(holder)
N.is_phased = TRUE
code/modules/spells/spell_types/ethereal_jaunt.dm
+7 -34
View File
@@ -70,42 +70,15 @@
playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
/obj/effect/dummy/phased_mob/spell_jaunt
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
movespeed = 2 //quite slow.
var/reappearing = FALSE
var/movedelay = 0
var/movespeed = 2
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/effect/dummy/phased_mob/spell_jaunt/Destroy()
// Eject contents if deleted somehow
for(var/atom/movable/AM in src)
AM.forceMove(get_turf(src))
return ..()
/obj/effect/dummy/phased_mob/spell_jaunt/relaymove(mob/living/user, direction)
if ((movedelay > world.time) || reappearing || !direction)
/obj/effect/dummy/phased_mob/spell_jaunt/phased_check(mob/living/user, direction)
if(reappearing)
return
var/turf/newLoc = get_step(src,direction)
setDir(direction)
movedelay = world.time + movespeed
if(newLoc.flags_1 & NOJAUNT_1)
to_chat(user, "<span class='warning'>Some strange aura is blocking the way.</span>")
. = ..()
if(!.)
return
if (locate(/obj/effect/blessing, newLoc))
if (locate(/obj/effect/blessing, .))
to_chat(user, "<span class='warning'>Holy energies block your path!</span>")
return
forceMove(newLoc)
/obj/effect/dummy/phased_mob/spell_jaunt/ex_act(blah)
return
/obj/effect/dummy/phased_mob/spell_jaunt/bullet_act(blah)
return BULLET_ACT_FORCE_PIERCE
return null
code/modules/spells/spell_types/shadow_walk.dm
+23 -41
View File
@@ -35,23 +35,32 @@
to_chat(user, "<span class='warning'>It isn't dark enough here!</span>")
/obj/effect/dummy/phased_mob/shadow
name = "darkness"
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
var/canmove = TRUE
var/mob/living/jaunter
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/effect/dummy/phased_mob/shadow/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
/obj/effect/dummy/phased_mob/shadow/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/effect/dummy/phased_mob/shadow/process()
if(!jaunter || jaunter.loc != src)
qdel(src)
check_light_level()
/obj/effect/dummy/phased_mob/shadow/relaymove(mob/living/user, direction)
var/turf/newLoc = get_step(src,direction)
if(isspaceturf(newLoc))
var/turf/oldloc = loc
. = ..()
if(loc != oldloc)
check_light_level()
/obj/effect/dummy/phased_mob/shadow/phased_check(mob/living/user, direction)
. = ..()
if(. && isspaceturf(.))
to_chat(user, "<span class='warning'>It really would not be wise to go into space.</span>")
return
forceMove(newLoc)
check_light_level()
return FALSE
/obj/effect/dummy/phased_mob/shadow/proc/check_light_level()
var/turf/T = get_turf(src)
@@ -67,32 +76,5 @@
visible_message("<span class='boldwarning'>[jaunter] is revealed by the light!</span>")
else
visible_message("<span class='boldwarning'>[jaunter] emerges from the darkness!</span>")
jaunter.forceMove(get_turf(src))
playsound(get_turf(jaunter), 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
jaunter = null
playsound(loc, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
qdel(src)
/obj/effect/dummy/phased_mob/shadow/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
/obj/effect/dummy/phased_mob/shadow/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/effect/dummy/phased_mob/shadow/process()
if(!jaunter)
qdel(src)
if(jaunter.loc != src)
qdel(src)
check_light_level()
/obj/effect/dummy/phased_mob/shadow/ex_act()
return
/obj/effect/dummy/phased_mob/shadow/bullet_act()
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/shadow/singularity_act()
return