mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Ports a bunch of Baystation's underclothes and hair
This commit is contained in:
Anewbe
@@ -62,4 +62,9 @@
|
||||
/datum/category_item/underwear/bottom/striped_panties
|
||||
name = "Striped Panties"
|
||||
icon_state = "striped_panties"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/category_item/underwear/bottom/longjon
|
||||
name = "Long John Bottoms"
|
||||
icon_state = "ljonb"
|
||||
has_color = TRUE
|
||||
@@ -51,6 +51,18 @@
|
||||
name = "Tank top, fire, feminine"
|
||||
icon_state = "tank_fire_fem_s"
|
||||
|
||||
/datum/category_item/underwear/undershirt/tank_top_rainbow
|
||||
name = "Tank top, rainbow"
|
||||
icon_state = "tank_rainbow_s"
|
||||
|
||||
/datum/category_item/underwear/undershirt/tank_top_stripes
|
||||
name = "Tank top, striped"
|
||||
icon_state = "tank_stripes_s"
|
||||
|
||||
/datum/category_item/underwear/undershirt/tank_top_sun
|
||||
name = "Tank top, sun"
|
||||
icon_state = "tank_sun_s"
|
||||
|
||||
/datum/category_item/underwear/undershirt/shirt_heart
|
||||
name = "Shirt, heart"
|
||||
icon_state = "lover_s"
|
||||
@@ -125,4 +137,17 @@
|
||||
|
||||
/datum/category_item/underwear/undershirt/bowlingw
|
||||
name = "Bowling Shirt, White"
|
||||
icon_state = "bowlingw"
|
||||
icon_state = "bowlingw"
|
||||
|
||||
/datum/category_item/underwear/undershirt/longjon
|
||||
name = "Long John Shirt"
|
||||
icon_state = "longjont"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/category_item/underwear/undershirt/longstripe_black
|
||||
name = "Longsleeve Striped Shirt, Black"
|
||||
icon_state = "longstripe"
|
||||
|
||||
/datum/category_item/underwear/undershirt/longstripe_blue
|
||||
name = "Longsleeve Striped Shirt, Blue"
|
||||
icon_state = "longstripe_blue"
|
||||
@@ -61,51 +61,6 @@
|
||||
name = "Short Hair 2"
|
||||
icon_state = "hair_shorthair3"
|
||||
|
||||
teshari
|
||||
name = "Teshari Default"
|
||||
icon_state = "seromi_default"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_altdefault
|
||||
name = "Teshari Alt. Default"
|
||||
icon_state = "seromi_ears"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_tight
|
||||
name = "Teshari Tight"
|
||||
icon_state = "seromi_tight"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_excited
|
||||
name = "Teshari Spiky"
|
||||
icon_state = "seromi_spiky"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_spike
|
||||
name = "Teshari Spike"
|
||||
icon_state = "seromi_spike"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_long
|
||||
name = "Teshari Overgrown"
|
||||
icon_state = "seromi_long"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_burst
|
||||
name = "Teshari Starburst"
|
||||
icon_state = "seromi_burst"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_shortburst
|
||||
name = "Teshari Short Starburst"
|
||||
icon_state = "seromi_burst_short"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_mohawk
|
||||
name = "Teshari Mohawk"
|
||||
icon_state = "seromi_mohawk"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
cut
|
||||
name = "Cut Hair"
|
||||
icon_state = "hair_c"
|
||||
@@ -328,6 +283,10 @@
|
||||
name = "Emo"
|
||||
icon_state = "hair_emo"
|
||||
|
||||
emo2
|
||||
name = "Emo Alt"
|
||||
icon_state = "hair_emo2"
|
||||
|
||||
longemo
|
||||
name = "Long Emo"
|
||||
icon_state = "hair_emolong"
|
||||
@@ -522,6 +481,60 @@
|
||||
name = "Oxton"
|
||||
icon_state = "hair_oxton"
|
||||
|
||||
lowfade
|
||||
name = "Low Fade"
|
||||
icon_state = "hair_lowfade"
|
||||
gender = MALE
|
||||
|
||||
medfade
|
||||
name = "Medium Fade"
|
||||
icon_state = "hair_medfade"
|
||||
|
||||
highfade
|
||||
name = "High Fade"
|
||||
icon_state = "hair_highfade"
|
||||
gender = MALE
|
||||
|
||||
baldfade
|
||||
name = "Balding Fade"
|
||||
icon_state = "hair_baldfade"
|
||||
gender = MALE
|
||||
|
||||
nofade
|
||||
name = "Regulation Cut"
|
||||
icon_state = "hair_nofade"
|
||||
gender = MALE
|
||||
|
||||
trimflat
|
||||
name = "Trimmed Flat Top"
|
||||
icon_state = "hair_trimflat"
|
||||
gender = MALE
|
||||
|
||||
trimmed
|
||||
name = "Trimmed"
|
||||
icon_state = "hair_trimmed"
|
||||
gender = MALE
|
||||
|
||||
tightbun
|
||||
name = "Tight Bun"
|
||||
icon_state = "hair_tightbun"
|
||||
gender = FEMALE
|
||||
|
||||
coffeehouse
|
||||
name = "Coffee House Cut"
|
||||
icon_state = "hair_coffeehouse"
|
||||
gender = MALE
|
||||
|
||||
undercut
|
||||
name = "Undercut"
|
||||
icon_state = "hair_undercut"
|
||||
gender = MALE
|
||||
|
||||
partfade
|
||||
name = "Parted Fade"
|
||||
icon_state = "hair_shavedpart"
|
||||
gender = MALE
|
||||
|
||||
|
||||
/*
|
||||
///////////////////////////////////
|
||||
@@ -542,24 +555,6 @@
|
||||
gender = NEUTER
|
||||
species_allowed = list("Human","Unathi","Tajara","Skrell", "Machine","Teshari")
|
||||
|
||||
teshari_beard
|
||||
name = "Teshari Beard"
|
||||
icon_state = "seromi_chin"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
teshari_scraggly
|
||||
name = "Teshari Scraggly"
|
||||
icon_state = "seromi_scraggly"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
teshari_chops
|
||||
name = "Teshari Chops"
|
||||
icon_state = "seromi_gap"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
watson
|
||||
name = "Watson Mustache"
|
||||
icon_state = "facial_watson"
|
||||
@@ -629,31 +624,41 @@
|
||||
name = "Dwarf Beard"
|
||||
icon_state = "facial_dwarf"
|
||||
|
||||
shadow
|
||||
name = "Five O'Clock Shadow"
|
||||
icon_state = "facial_shadow"
|
||||
threeOclock
|
||||
name = "3 O'clock Shadow"
|
||||
icon_state = "facial_3oclock"
|
||||
|
||||
//unathi horn beards and the like
|
||||
threeOclockstache
|
||||
name = "3 O'clock Shadow and Moustache"
|
||||
icon_state = "facial_3oclockmoustache"
|
||||
|
||||
una_chinhorn
|
||||
name = "Unathi Chin Horn"
|
||||
icon_state = "facial_chinhorns"
|
||||
species_allowed = list("Unathi")
|
||||
fiveOclock
|
||||
name = "5 O'clock Shadow"
|
||||
icon_state = "facial_5oclock"
|
||||
|
||||
una_hornadorns
|
||||
name = "Unathi Horn Adorns"
|
||||
icon_state = "facial_hornadorns"
|
||||
species_allowed = list("Unathi")
|
||||
fiveOclockstache
|
||||
name = "5 O'clock Shadow and Moustache"
|
||||
icon_state = "facial_5oclockmoustache"
|
||||
|
||||
una_spinespikes
|
||||
name = "Unathi Spine Spikes"
|
||||
icon_state = "facial_spikes"
|
||||
species_allowed = list("Unathi")
|
||||
sevenOclock
|
||||
name = "7 O'clock Shadow"
|
||||
icon_state = "facial_7oclock"
|
||||
|
||||
una_dorsalfrill
|
||||
name = "Unathi Dorsal Frill"
|
||||
icon_state = "facial_dorsalfrill"
|
||||
species_allowed = list("Unathi")
|
||||
sevenOclockstache
|
||||
name = "7 O'clock Shadow and Moustache"
|
||||
icon_state = "facial_7oclockmoustache"
|
||||
|
||||
mutton
|
||||
name = "Mutton Chops"
|
||||
icon_state = "facial_mutton"
|
||||
|
||||
muttonstache
|
||||
name = "Mutton Chops and Moustache"
|
||||
icon_state = "facial_muttonmus"
|
||||
|
||||
walrus
|
||||
name = "Walrus Moustache"
|
||||
icon_state = "facial_walrus"
|
||||
|
||||
/*
|
||||
///////////////////////////////////
|
||||
@@ -709,6 +714,7 @@
|
||||
icon_state = "unathi_sidefrills"
|
||||
species_allowed = list("Unathi")
|
||||
|
||||
//Skrell 'hairstyles'
|
||||
skr_tentacle_m
|
||||
name = "Skrell Male Tentacles"
|
||||
icon_state = "skrell_hair_m"
|
||||
@@ -721,6 +727,7 @@
|
||||
species_allowed = list("Skrell")
|
||||
gender = FEMALE
|
||||
|
||||
//Tajaran hairstyles
|
||||
taj_ears
|
||||
name = "Tajaran Ears"
|
||||
icon_state = "ears_plain"
|
||||
@@ -806,6 +813,77 @@
|
||||
icon_state = "hair_fingerwave"
|
||||
species_allowed = list("Tajara")
|
||||
|
||||
//Teshari things
|
||||
teshari
|
||||
name = "Teshari Default"
|
||||
icon_state = "teshari_default"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_altdefault
|
||||
name = "Teshari Alt. Default"
|
||||
icon_state = "teshari_ears"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_tight
|
||||
name = "Teshari Tight"
|
||||
icon_state = "teshari_tight"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_excited
|
||||
name = "Teshari Spiky"
|
||||
icon_state = "teshari_spiky"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_spike
|
||||
name = "Teshari Spike"
|
||||
icon_state = "teshari_spike"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_long
|
||||
name = "Teshari Overgrown"
|
||||
icon_state = "teshari_long"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_burst
|
||||
name = "Teshari Starburst"
|
||||
icon_state = "teshari_burst"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_shortburst
|
||||
name = "Teshari Short Starburst"
|
||||
icon_state = "teshari_burst_short"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_mohawk
|
||||
name = "Teshari Mohawk"
|
||||
icon_state = "teshari_mohawk"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_pointy
|
||||
name = "Teshari Pointy"
|
||||
icon_state = "teshari_pointy"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_upright
|
||||
name = "Teshari Upright"
|
||||
icon_state = "teshari_upright"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_mane
|
||||
name = "Teshari Mane"
|
||||
icon_state = "teshari_mane"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_droopy
|
||||
name = "Teshari Droopy"
|
||||
icon_state = "teshari_droopy"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
teshari_mushroom
|
||||
name = "Teshari Mushroom"
|
||||
icon_state = "teshari_mushroom"
|
||||
species_allowed = list("Teshari")
|
||||
|
||||
/datum/sprite_accessory/facial_hair
|
||||
|
||||
taj_sideburns
|
||||
@@ -838,6 +916,48 @@
|
||||
icon_state = "facial_smallstache"
|
||||
species_allowed = list("Tajara")
|
||||
|
||||
//unathi horn beards and the like
|
||||
|
||||
una_chinhorn
|
||||
name = "Unathi Chin Horn"
|
||||
icon_state = "facial_chinhorns"
|
||||
species_allowed = list("Unathi")
|
||||
|
||||
una_hornadorns
|
||||
name = "Unathi Horn Adorns"
|
||||
icon_state = "facial_hornadorns"
|
||||
species_allowed = list("Unathi")
|
||||
|
||||
una_spinespikes
|
||||
name = "Unathi Spine Spikes"
|
||||
icon_state = "facial_spikes"
|
||||
species_allowed = list("Unathi")
|
||||
|
||||
una_dorsalfrill
|
||||
name = "Unathi Dorsal Frill"
|
||||
icon_state = "facial_dorsalfrill"
|
||||
species_allowed = list("Unathi")
|
||||
|
||||
|
||||
//Teshari things
|
||||
teshari_beard
|
||||
name = "Teshari Beard"
|
||||
icon_state = "teshari_chin"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
teshari_scraggly
|
||||
name = "Teshari Scraggly"
|
||||
icon_state = "teshari_scraggly"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
teshari_chops
|
||||
name = "Teshari Chops"
|
||||
icon_state = "teshari_gap"
|
||||
species_allowed = list("Teshari")
|
||||
gender = NEUTER
|
||||
|
||||
//skin styles - WIP
|
||||
//going to have to re-integrate this with surgery
|
||||
//let the icon_state hold an icon preview for now
|
||||
|
||||
36
html/changelogs/Anewbe - CharacterSetupThings.yml
Normal file
36
html/changelogs/Anewbe - CharacterSetupThings.yml
Normal file
@@ -0,0 +1,36 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Anewbe
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Ported over a bunch of hairstyles and underclothes from Baystation."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 69 KiB |
Reference in New Issue
Block a user