cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Up port orbit refactor (#10172)

Browse Source 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-14 21:42:43 -07:00
committed by GitHub
parent d1a1616f82
commit 5d9ecf03dd
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
modular_chomp/code/datums/components/orbiter.dm → code/datums/components/orbiter.dm
View File

2
code/modules/admin/player_effects.dm
View File

@@ -776,10 +776,8 @@
log_and_message_admins("replied to [user]'s message: [reply].", target) log_and_message_admins("replied to [user]'s message: [reply].", target)
if("stop-orbits") if("stop-orbits")
//CHOMPEdit Start
if(target.orbiters) if(target.orbiters)
qdel(target.orbiters) qdel(target.orbiters)
//CHOMPEdit End
if("revert-mob-tf") if("revert-mob-tf")
var/mob/living/Tar = target var/mob/living/Tar = target

2
code/modules/mob/dead/observer/observer.dm
View File

@@ -502,7 +502,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(get_z(target) in using_map?.secret_levels) if(get_z(target) in using_map?.secret_levels)
to_chat(src, span_warning("Sorry, that target is in an area that ghosts aren't allowed to go.")) to_chat(src, span_warning("Sorry, that target is in an area that ghosts aren't allowed to go."))
return return
/*if(target != src) CHOMP Removal holy mother of spaghetti fucking bullshit god please no /*if(target != src)
if(following && following == target) if(following && following == target)
return return
if(following) if(following)

8
code/modules/power/tesla/energy_ball.dm
View File

@@ -36,8 +36,8 @@
return return
/obj/singularity/energy_ball/Destroy() /obj/singularity/energy_ball/Destroy()
if(orbiting && istype(orbiting.parent, /obj/singularity/energy_ball)) //CHOMPEdit if(orbiting && istype(orbiting.parent, /obj/singularity/energy_ball))
var/obj/singularity/energy_ball/EB = orbiting.parent //CHOMPEdit var/obj/singularity/energy_ball/EB = orbiting.parent
EB.orbiting_balls -= src EB.orbiting_balls -= src
for(var/obj/singularity/energy_ball/EB as anything in orbiting_balls) for(var/obj/singularity/energy_ball/EB as anything in orbiting_balls)
@@ -146,8 +146,8 @@
. = ..() . = ..()
/obj/singularity/energy_ball/stop_orbit() /obj/singularity/energy_ball/stop_orbit()
if (orbiting && istype(orbiting.parent, /obj/singularity/energy_ball)) //CHOMPEdit if (orbiting && istype(orbiting.parent, /obj/singularity/energy_ball))
var/obj/singularity/energy_ball/orbitingball = orbiting.parent //CHOMPEdit var/obj/singularity/energy_ball/orbitingball = orbiting.parent
orbitingball.orbiting_balls -= src orbitingball.orbiting_balls -= src
orbitingball.dissipate_strength = orbitingball.orbiting_balls.len + 1 orbitingball.dissipate_strength = orbitingball.orbiting_balls.len + 1
..() ..()

2
vorestation.dme
View File

@@ -503,6 +503,7 @@
#include "code\datums\components\connect_range_ch.dm" #include "code\datums\components\connect_range_ch.dm"
#include "code\datums\components\gargoyle.dm" #include "code\datums\components\gargoyle.dm"
#include "code\datums\components\material_container.dm" #include "code\datums\components\material_container.dm"
#include "code\datums\components\orbiter.dm"
#include "code\datums\components\overlay_lighting.dm" #include "code\datums\components\overlay_lighting.dm"
#include "code\datums\components\recursive_move.dm" #include "code\datums\components\recursive_move.dm"
#include "code\datums\components\resize_guard.dm" #include "code\datums\components\resize_guard.dm"
@@ -4778,7 +4779,6 @@
#include "modular_chomp\code\datums\changelog\changelog.dm" #include "modular_chomp\code\datums\changelog\changelog.dm"
#include "modular_chomp\code\datums\components\dry.dm" #include "modular_chomp\code\datums\components\dry.dm"
#include "modular_chomp\code\datums\components\hearer.dm" #include "modular_chomp\code\datums\components\hearer.dm"
#include "modular_chomp\code\datums\components\orbiter.dm"
#include "modular_chomp\code\datums\components\squeak.dm" #include "modular_chomp\code\datums\components\squeak.dm"
#include "modular_chomp\code\datums\components\xenoqueen.dm" #include "modular_chomp\code\datums\components\xenoqueen.dm"
#include "modular_chomp\code\datums\crafting\items.dm" #include "modular_chomp\code\datums\crafting\items.dm"