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.

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

Meteor "Shield" #3371

Closed
wants to merge 14 commits into from
Closed

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

Adds purchasable anti-meteor turrets to the outpost.

Why It's Good For The Game

Sometimes you gotta go fast.

Changelog

🆑
add: Ships can now purchase anti-meteor grids at the outpost. Installation not included.
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Sep 16, 2024
@FalloutFalcon FalloutFalcon added the Test Merge Required They'll have to do it for free. label Sep 19, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ill probally refactor these to use a computer in the helm at some point but this is fine for now

Comment on lines +50 to +68
if(W.tool_behaviour == TOOL_WRENCH)
if(!anchored && !isinspace())
W.play_tool_sound(src, 100)
if (W.use_tool(src, user, 20))
to_chat(user, span_notice("You secure \the [src] to the floor!"))
set_anchored(TRUE)
else if(anchored)
W.play_tool_sound(src, 100)
if (W.use_tool(src, user, 20))
to_chat(user, span_notice("You unsecure \the [src] from the floor!"))
if(active)
to_chat(user, span_notice("\The [src] shuts off!"))
set_anchored(FALSE)
if(W.tool_behaviour == TOOL_MULTITOOL)
var/a = stripped_input(usr, "Please enter desired ID.", name, id, 20)
if (!a)
return
id = a
. = TRUE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should probably use tool_acts but i forget if we actually like those

Comment on lines 83 to 85
/obj/machinery/meteor_shield/proc/los(meteor)
for(var/turf/T in getline(src,meteor))
return TRUE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to do nothing rn

Comment on lines 18 to 19
var/kill_range = 6
var/fire_delay = 7 SECONDS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These seem a bit strict for something you're spending probably 5k+ on; high delay means you'd chance losing a covered area because the turret's cooling (unless you have overlap) and low range means you'll need quite a few turrets even disregarding that

Comment on lines 135 to 142
/obj/machinery/computer/meteor_shield/ui_data()
var/list/data = list()

data["satellites"] = list()
for(var/obj/machinery/satellite/S in GLOB.machines)
for(var/obj/machinery/meteor_shield/S in GLOB.machines)
data["satellites"] += list(list(
"id" = S.id,
"active" = S.active,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might need some work to get the console to only show turrets on the same ship, otherwise you'll get a list of everyone's turrets regardless of if you can touch them & I think you can touch turrets if the ships are docked to the same location

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add them to a list on the ship. Shouldn't be too hard.

@Erikafox Erikafox marked this pull request as draft September 29, 2024 19:49
Copy link
Contributor

github-actions bot commented Oct 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 7, 2024
@Erikafox
Copy link
Contributor Author

heartbreaking: I am lazy

@Erikafox Erikafox closed this Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Merge Conflict Use Git Hooks, you're welcome. Test Merge Required They'll have to do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants