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

Cybersun's blacksite ruin #2835

Closed
wants to merge 23 commits into from
Closed

Cybersun's blacksite ruin #2835

wants to merge 23 commits into from

Conversation

Marabout2
Copy link

@Marabout2 Marabout2 commented Mar 11, 2024 •
edited
Loading

About The Pull Request

Apparently, there is a need for more ruin so here it is, one additional ruin to the rooster.

Why It's Good For The Game

More ruins mean more things to be explored ?
Screenshots
With areas :
image

Without any areas :
image

Ingame :
image

Changelog

🆑
add: Added a new Cybersun related ruin
code: Modified the map_catalogue.txt file; the icemoon.dm areas ruin file; modified the icemoon.dm datum to add said ruin.
🆑

@Marabout2 Marabout2 requested a review from a team as a code owner March 11, 2024 23:05
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Mar 11, 2024
thgvr
thgvr reviewed Mar 11, 2024
View reviewed changes
code/game/area/areas/ruins/icemoon.dm
ambientsounds = MAINTENANCE
lighting_colour_tube = "#ffe5cb"
lighting_colour_bulb = "#ffdbb4"
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED

thgvr
thgvr reviewed Mar 11, 2024
View reviewed changes
code/datums/ruins/icemoon.dm Outdated
@@ -64,3 +69,5 @@
id = "crashed_holemaker"
description = "Safety records for early Nanotrasen Spaceworks vessels were, and always have been, top of their class. Absolutely no multi-billion credit projects have been painstakingly erased from history. (Citation Needed)"
suffix = "icemoon_crashed_holemaker.dmm"


Copy link
Member

Choose a reason for hiding this comment

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

Suggested change

@tiramisuapimancer
Copy link
Contributor

chicken typo

@Latentish
Copy link
Member

Add 3 pictures to show your ruin in your description. 1 in game screenshot (Use the command "Change View Range" to get one while ghosted), and two SDMM screenshots (one with areas on, one with only area borders on) (make sure to use the screenshot button in sdmm).

@Marabout2
Copy link
Author

Alright, should be done with the images too !

@Latentish
Copy link
Member

image
Don't copy paste content from another ruin for this please.

Latentish
Latentish requested changes Mar 22, 2024
View reviewed changes
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

image
Don't run pipes through walls unless it is for an the singular exhaust pipe of a ship or compound.

image
Add a dangerous mob here =)

Add some fluff incriminating the syndies here as fringe ex members, or deserters.

Change your shuttle here, it's lifted straight from the bombed out airbase.

I think this is a strong ruin, fix your stuff up and we can look at TMing it.

@Latentish
Copy link
Member

image
This door is facing the wrong direction. you have a diagonal wall here (don't do that), you missed one underwall pipe, and these lights need to have a wire node under them to turn on.
Aside from this I'm very very impressed.

@Latentish
Copy link
Member

image
this rainbow area is certainly concerning . I would recommend looking at the li-tieguai and using the red decals that it uses if these ones are being a bit too 70's.

@meemofcourse
Copy link
Contributor

happy april fools lat

Latentish
Latentish requested changes Apr 11, 2024
View reviewed changes
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

image
Hi!!!! This is going to cause an atmosphere difference. I'd recommend closing it up and adding an airlock, or making icemoon outside subytpes for cement and stairs.

image
Open plating actually already has an icemoon subtype. Use that instead.

Other than that this looks pretty good. Get those tiles fixed and we can TM this.

goober3
goober3 requested changes May 17, 2024
View reviewed changes
Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

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

please swap out the snow turfs outside for the /lit variant. also, fix your unrotated airlocks.

@FalloutFalcon FalloutFalcon added Ruin Ruin successfully tested. Test Merged They've done it for free. labels May 24, 2024
@Bimbly Bimbly mentioned this pull request Jun 6, 2024
Merged
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 9, 2024

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

@Latentish
Copy link
Member

I want this merged already. Get this passing checks, and I will give it a lookover on local, and I'll merge it.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 21, 2024
@Anticept Anticept mentioned this pull request Jun 21, 2024
Closed
@SomeguyManperson
Copy link
Contributor

syndie mobs in this need to be swapped to the new hostile human paths

SomeguyManperson
SomeguyManperson reviewed Jul 17, 2024
View reviewed changes
Copy link
Contributor

@SomeguyManperson SomeguyManperson left a comment

Choose a reason for hiding this comment

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

should fix present issues

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
/obj/structure/chair{
dir = 4
},
/mob/living/simple_animal/hostile/syndicate/melee/space,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/melee/space,
/mob/living/simple_animal/hostile/human/syndicate/melee/space,

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
/turf/open/floor/plasteel/dark,
/area/ruin/powered/testing_facilities)
"oA" = (
/mob/living/simple_animal/hostile/syndicate/ranged/space,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/ranged/space,
/mob/living/simple_animal/hostile/human/syndicate/ranged/space,

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
/turf/open/floor/plasteel/white,
/area/ruin/powered/testing_facilities)
"EH" = (
/mob/living/simple_animal/hostile/syndicate/melee/sword,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/melee/sword,
/mob/living/simple_animal/hostile/human/syndicate/melee/sword,

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
/obj/structure/chair/office/dark{
dir = 4
},
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
/mob/living/simple_animal/hostile/human/syndicate/ranged/space/stormtrooper{

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
dir = 1;
name = "Pilot's Chair"
},
/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot{
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg{

pilot subtype was killed brutally in ruincut

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
/area/ruin/powered/crew_facilities)
"XQ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion,
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/orion,

_maps/RandomRuins/IceRuins/icemoon_cybersun_blacksite.dmm
},
/area/ruin/powered/hangar)
"Ur" = (
/mob/living/simple_animal/hostile/syndicate/melee,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/mob/living/simple_animal/hostile/syndicate/melee,
/mob/living/simple_animal/hostile/human/syndicate/melee,

@rye-rice
Copy link
Member

rye-rice commented Aug 6, 2024

sowwy, nwo prwogwess iwn a mwonth, rweopwen wwen wrorking on iwt agwian

@rye-rice rye-rice closed this Aug 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thgvr thgvr thgvr left review comments

@SomeguyManperson SomeguyManperson SomeguyManperson left review comments

@goober3 goober3 goober3 requested changes

@Latentish Latentish Latentish requested changes

Assignees
No one assigned
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Test Merged They've done it for free.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Marabout2 @tiramisuapimancer @Latentish @meemofcourse @SomeguyManperson @rye-rice @thgvr @goober3 @FalloutFalcon @Bokkiewokkie