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

Colin map updates #1299

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Conversation

Colin-Tel
Copy link
Contributor

About the PR

Minor quality checking of Micro, Edge, and Asterisk.

Why / Balance

Recent atmos pipe buggery, bridge cryos being out of fashion, etc.

Changelog

:)

Minor quality checking of all maps.
@Colin-Tel Colin-Tel requested a review from IamVelcroboy as a code owner June 4, 2024 01:51
@deltav-mapserver
Copy link

deltav-mapserver bot commented Jun 4, 2024

This PR contains new or changed maps:

Micro

image

Edge

image

Asterisk

image

06/04/24 04:31

@IamVelcroboy IamVelcroboy merged commit 60ead04 into DeltaV-Station:master Jun 4, 2024
11 checks passed
@Colin-Tel Colin-Tel deleted the colinmapedits branch July 9, 2024 05:24
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

Adds **38** new earrings, **31** new face markings, and **16**
bracelet/watch markings, based from Aurorastation cosmetics. Each
earring, bracelet, and watch marking is applied to just one side of the
body, allowing for greater customizability and mixing-and-matching
markings.

Most notably, the new face markings unlock **full customization of every
pixel** in the 5x4 pixel space of the face. Examples of this are shown
below.

Arachne now have access to **more than a hundred** markings above the
leg, after not having any markings in their 2 years of existence.

## Media

### Pauline

<img height=270px
src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2">
<img height=270px
src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5">

**Head (Side):** Drop Earrings (Left), Drop Earrings (Right)
**Left Hand:** Left Bracelet

### Red and Blue

<img height=270px
src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895">

**Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye
Corner (Right)
**Head (Side):** Double Gemstone Earrings (Left), Double Gemstone
Earrings (Right)
**Left Hand:** Left Watch (Colorable)
**Left Arm:** Left Arm Bracelet
**Right Hand:** Right Watch (Colorable)
**Right Arm:** Right Arm Bracelet

### Pink

<img height=270px
src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6">

**Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right)
**Left Hand:** Left Bracelet
**Left Arm:** Left Arm Bracelet
**Right Hand:** Right Bracelet
**Right Arm:** Right Arm Bracelet

### Psychic

<img height=270px
src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a">

**Head:** Bindi, Full Blush
**Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings
(Right)
**Left Hand:** Left Bracelet
**Right Hand:** Right Bracelet
**Right Arm:** Right Arm Bracelet

### Cyclops

<img height=270px
src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b">

**Head [Eyes]:** Bindi, Glabella, Nose Tape
**Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right),
Cheek Spot (Left), Cheek Spot (Right), Lips
**Head (Side):** Cross Earrings (Left), Cross Earrings (Right)

### 😂

<img height=270px
src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a">

### Arachne


![image](https://github.com/user-attachments/assets/b9935347-8977-4424-9b9b-b08aecb458b2)

**Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim
Thick)
**Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings
(Right)
**Left Arm:** Left Robotic Arm from Hesphiastos Industries
**Left Hand:** Left Robotic Arm from Bishop Cybernetics
**Right Arm:** Right Arm Bracelet
**Right Hand:** Right Watch (Colorable), Right Nail Polish

## Technical Details

I did a quick fix in
[MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513)
to handle a list index out of bounds error where the number of default
markings was lower than the maximum allowed markings, like with Onis who
have a default horn but can wear 2 earrings.

# Changelog


<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Skubman
- add: 80+ new markings have arrived, including earrings, makeup,
bracelets, and watches. Sashay over to Character Setup to personalize
your character like never before!
- add: The Arachne species can now select markings above the leg,
including cybernetics, makeup, tattoos, noses, earrings, heterochromia,
bracelets, gauze, and more!
- tweak: The available points for Head (Side), Left Hand, and Right Hand
markings have been increased for most species to support the new
markings.
- tweak: The Nail Polish markings have been moved from the Overlay
category to the Left Hand and Right Hand categories.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants