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

[TG Mirror] Makes Gondolapods great again [MDB IGNORE] #7

Closed
wants to merge 1 commit into from
Closed

[TG Mirror] Makes Gondolapods great again [MDB IGNORE] #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions code/modules/cargo/gondolapod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@

/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
opened = TRUE
SET_PLANE_IMPLICIT(src, GAME_PLANE)
update_appearance()
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, setClosed)), 50)

/mob/living/simple_animal/pet/gondola/gondolapod/setClosed()
opened = FALSE
SET_PLANE_IMPLICIT(src, GAME_PLANE_FOV_HIDDEN)
update_appearance()

/mob/living/simple_animal/pet/gondola/gondolapod/death()
Expand Down
12 changes: 9 additions & 3 deletions code/modules/cargo/supplypod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@
stay_after_drop = FALSE
holder.pixel_z = initial(holder.pixel_z)
holder.alpha = initial(holder.alpha)
if (holder != src)
contents |= holder.contents
qdel(holder)
var/shippingLane = GLOB.areas_by_type[/area/centcom/central_command_areas/supplypod/supplypod_temp_holding]
forceMove(shippingLane) //Move to the centcom-z-level until the pod_landingzone says we can drop back down again
if (!reverse_dropoff_coords) //If we're centcom-launched, the reverse dropoff turf will be a centcom loading bay. If we're an extraction pod, it should be the ninja jail. Thus, this shouldn't ever really happen.
Expand Down Expand Up @@ -293,6 +296,8 @@
if (style == STYLE_GONDOLA) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(turf_underneath, src)
benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob.
for (var/mob/living/mob_in_pod in benis.contents)
mob_in_pod.reset_perspective(null)
moveToNullspace()
addtimer(CALLBACK(src, PROC_REF(open_pod), benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
else if (style == STYLE_SEETHROUGH)
Expand All @@ -315,7 +320,7 @@
playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play
for (var/turf_type in turfs_in_cargo)
turf_underneath.PlaceOnTop(turf_type)
for (var/cargo in contents)
for (var/cargo in holder.contents)
var/atom/movable/movable_cargo = cargo
movable_cargo.forceMove(turf_underneath)
if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
Expand Down Expand Up @@ -487,7 +492,8 @@
. = ..()
if(same_z_layer)
return
SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src)
if(glow_effect)
SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src)

/obj/structure/closet/supplypod/proc/endGlow()
if(!glow_effect)
Expand Down Expand Up @@ -537,7 +543,7 @@
/obj/effect/supplypod_smoke/proc/drawSelf(amount)
alpha = max(0, 255-(amount*20))

/obj/effect/supplypod_rubble //This is the object that forceMoves the supplypod to it's location
/obj/effect/supplypod_rubble
name = "debris"
desc = "A small crater of rubble. Closer inspection reveals the debris to be made primarily of space-grade metal fragments. You're pretty sure that this will disperse before too long."
icon = 'icons/obj/supplypods.dmi'
Expand Down