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

Tactical Map Table | CIC Additions #8130

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jan 17, 2025

About the pull request

Ports the large CIC Table to PvP from PvE. The table is essentially a large sized tactical map.

This PR also adds it to CIC. In addition it adds the smooth-tiles recently added to the code base to the CIC and the cryo corridor.

Explain why it's good for the game

Bringing in additions from other Aliens media, and high quality sprite content to our server.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2025-01-17 12 16 37

(Out of date image as table is now on the west end and it uses a diff sprite, but showcases the table)

Changelog

🆑 Steelpoint, Zenith
add: Adds a large tactical map prop.
mapadd: Adds the large tactical map to the USS Almayer's CIC.
/:cl:

@Steelpoint Steelpoint requested a review from Nanu308 as a code owner January 17, 2025 04:29
@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 Jan 17, 2025
Steelpoint added 4 commits January 17, 2025 16:13
58987f9: maps/map_files/USS_Almayer/USS_Almayer.dmm

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

efzapa commented Jan 17, 2025

would add a couple rolling chairs around the map table just so it doesn't look totally out of place, or just add a table somewhere else for people to sit around in CIC

Steelpoint and others added 2 commits January 18, 2025 12:33
58987f9: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
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

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jan 18, 2025

// --- CIC Map Table --- //

/obj/structure/machinery/prop/almayer/CICmap/table
Copy link
Member

Choose a reason for hiding this comment

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

this is a prop, why not make it a subtype of existing tables so we don't copypaste code?

@cm13-github
Copy link
Contributor

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

Steelpoint added 2 commits February 6, 2025 16:16
7de503e: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 6, 2025
@cm13-github
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Remove the soul from the game.
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

6 participants