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

Jump to bottom

March Mapping Madness - New space ruin #73978

Merged
merged 18 commits into from Mar 22, 2023
Merged

March Mapping Madness - New space ruin #73978

merged 18 commits into from Mar 22, 2023

Conversation

Astrogem2
Copy link
Contributor

@Astrogem2 Astrogem2 commented Mar 13, 2023 •
edited by Maurukas

I have made a new space ruin which is based off of the game Prey, cause mimics are cool, and I think some variety in space ruins would be swell

About The Pull Request

This pull request is about a new ruin I have made, which I have taken inspiration on by the hit 2017 game Prey, which I enjoy.

prey 2, the peryer

Mapping March

Ckey to receive rewards: Astrogem2

Why It's Good For The Game

We don't have that many Ruins out in space, and some new ones would be nice to see.

Changelog

🆑 Astrogem2

add: New space ruin that I have made, which adds some variety to space searching.

/:cl:

@Astrogem2
March Mapping Madness - New space ruin
dbe982e 
I have made a new space ruin which is based off of the game Prey, cause mimics are cool, and I think some variety in space ruins would be swell
@tgstation-server tgstation-server added Feature Exposes new bugs in interesting ways Map Edit Thank you for your tile-placing service. It's always appreciated. labels Mar 13, 2023
@VladinXXV
Copy link
Contributor

Can you include pictures of the ruin in the PR body please? You might also want to expand your changelog entry.

@Astrogem2
Copy link
Contributor Author

ight

@Astrogem2
Changes a small oopsie in a variable I made
1936d72 
Cause I put true instead of 1
@san7890
Copy link
Member

san7890 commented Mar 14, 2023

that asteroid is way too big for so much regular rock, trim down the overall map size or just splinter that big asteroid into a bunch of smaller ones

@Astrogem2
Copy link
Contributor Author

got it

@san7890
Copy link
Member

san7890 commented Mar 14, 2023

be sure to edit your PR body with the latest version of the map to ensure that newer people who come in and see this PR don't give feedback on an outdated version of the map, thanks

@wesoda25
Copy link
Contributor

Love the little simple ones like this 👍

@Addust
Copy link
Contributor

Addust commented Mar 14, 2023

plating under the windows
hivelords, holy shit rare

@Addust
Copy link
Contributor

Addust commented Mar 14, 2023

also it needs a ruin config thingymajig (check other ruin PRs!)

@Valorium-RB
Copy link

The foam force crossbow should be renamed to the Huntress Boltcaster, to complete the reference.

@Astrogem2
Copy link
Contributor Author

damn i’m gaming right now, i’ll do these after

@san7890
Copy link
Member

san7890 commented Mar 14, 2023

you must add this to https://github.com/tgstation/tgstation/blob/master/config/spaceruinblacklist.txt

@Astrogem2
Put it where it goes, and adds it to ruin config.
142905a 
I have moved the map to the ruin folder where the other ones are, along with adding it to the ruins config, I also removed an extra gap in the config because it didn't look important. (also the CRLF line endings are being turned into LF endings, I hope that doesn't do anything bad)
@Astrogem2
Copy link
Contributor Author

ok i've done that now i'm pretty sure.

@san7890
Copy link
Member

san7890 commented Mar 15, 2023

they aren't in your PR. push your commit to remote, or commit your staged changes and then push to remote.

@Astrogem2
Copy link
Contributor Author

uhhhhh, ill try to do that i guess.

@Astrogem2
Copy link
Contributor Author

wait i think i made another pr for that by mistake

@Astrogem2
Adds my ruin dmm to the blacklist
8c68a2a 
After a little while, i now know where this file is, and now its in this pr commit, so it doesn't need another pr to do this :)
@Astrogem2
Copy link
Contributor Author

ok im praying that this works now.

@Rex9001
Copy link
Contributor

Rex9001 commented Mar 16, 2023

Looks great! A fun little refrence ruin using a very much so fitting enemy

@github-actions github-actions bot added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Mar 17, 2023
@san7890
Copy link
Member

san7890 commented Mar 18, 2023

fix your conflicts, and also add a /obj/effect/baseturf_helper/asteroid/airless into the ruin's area (maybe making a new area for it as well, it's not that hard) such that if anyone decides to use a grenade, it'll only scrape away the walls of the ruin, and not punch a hole into space.

@san7890 san7890 marked this pull request as draft March 18, 2023 07:37
@tgstation-server tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Mar 19, 2023
Astrogem2 and others added 4 commits March 18, 2023 23:28
@Astrogem2
adds baseturf helper
f461d11 
adds the helper that makes it so that when something explodes, it only removes the walls and now the floors.
@Astrogem2
Merge branch 'Prey' of https://github.com/Astrogem2/Prey-Ruin into Prey
c13bbd7
@Astrogem2
fixing linter error
8abb11e 
fixes linter error caused by spaces and not tab indent (i hope)
@Astrogem2
Merge branch 'master' into Prey
ab3731e
@Astrogem2 Astrogem2 marked this pull request as ready for review March 19, 2023 20:45
Maurukas
Maurukas requested changes Mar 21, 2023
View reviewed changes
Copy link
Member

@Maurukas Maurukas left a comment

Choose a reason for hiding this comment

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

Looks good. Please fix the file name.

If you'd like, you can give the terminal custom text. Look at code/modules/mapfluff/ruins/spaceruin_code/dangerous_research.dm and TheDerelict.dm for examples.

code/datums/ruins/space.dm Outdated Show resolved Hide resolved
@Astrogem2 @Maurukas
Update code/datums/ruins/space.dm
325fafc 
Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com>
@github-actions github-actions bot requested a review from Maurukas March 21, 2023 04:24
@github-actions github-actions bot requested a review from Maurukas March 22, 2023 01:44
@Maurukas Maurukas merged commit cbe04f4 into tgstation:master Mar 22, 2023
17 checks passed
comfyorange added a commit that referenced this pull request Mar 22, 2023
@comfyorange
Automatic changelog for PR #73978 [ci skip]
d3b48f6
@github-actions
Copy link
Contributor

Your Fix/Feature pull request is currently below zero (-6). Maintainers may close future Feature/Balance PRs. Fixing issues or helping to improve the codebase will raise this score.

github-actions bot added a commit that referenced this pull request Mar 22, 2023
@github-actions
Updating GBP balances for #73978
cd3d10a
@SkyratBot SkyratBot mentioned this pull request Mar 22, 2023
Merged
@TaleStationBot TaleStationBot mentioned this pull request Mar 22, 2023
Merged
Jolly-66 pushed a commit to TaleStation/TaleStation that referenced this pull request Mar 23, 2023
@TaleStationBot @Astrogem2
[MIRROR] [MDB IGNORE] March Mapping Madness - New space ruin (#5020)
365f04a 
Original PR: tgstation/tgstation#73978
-----
I have made a new space ruin which is based off of the game Prey, cause
mimics are cool, and I think some variety in space ruins would be swell
## About The Pull Request
This pull request is about a new ruin I have made, which I have taken
inspiration on by the hit 2017 game Prey, which I enjoy.

![prey 2, the
peryer](https://user-images.githubusercontent.com/101240878/224872167-e39ab784-9bf2-4d0a-bf3f-9e277ae1b7e8.png)


### Mapping March
Ckey to receive rewards: Astrogem2

## Why It's Good For The Game
We don't have that many Ruins out in space, and some new ones would be
nice to see.

## Changelog
:cl: Astrogem2

add: New space ruin that I have made, which adds some variety to space
searching.

/:cl:

---------

Co-authored-by: Astrogem2 <101240878+Astrogem2@users.noreply.github.com>
scriptis pushed a commit to scriptis/tgstation that referenced this pull request Apr 1, 2023
@Astrogem2
March Mapping Madness - New space ruin (tgstation#73978)
9907df0
scriptis pushed a commit to scriptis/tgstation that referenced this pull request Apr 1, 2023
@comfyorange
Automatic changelog for PR tgstation#73978 [ci skip]
a25eaa5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EOBGames EOBGames Awaiting requested review from EOBGames EOBGames is a code owner

@MMMiracles MMMiracles Awaiting requested review from MMMiracles MMMiracles is a code owner

@san7890 san7890 Awaiting requested review from san7890 san7890 is a code owner

@ShizCalev ShizCalev Awaiting requested review from ShizCalev ShizCalev is a code owner

@MrStonedOne MrStonedOne Awaiting requested review from MrStonedOne

@Maurukas Maurukas Awaiting requested review from Maurukas Maurukas is a code owner

Assignees
No one assigned
Labels
Config Update Time to bother the headadmins for three months to get your config applied Feature Exposes new bugs in interesting ways Map Edit Thank you for your tile-placing service. It's always appreciated.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Astrogem2 @VladinXXV @san7890 @wesoda25 @Addust @Valorium-RB @Rex9001 @Maurukas @tgstation-server