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

Corporate Dome Nightmare Insert Expansion #7893

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Corporate Dome Nightmare Insert Expansion #7893

wants to merge 20 commits into from
+415 −77

Conversation

BOBAMAx
Copy link
Contributor

@BOBAMAx BOBAMAx commented Dec 23, 2024 •
edited
Loading

About the pull request

goonredux

Adds engi, medic, and TL to corp dome nightmare insert. Changes some other fluff stuff like factions so they appear in the WY tab and the MD in the insert doesn't ping on goons. Adds flavor uniforms for goon med and engi with different sprites (credit to vandie)

Explain why it's good for the game

engis and medics and TLs incentivize people to stick together and cooperate with their fellow man instead of hiding or running off or whatever. facilitates more interesting roleplay. Everything else is minor detailing and fluff like faction tabs and alt uniform sprites.

Testing Photographs and Procedure

In game

goons2

Changelog

🆑
add: Goon Medic
imageadd: New alt uniforms for goon techs and medics
maptweak: Corporate Dome nightmare insert now has a medic, engi, and TL.
/:cl:

@BOBAMAx BOBAMAx requested a review from Nanu308 as a code owner December 23, 2024 08:17
@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Dec 23, 2024
@BOBAMAx
whoops maybe I should run linters before making a pr nah that would b…
ccacc71 
…e too hard
@BOBAMAx
Update corporatedome.dmm
768604b
@BOBAMAx
Fixup maps in TGM format
f6dca47 
895339f: maps/map_files/LV624/standalone/corporatedome.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@thevandie
Copy link
Contributor

I have sprites for this that you should add!

@BOBAMAx BOBAMAx marked this pull request as draft December 23, 2024 23:58
@BOBAMAx
new goon sprites
fd5fc85
@BOBAMAx
Fixup maps in TGM format
7d8c967 
895339f: maps/map_files/LV624/standalone/corporatedome.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@BOBAMAx BOBAMAx marked this pull request as ready for review December 26, 2024 10:45
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 27, 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 27, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 1, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 2, 2025
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 4, 2025
@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 Jan 4, 2025
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 13, 2025
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 13, 2025
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 13, 2025
@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 Jan 15, 2025
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

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

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 17, 2025
@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 Jan 18, 2025
@cm13-github
Copy link
Contributor

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

realforest2001
realforest2001 previously requested changes Jan 18, 2025
View reviewed changes
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
maps/map_files/LV624/standalone/corporatedome.dmm Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@realforest2001 realforest2001 realforest2001 left review comments

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

Assignees
No one assigned
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Sprites Remove the soul from the game.
Projects
Review Backlog
Status: Changes Requested
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BOBAMAx @thevandie @cm13-github @realforest2001