Skip to content

Commit 6680deb

Browse files
Absolucymc-oofertComxy
authored
Various /tg/ port fixes (+ meteor shield holomap fix) (#3020)
* fixes elevation being permanent if you spawn on it (#85952) ## About The Pull Request 1 line change that makes spawning on stuff such as table not offset you forever ## Why It's Good For The Game fixes #84121 ## Changelog :cl: fix: spawning on a table or other elevated object does not offset you forever /:cl: * Fix multi-z meteor shield coverage on holomaps being inaccurate * [NO GBP] Star Gazer Fixes (#78003) ## About The Pull Request Star Gazer can be buckled which stops the Star Gazer from being able to move which isn't supposed to happen. Also removes Star Gazer alpha pixels which where created because it used to have a limited amount of health, but now it isn't needed and seems like it will only be in the way. ## Why It's Good For The Game Improvements. ## Changelog :cl: fix: Fixes Star Gazer getting buckled image: Removes Star Gazer alpha pixels /:cl: * Clean up blood brother teams if all members are removed (#85819) ## About The Pull Request Currently, if you remove someone's BB status, and there's no more members on the team - the empty BB team will still exist, and appear on the roundend report. ## Why It's Good For The Game No reason for empty teams to exist, and they clog up the roundend report. ## Changelog :cl: fix: Empty blood brother teams will now be cleaned up, instead of clogging up the roundend report. /:cl: --------- Co-authored-by: jimmyl <[email protected]> Co-authored-by: Comxy <[email protected]>
1 parent 7047bfc commit 6680deb

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

code/datums/elements/elevation.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151

152152
/datum/element/elevation_core/proc/on_initialized_on(turf/source, atom/movable/spawned)
153153
SIGNAL_HANDLER
154-
if(isliving(spawned))
155-
elevate_mob(spawned)
154+
if(isliving(spawned) && !HAS_TRAIT(spawned, TRAIT_ON_ELEVATED_SURFACE))
155+
on_entered(entered = spawned)
156156

157157
/datum/element/elevation_core/proc/on_exited(turf/source, atom/movable/gone)
158158
SIGNAL_HANDLER

code/modules/antagonists/brother/brother.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@
210210
return
211211
. = ..()
212212
member.remove_antag_datum(/datum/antagonist/brother)
213+
if (!length(members))
214+
qdel(src)
215+
return
213216
if (isnull(member.current))
214217
return
215218
for (var/datum/mind/brother_mind as anything in members)

code/modules/mob/living/basic/heretic/star_gazer.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
move_force = MOVE_FORCE_OVERPOWERING
3232
move_resist = MOVE_FORCE_OVERPOWERING
3333
pull_force = MOVE_FORCE_OVERPOWERING
34+
can_buckle_to = FALSE
3435
mob_size = MOB_SIZE_HUGE
3536
layer = LARGE_MOB_LAYER
3637
plane = GAME_PLANE_UPPER_FOV_HIDDEN
-19.1 KB
Binary file not shown.

monkestation/code/modules/meteor_shield/meteor_shield_field.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY_TYPED(meteor_shield_fields, /datum/proximity_monitor/advanced/
1818
/datum/proximity_monitor/advanced/meteor_shield/setup_field_turf(turf/open/target)
1919
if(!isgroundlessturf(target))
2020
return
21-
if(true_host.check_los(get_turf(true_host), target))
21+
if(true_host.check_los(get_turf(host), target))
2222
ADD_TRAIT(target, TRAIT_COVERED_BY_METEOR_SHIELD, REF(src))
2323
target.AddElement(/datum/element/meteor_shield_coverage)
2424

0 commit comments

Comments
 (0)