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 Map: LV-759 Hybrisa Prospera #6248

Merged
merged 651 commits into from
Dec 27, 2024
Merged

Conversation

Zenith00000
Copy link
Contributor

@Zenith00000 Zenith00000 commented May 6, 2024

About the pull request

This PR adds a massive new "Urban" themed "City" map - LV-759 Hybrisa Prospera.
Survivors have been massively expanded upon compared to other maps, with unique loadouts, jobs and clothing.
Massive amount of props, sprites and new assets added.
Destructible vehicles (currently only the Mono-Spectra has all of it's damage states) - more to come, but every vehicle can be destroyed so you can clear the road-ways for easier access, both the Marines and Xenos.
Unique "Electric Fence" system around the map, use them to your advantage to hold back the Xenos.
New drivable Box-Vans with interiors.
Huge amount of new sounds for a much needed city-on-fire "Urban" atmosphere.
New Light and Very light unique rain weather, and rain sounds.
New FN P90 sub-machine gun (bringing back a classic).
Phone boxes you can hide in.
Hospital roller beds which can drop corpses (non-foldable)
RATS! - Collect them all!
Trash, so much trash...

Reworks urban camo to a proper working condition, all the missing sprites are added, a lof of clothing reworked

There's so many changes within the code as well, it's hard to really explain everything changed here.

I've probably forgot something, but there's a lot added, trust me...

What I want in the future:

  1. Finish all of the car damage-states sprites.

  2. Replace the Xeno-cryo stuff with better sprites.

  3. Replace the graffiti sprites with better sprites.

Why it's good for the game

Firstly if you want an idea of the lore behind the map, here's something "Steelpoint" came up with, which I think sums up the colony and events behind the map fairly well, most likely a WIP, but should give you a better idea regardless.
Hybrisa lore.txt

It's been a long time coming, but we've needed new maps badly. I've always wanted to see an "Urban" or "City" themed map; Since nobody has really come up with something that really embodies the "Urban" theme, I decided I really should give back to the community and make it myself.
The inspiration for the map really was from maps like Chances and Trijent especially, with aspects from others too. I really loved how Trijent had those open roads, checkpoint systems, and how Chances somewhat got the "Urban" theme, but wanted to take it to a whole new level. It also gives us an excuse to finally use the "Urban" camo and perhaps make more appropriate sprites that aren't just a strange purple version.

I hope this map can serve the CM community well; the assets be used for new maps perhaps, especially some of the wonderful "Space-Jockey" stuff that Wei did.

I also hope in the future the map can be improved or expanded upon, especially sprite-wise.

More information

For much more information and higher quality screenshots, check out the Discord contributor page.

https://discord.com/channels/150315577943130112/1193421313839202304

Map Screenshots

Main Map & Tactical Map

LV759_Hybrisa Prospera

Tactical Map (strangely cut off up top) :

Hybrisa Tactical map

Changelog

🆑 Zenith, mikoka wei, Drathek, Nanu, Cuberound, Almings, Crowford, Blundir, dimdimich1996

add: added a new map LV_759_Hybrisa_Prospera.
add: Many new varied survivor types unique to Hybrisa - with many new clothing types & sprites mostly done by wei
add: Massive amount of new props with new sprites (some edits of current props, credits to the original artists).
add: Unique "Derelict-Ship" or "Engineer" tile-set by "mikoka wei" (amazing stuff).
add: Destructible vehicles.
add: Unique "Electric-Fence" system around the map with button to turn on/off.
add: New drivable "Box-Vans" with unique interior & sounds.
add: New gun - FN P90, with two versions, the regular colony version and a TWE version, sprites originally from TGMC and edited by "Almings".
add: Massive amount of new sounds for atmosphere.
add: Two new weathers "Light & Very light" unique rain weather, and rain sounds.
add: "Phoneboxes" you can hide inside, like a locker.
add: Hospital roller beds, with unique variants that can drop a corpse (non-foldable).
add: New "Rat" simple-mob type with unique sprites.
add: Urban camo rework and fix, added all the missing sprites and proper functionality, resprites all the urban armor and clothing
fix: many guns having no mob suit storage sprite if there is no mag in a gun
/:cl:

@Zenith00000 Zenith00000 requested a review from Nanu308 as a code owner May 6, 2024 12:10
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label May 6, 2024
@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels May 6, 2024
@Zenith00000 Zenith00000 closed this May 6, 2024
@Nanu308 Nanu308 reopened this May 19, 2024
@Nanu308 Nanu308 self-assigned this May 19, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label May 19, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Nanu308 Nanu308 changed the title Hybrisa 137 commits behind New Map: Hybrisa May 19, 2024
maps/lv759_hybrisa_prospera.json Outdated Show resolved Hide resolved
code/game/machinery/hybrsia_lights.dm Outdated Show resolved Hide resolved
code/game/machinery/hybrsia_lights.dm Outdated Show resolved Hide resolved
code/game/machinery/hybrsia_lights.dm Outdated Show resolved Hide resolved
colonialmarines.dme Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft May 22, 2024 20:04
code/game/machinery/hybrisa_lights.dm Outdated Show resolved Hide resolved
code/game/machinery/hybrisa_lights.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
@Zenith00000 Zenith00000 changed the title New Map: Hybrisa New Map: LV-759 Hybrisa Prospera May 23, 2024
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/game/area/LV759_Hybrisa_Prospera.dm Show resolved Hide resolved
code/game/area/LV759_Hybrisa_Prospera.dm Show resolved Hide resolved
code/game/objects/structures/hybrisa_props.dm Outdated Show resolved Hide resolved
code/__DEFINES/minimap.dm Outdated Show resolved Hide resolved
code/__DEFINES/layers.dm Outdated Show resolved Hide resolved
@Drulikar
Copy link
Contributor

Drulikar commented Jun 3, 2024

Nothing else sticks out to me at the moment. So its just whatever else you wanted to get in before test merges.

@Drulikar Drulikar dismissed their stale review June 3, 2024 08:45

Resolved

@Drulikar Drulikar added Testmerge Candidate we'll test this while you're asleep and the server has 10 players Needs Testing Need to test it on the guinea pigs (production server) labels Jun 4, 2024
code/modules/projectiles/guns/smgs.dm Outdated Show resolved Hide resolved
code/modules/projectiles/magazines/smgs.dm Outdated Show resolved Hide resolved
code/modules/projectiles/magazines/smgs.dm Outdated Show resolved Hide resolved
code/datums/ammo/bullet/smg.dm Outdated Show resolved Hide resolved
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 16, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 18, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 18, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Drulikar Drulikar removed the Needs Testing Need to test it on the guinea pigs (production server) label Dec 19, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

I've gone through the map now, there might be things I've missed, but i believe this review should be extensive enough to get all big issues that could crop up.

Should there be further tweaks needed to gameplay flow or otherwise it will be dealt with post-merge.

tools/UpdatePaths/Scripts/6248.hybrisa_open_turfs.txt Outdated Show resolved Hide resolved
maps/templates/lazy_templates/uscm_ert_station.dmm Outdated Show resolved Hide resolved
maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm Outdated Show resolved Hide resolved
maps/map_files/BigRed/BigRed.dmm Outdated Show resolved Hide resolved
maps/lv759_hybrisa_prospera.json Outdated Show resolved Hide resolved
maps/map_files/BigRed/BigRed.dmm Outdated Show resolved Hide resolved
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Dec 27, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

Mapping approved, we're so mergeable

@Nanu308 Nanu308 added this pull request to the merge queue Dec 27, 2024
Merged via the queue into cmss13-devs:master with commit 789a362 Dec 27, 2024
39 checks passed
cmss13-ci bot added a commit that referenced this pull request Dec 27, 2024
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Dec 31, 2024
# About the pull request

This PR adds a massive new "Urban" themed "City" map - LV-759 Hybrisa
Prospera.
Survivors have been massively expanded upon compared to other maps, with
unique loadouts, jobs and clothing.
Massive amount of props, sprites and new assets added.
Destructible vehicles (currently only the Mono-Spectra has all of it's
damage states) - more to come, but every vehicle can be destroyed so you
can clear the road-ways for easier access, both the Marines and Xenos.
Unique "Electric Fence" system around the map, use them to your
advantage to hold back the Xenos.
New drivable Box-Vans with interiors.
Huge amount of new sounds for a much needed city-on-fire "Urban"
atmosphere.
New Light and Very light unique rain weather, and rain sounds.
New FN P90 sub-machine gun (bringing back a classic).
Phone boxes you can hide in.
Hospital roller beds which can drop corpses (non-foldable)
RATS! - Collect them all!
Trash, so much trash...

Reworks urban camo to a proper working condition, all the missing
sprites are added, a lof of clothing reworked

There's so many changes within the code as well, it's hard to really
explain everything changed here.

I've probably forgot something, but there's a lot added, trust me...

_What I want in the future:_

1. _Finish all of the car damage-states sprites._

2. _Replace the Xeno-cryo stuff with better sprites._

3. _Replace the graffiti sprites with better sprites._

# Why it's good for the game

Firstly if you want an idea of the lore behind the map, here's something
"Steelpoint" came up with, which I think sums up the colony and events
behind the map fairly well, most likely a WIP, but should give you a
better idea regardless.
[Hybrisa
lore.txt](https://github.com/user-attachments/files/15845635/Hybrisa.lore.txt)

It's been a long time coming, but we've needed new maps badly. I've
always wanted to see an "Urban" or "City" themed map; Since nobody has
really come up with something that really embodies the "Urban" theme, I
decided I really should give back to the community and make it myself.
The inspiration for the map really was from maps like Chances and
Trijent especially, with aspects from others too. I really loved how
Trijent had those open roads, checkpoint systems, and how Chances
somewhat got the "Urban" theme, but wanted to take it to a whole new
level. It also gives us an excuse to finally use the "Urban" camo and
perhaps make more appropriate sprites that aren't just a strange purple
version.

I hope this map can serve the CM community well; the assets be used for
new maps perhaps, especially some of the wonderful "Space-Jockey" stuff
that Wei did.

I also hope in the future the map can be improved or expanded upon,
especially sprite-wise.

# More information

**For much more information and higher quality screenshots, check out
the Discord contributor page.**

https://discord.com/channels/150315577943130112/1193421313839202304



# Map Screenshots

</head>
<body>
    <details>
        <summary>Main Map & Tactical Map</summary>
        <p>

![LV759_Hybrisa
Prospera](https://github.com/cmss13-devs/cmss13/assets/109559450/f899c05e-9750-49da-ab5d-84ed4ed57681)

Tactical Map (strangely cut off up top) :

![Hybrisa Tactical
map](https://github.com/cmss13-devs/cmss13/assets/109559450/fe2c4351-7530-4f7a-807d-b6dcf5c34af4)

</p>
    </details>
</body>



# Changelog
:cl: Zenith, mikoka wei, Drathek, Nanu, Cuberound, Almings, Crowford,
Blundir, dimdimich1996

add: added a new map LV_759_Hybrisa_Prospera.
add: Many new varied survivor types unique to Hybrisa - with many new
clothing types & sprites mostly done by wei
add: Massive amount of new props with new sprites (some edits of current
props, credits to the original artists).
add: Unique "Derelict-Ship" or "Engineer" tile-set by "mikoka wei"
(amazing stuff).
add: Destructible vehicles.
add: Unique "Electric-Fence" system around the map with button to turn
on/off.
add: New drivable "Box-Vans" with unique interior & sounds.
add: New gun - FN P90, with two versions, the regular colony version and
a TWE version, sprites originally from TGMC and edited by "Almings".
add: Massive amount of new sounds for atmosphere.
add: Two new weathers "Light & Very light" unique rain weather, and rain
sounds.
add: "Phoneboxes" you can hide inside, like a locker.
add: Hospital roller beds, with unique variants that can drop a corpse
(non-foldable).
add: New "Rat" simple-mob type with unique sprites.
add: Urban camo rework and fix, added all the missing sprites and proper
functionality, resprites all the urban armor and clothing
fix: many guns having no mob suit storage sprite if there is no mag in a
gun
/:cl:

---------

Co-authored-by: Drulikar <drathek@gmail.com>
Co-authored-by: Blundir <100090741+Blundir@users.noreply.github.com>
Co-authored-by: forest2001 <41653574+realforest2001@users.noreply.github.com>
Co-authored-by: vincibrv <vojtechvincibr@seznam.cz>
Co-authored-by: Nanu308 <59782240+Nanu308@users.noreply.github.com>
Co-authored-by: bob <49925269+BOBAMAx@users.noreply.github.com>
Co-authored-by: harryob <me@harryob.live>
Co-authored-by: Tsurupeta <41485301+Tsurupeta@users.noreply.github.com>
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Dec 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Github We don't really know what else this belongs to Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.