Skip to content

Commit

Permalink
[SEMI-MODULAR] Supply Pods subtype - teleporter (#380)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Добавляет супплай под в виде телепорта для:
* Вызова снаряжения (муз. инструменты, снаряжение священника, заказ
повара, и тд)
* Экспресс доставки


https://github.com/user-attachments/assets/9cd5329c-5c9e-4c15-9c69-a88cbfbc82a9


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Заменена взрывная доставка инструментов и экспресс доставка на
телепорты
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
larentoun authored Jul 16, 2024
1 parent 86223ca commit 8cd56ef
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/cargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#define STYLE_INVISIBLE 12
#define STYLE_GONDOLA 13
#define STYLE_SEETHROUGH 14
#define STYLE_TELEPORT 15 // BANDASTATION EDIT

#define POD_SHAPE 1
#define POD_BASE 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(order_console_products)
ordered_paths += item.item_path
podspawn(list(
"target" = get_turf(living_user),
"style" = STYLE_BLUESPACE,
"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = STYLE_BLUESPACE,
"spawn" = ordered_paths,
))
grocery_list.Cut()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
/obj/item/choice_beacon/proc/spawn_option(obj/choice_path, mob/living/user)
podspawn(list(
"target" = get_turf(src),
"style" = STYLE_BLUESPACE,
"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = STYLE_BLUESPACE,
"spawn" = choice_path,
))

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/supplypod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@
pod.transform = matrix().Turn(rotation)
pod.layer = FLY_LAYER
SET_PLANE_EXPLICIT(pod, ABOVE_GAME_PLANE, src)
if (pod.style != STYLE_INVISIBLE)
if (pod.style != STYLE_INVISIBLE && pod.style != STYLE_TELEPORT) // BANDASTATION EDIT. Original: if (pod.style != STYLE_INVISIBLE)
animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING) //Make the pod fall! At an angle!
addtimer(CALLBACK(src, PROC_REF(endLaunch)), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation

Expand Down
4 changes: 4 additions & 0 deletions modular_bandastation/aesthetics/_aesthetics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
name = "Эстетика"
desc = "Обновление визуального ряда"
author = "larentoun, Aylong220"

/datum/modpack/aesthetics/post_initialize()
. = ..()
GLOB.podstyles += list(list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "Портал доставки", "Высокотехнологичный портал для межзвездной доставки. Обеспечивает мгновенный доступ к товарам из любой точки вселенной."))
3 changes: 3 additions & 0 deletions modular_bandastation/aesthetics/_aesthetics.dme
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
// Radio
#include "radio/code/radio.dm"

// Supply Pods
#include "supply_pods/code/supply_pods.dm"

// Walls
#include "walls/code/walls.dm"

Expand Down
31 changes: 31 additions & 0 deletions modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/obj/structure/closet/supplypod/teleporter
style = STYLE_TELEPORT
bluespace = TRUE
explosionSize = list(0,0,0,0)
fallingSound = null
landingSound = SFX_PORTAL_CREATED
openingSound = SFX_PORTAL_ENTER
leavingSound = SFX_PORTAL_CLOSE
pod_flags = FIRST_SOUNDS

/obj/structure/closet/supplypod/teleporter/setStyle(chosenStyle)
. = ..()
icon = 'icons/obj/anomaly.dmi'
icon_state = "portal"

/obj/effect/pod_landingzone/setupSmoke(rotation)
if(pod.style == STYLE_TELEPORT)
return
. = ..()

/obj/effect/pod_landingzone/drawSmoke()
if(pod.style == STYLE_TELEPORT)
return
. = ..()

/obj/effect/pod_landingzone/endLaunch()
if(pod.style == STYLE_TELEPORT)
pod.pixel_x = 0
pod.pixel_z = 0
pod.transform = matrix()
. = ..()

0 comments on commit 8cd56ef

Please sign in to comment.