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

Makes the Game Fun Again #19

Closed
wants to merge 22 commits into from
Closed

Makes the Game Fun Again #19

wants to merge 22 commits into from

Conversation

Yobrocharlie
Copy link

@Yobrocharlie Yobrocharlie commented Jul 23, 2024 •
edited
Loading

This PR will partially un-fuck the codebase from the actual sub-brick IQ that is some of their current coders who theyre letting cook slop.

Adds back a lot of the old ruins because thats really a lot of the only gameplay shiptest has, and removing most of their content is one of the smoothest brained moves ive seen in a PR in a long time ever since the disabler nerf PR on beestation

@github-actions github-actions bot added Code Change Mapping Your tile placing services appeases the dark lord labels Jul 23, 2024
@Yobrocharlie
Adds a few more ships
ce4da2f 
these guys are really far more retarded than i remember
@Yobrocharlie
nah you tarded
19f9328
@Yobrocharlie
Update shiptest.dme
fec0f51
@Yobrocharlie
smol fix
e6cff89 
hopefully this works?
@Yobrocharlie
Revert "smol fix"
b8c528f 
This reverts commit e6cff89.
@Yobrocharlie
test hopefully this works
8b0437d
@Constellado Constellado changed the title Easier Makes the Game Easier Jul 23, 2024
@Constellado Constellado changed the title Makes the Game Easier Makes the Game Fun Again Jul 23, 2024
Constellado
Constellado requested changes Jul 23, 2024
View reviewed changes
Copy link
Owner

@Constellado Constellado left a comment

Choose a reason for hiding this comment

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

Remove these and it compiles.

code/game/area/areas/ruins/lavaland.dm Outdated

/area/ruin/unpowered/scorched_hut
name = "Scorched Hut"
icon_state = "red"

<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
<<<<<<< HEAD

code/game/area/areas/ruins/lavaland.dm Outdated
@@ -77,11 +153,9 @@
requires_power = FALSE
//Buried Shrine

=======
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
=======

code/game/area/areas/ruins/lavaland.dm Outdated
@@ -77,11 +153,9 @@
requires_power = FALSE
//Buried Shrine

=======
>>>>>>> parent of f11a7aaaec (THE RUINCUT [AFFRONT TO GOD] (#3026))
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
>>>>>>> parent of f11a7aaaec (THE RUINCUT [AFFRONT TO GOD] (#3026))

Yobrocharlie and others added 3 commits July 22, 2024 21:51
@Yobrocharlie @Constellado
Update code/game/area/areas/ruins/lavaland.dm
fa861bd 
Co-authored-by: Constellado <[email protected]>
Signed-off-by: Yobrocharlie <[email protected]>
@Yobrocharlie @Constellado
Update code/game/area/areas/ruins/lavaland.dm
8a69f79 
Co-authored-by: Constellado <[email protected]>
Signed-off-by: Yobrocharlie <[email protected]>
@Yobrocharlie @Constellado
Update code/game/area/areas/ruins/lavaland.dm
e6c7c6d 
Co-authored-by: Constellado <[email protected]>
Signed-off-by: Yobrocharlie <[email protected]>
@Blacklist897
Copy link

RUBE IS BACK BABY.

@Constellado
Copy link
Owner

I can't compile this after my recent PRs (due to how solgov is now terragov) so I think it's breaking maps or something.

I'll go through and fix it up if I can figure out how to pick up this and fix it up myself.

@Draggeru
Copy link
Collaborator

Draggeru commented Jul 29, 2024 •
edited
Loading

While I can appreciate the spunk your PR body should contain a comprehensive list of what you are adding changing or reverting so those without context can still understand what your PR is doing.

@Yobrocharlie
Copy link
Author

While I can appreciate the spunk your PR body should contain a comprehensive list of what you are adding changing or reverting so those without context can still understand what your PR is doing.

sure

@Yobrocharlie
Copy link
Author

okay i think i need to start from the ground up with a new pr

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Constellado Constellado Constellado approved these changes

Assignees
No one assigned
Labels
Mapping Your tile placing services appeases the dark lord
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yobrocharlie @Blacklist897 @Constellado @Draggeru