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

New Sandplanet Ruin: Cave Base #3368

Merged
merged 39 commits into from
Oct 26, 2024

Conversation

Erikafox
Copy link
Contributor

@Erikafox Erikafox commented Sep 15, 2024

About The Pull Request

Adds a new ruin to the sand planet ruin pool - a small installation built into a cave holding some explosive revelations. And a Big Gun.
And satchel charges which are snowflaked c4.
Also reformats blackboxes mildly so they can start empty.
dreamseeker_1podgNhvaZ

dreamseeker_JDRbW73Vxg

StrongDMM-2024-09-29 23 12 47
StrongDMM-2024-09-29 23 12 48

Why It's Good For The Game

New map + simmy content

Changelog

🆑
add: Transceivers have been picking up an intermittent radio signal coming from a nearby sand world. People with too much spare time - please check it out.
add: Satchel Charges. Exceedingly rare and decently explosive.
/:cl:

@Erikafox Erikafox requested review from FalloutFalcon and a team as code owners September 15, 2024 23:47
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 15, 2024
thgvr
thgvr previously requested changes Sep 16, 2024
@@ -20,3 +20,24 @@
desc = "A .50 BMG penetrator bullet casing."
bullet_skin = "ap"
projectile_type = /obj/projectile/bullet/p50/penetrator

//14.5mm Crunch Gun
/obj/item/ammo_casing/p145
Copy link
Member

Choose a reason for hiding this comment

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

Yeah... this probably won't be happening

code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/rifle.dm Outdated Show resolved Hide resolved
code/modules/projectiles/projectile/bullets/sniper.dm Outdated Show resolved Hide resolved
code/modules/projectiles/projectile/bullets/sniper.dm Outdated Show resolved Hide resolved

//gut wrenching content

/datum/preset_holoimage/hapless_ipc
Copy link
Member

Choose a reason for hiding this comment

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

These are pretty solid.

code/modules/projectiles/projectile/bullets/sniper.dm Outdated Show resolved Hide resolved
code/modules/assembly/voice.dm Outdated Show resolved Hide resolved


// x-com ufo defense high ex charge 1993
/obj/item/grenade/c4/satchel_charge
Copy link
Member

Choose a reason for hiding this comment

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

This thing just feels a bit cheap to me. It pretty much only rewards knowing whats in the ruin beforehand, or having been there before.

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'm not entirely sure how to rework it while still keeping the intent of it being a gotcha trap (that admittedly, won't trigger too often)

@Erikafox Erikafox changed the title New Sandplanet Ruin + Feature Creep Features New Sandplanet Ruin: Cave Base Sep 16, 2024
@FalloutFalcon FalloutFalcon added the Ruin Ruin successfully tested. label Sep 20, 2024
@Erikafox Erikafox requested a review from thgvr September 20, 2024 23:27
Copy link
Contributor

@Gristlebee Gristlebee left a comment

Choose a reason for hiding this comment

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

  • Please add a picture of the ruin spawned in game.
  • The turrets guarding the base are set to be non-lethal. Having them on lethal would add some bite. Some extra traps like mines could be a fitting addition as well for defences.
  • The airlock controller detects the door to the generator/laundry room, which makes it not cycle properly.
    image
  • Items mapped on the same tile as a file cabinet get placed inside it on map gen. It isn't a big deal, but something to keep in mind if this wasn't intentional.
    image
    image
  • The satchel charge is really strong, managing to fullgib me in an elite hardsuit. Getting rid of the devastation range should make it more manageable
  • You've made a ruin with a strong story and premise, but my main concern when I look at this ruin is what there is not much to explore considering it's size. There is no compelling reason to check out the side caves, and the main content of the ruin, the base is on the small side. Some small rewards or greebles to reward looking around in the side caves would be a nice addition, along with some extra rooms in the base.

Copy link
Contributor

@Gristlebee Gristlebee left a comment

Choose a reason for hiding this comment

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

These two turrets dont have the proper area set and don't function.
image

I noticed as well while players were running through the ruin the turrets didn't target captains or certain heads of staff roles, you'll want to double check the targeting settings.

@meemofcourse
Copy link
Contributor

fix checks ?

@Gristlebee
Copy link
Contributor

I love gambling

@Gristlebee Gristlebee added this pull request to the merge queue Oct 26, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 26, 2024
@Erikafox
Copy link
Contributor Author

image
COME ONNNN

@Gristlebee
Copy link
Contributor

Aw dangit

@Gristlebee Gristlebee added this pull request to the merge queue Oct 26, 2024
@Sun-Soaked
Copy link
Member

Let's go gambling!

Merged via the queue into shiptest-ss13:master with commit b578198 Oct 26, 2024
16 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
<!-- 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
Adds a new ruin to the sand planet ruin pool - a small installation
built into a cave holding some explosive revelations. And a Big Gun.
And satchel charges which are snowflaked c4. 
Also reformats blackboxes mildly so they can start empty.

![dreamseeker_1podgNhvaZ](https://github.com/user-attachments/assets/413521a2-9b0f-43ff-88db-c9b79ce51e24)


![dreamseeker_JDRbW73Vxg](https://github.com/user-attachments/assets/feacc762-f72b-48ca-8f03-c5774b9fdc5f)


![StrongDMM-2024-09-29 23 12
47](https://github.com/user-attachments/assets/3f64d9c1-bcb1-45f8-adea-25072d5f5aca)
![StrongDMM-2024-09-29 23 12
48](https://github.com/user-attachments/assets/7be71711-5e99-4446-ab79-c9c04c529756)

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

## Why It's Good For The Game
New map + simmy content
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Transceivers have been picking up an intermittent radio signal
coming from a nearby sand world. People with too much spare time -
please check it out.
add: Satchel Charges. Exceedingly rare and decently explosive.
/: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. -->

---------

Co-authored-by: Erika Fox <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
<!-- 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
Adds a new ruin to the sand planet ruin pool - a small installation
built into a cave holding some explosive revelations. And a Big Gun.
And satchel charges which are snowflaked c4. 
Also reformats blackboxes mildly so they can start empty.

![dreamseeker_1podgNhvaZ](https://github.com/user-attachments/assets/413521a2-9b0f-43ff-88db-c9b79ce51e24)


![dreamseeker_JDRbW73Vxg](https://github.com/user-attachments/assets/feacc762-f72b-48ca-8f03-c5774b9fdc5f)


![StrongDMM-2024-09-29 23 12
47](https://github.com/user-attachments/assets/3f64d9c1-bcb1-45f8-adea-25072d5f5aca)
![StrongDMM-2024-09-29 23 12
48](https://github.com/user-attachments/assets/7be71711-5e99-4446-ab79-c9c04c529756)

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

## Why It's Good For The Game
New map + simmy content
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Transceivers have been picking up an intermittent radio signal
coming from a nearby sand world. People with too much spare time -
please check it out.
add: Satchel Charges. Exceedingly rare and decently explosive.
/: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. -->

---------

Co-authored-by: Erika Fox <[email protected]>
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. DME Edit Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants