cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/new_player/new_player.dm
View File

@@ -185,12 +185,13 @@
else if(ticker && ticker.mode && ticker.mode.explosion_in_progress)
usr << "<span class='danger'>The station is currently exploding. Joining would go poorly.</span>"
return
/*
if(!is_alien_whitelisted(src, all_species[client.prefs.species]))
if(!is_alien_whitelisted(src, GLOB.all_species[client.prefs.species]))
src << alert("You are currently not whitelisted to play [client.prefs.species].")
return 0
*/
var/datum/species/S = all_species[client.prefs.species]
var/datum/species/S = GLOB.all_species[client.prefs.species]
if(!(S.spawn_flags & SPECIES_CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0
@@ -466,7 +467,7 @@
var/use_species_name
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
chosen_species = GLOB.all_species[client.prefs.species]
use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm.
if(chosen_species && use_species_name)
@@ -513,7 +514,7 @@
new_character.disabilities |= NEARSIGHTED
for(var/lang in client.prefs.alternate_languages)
var/datum/language/chosen_language = all_languages[lang]
var/datum/language/chosen_language = GLOB.all_languages[lang]
if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
@@ -553,7 +554,7 @@
/mob/new_player/get_species()
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
chosen_species = GLOB.all_species[client.prefs.species]
if(!chosen_species)
return SPECIES_HUMAN

2
code/modules/mob/new_player/new_player_vr.dm
View File

@@ -22,7 +22,7 @@
to_chat(src,"<span class='warning'>You have not set your scale yet. Do this on the VORE tab in character setup.</span>")
//Can they play?
if(!is_alien_whitelisted(src,all_species[client.prefs.species]) && !check_rights(R_ADMIN, 0))
if(!is_alien_whitelisted(src,GLOB.all_species[client.prefs.species]) && !check_rights(R_ADMIN, 0))
pass = FALSE
to_chat(src,"<span class='warning'>You are not allowed to spawn in as this species.</span>")

2
code/modules/mob/new_player/preferences_setup.dm
View File

@@ -1,7 +1,7 @@
/datum/preferences
//The mob should have a gender you want before running this proc. Will run fine without H
/datum/preferences/proc/randomize_appearance_and_body_for(var/mob/living/carbon/human/H)
var/datum/species/current_species = all_species[species ? species : "Human"]
var/datum/species/current_species = GLOB.all_species[species ? species : "Human"]
set_biological_gender(pick(current_species.genders))
h_style = random_hair_style(biological_gender, species)

176
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -52,45 +52,62 @@
eighties
name = "80's"
icon_state = "hair_80s"
flags = HAIR_TIEABLE
afro
name = "Afro"
icon_state = "hair_afro"
flags = HAIR_TIEABLE
afro2
name = "Afro 2"
icon_state = "hair_afro2"
flags = HAIR_TIEABLE
afro_large
name = "Big Afro"
icon_state = "hair_bigafro"
flags = HAIR_TIEABLE
amazon
name = "Amazon"
icon_state = "hair_amazon"
flags = HAIR_TIEABLE
antenna
name = "Antenna"
icon_state = "hair_antenna"
bald
name = "Bald"
icon_state = "bald"
gender = MALE
flags = HAIR_VERY_SHORT
species_allowed = list(SPECIES_HUMAN,SPECIES_UNATHI,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_VOX)
baldfade
name = "Balding Fade"
icon_state = "hair_baldfade"
gender = MALE
flags = HAIR_VERY_SHORT
balding
name = "Balding Hair"
icon_state = "hair_e"
gender = MALE
flags = HAIR_VERY_SHORT
beachwave
name = "Beach Waves"
icon_state = "hair_beachwave"
flags = HAIR_TIEABLE
bedhead
name = "Bedhead"
icon_state = "hair_bedhead"
flags = HAIR_TIEABLE
bedhead2
name = "Bedhead 2"
icon_state = "hair_bedheadv2"
flags = HAIR_TIEABLE
bedhead3
name = "Bedhead 3"
@@ -147,6 +164,10 @@
name = "Bowl 2"
icon_state = "hair_bowlcut2"
bowlcut2
name = "Bowl, Overeye"
icon_state = "hair_overeyebowl"
grandebraid
name = "Braid Grande"
icon_state = "hair_grande"
@@ -167,21 +188,34 @@
icon_state = "hair_braid"
flags = HAIR_TIEABLE
front_braid
name = "Braided front"
icon_state = "hair_braidfront"
flags = HAIR_TIEABLE
braidtail
name = "Braided Tail"
icon_state = "hair_braidtail"
flags = HAIR_TIEABLE
bun
name = "Bun"
icon_state = "hair_bun"
flags = HAIR_TIEABLE
bun2
name = "Bun 2"
icon_state = "hair_bun2"
flags = HAIR_TIEABLE
bun3
name = "Bun 3"
icon_state = "hair_bun3"
flags = HAIR_TIEABLE
bun
name = "Bun Casual"
icon_state = "hair_bun"
bunhead
name = "Bun Head "
icon_state = "hair_bunhead"
flags = HAIR_TIEABLE
doublebun
@@ -192,18 +226,43 @@
tightbun
name = "Bun Tight"
icon_state = "hair_tightbun"
gender = FEMALE
flags = HAIR_VERY_SHORT | HAIR_TIEABLE
business
name = "Business Hair"
icon_state = "hair_business"
flags = HAIR_VERY_SHORT
business2
name = "Business Hair 2"
icon_state = "hair_business2"
flags = HAIR_VERY_SHORT
business3
name = "Business Hair 3"
icon_state = "hair_business3"
flags = HAIR_VERY_SHORT
business4
name = "Business Hair 4"
icon_state = "hair_business4"
flags = HAIR_VERY_SHORT
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
flags = HAIR_VERY_SHORT
species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)
celebcurls
name = "Celeb Curls"
icon_state = "hair_celebcurls"
flags = HAIR_TIEABLE
crono
name = "Chrono"
icon_state = "hair_toriyama"
flags = HAIR_TIEABLE
cia
name = "CIA"
@@ -222,6 +281,7 @@
country
name = "Country"
icon_state = "hair_country"
flags = HAIR_TIEABLE
crew
name = "Crewcut"
@@ -246,21 +306,29 @@
name = "Devil Lock"
icon_state = "hair_devilock"
donutbun
name = "Donut Bun"
icon_state = "hair_donutbun"
dreadlocks
name = "Dreadlocks"
icon_state = "hair_dreads"
flags = HAIR_TIEABLE
mahdrills
name = "Drillruru"
icon_state = "hair_drillruru"
flags = HAIR_TIEABLE
emo
name = "Emo"
icon_state = "hair_emo"
flags = HAIR_TIEABLE
emo2
name = "Emo Alt"
icon_state = "hair_emo2"
flags = HAIR_TIEABLE
fringeemo
name = "Emo Fringe"
@@ -270,6 +338,7 @@
halfshaved
name = "Emo Half-Shaved"
icon_state = "hair_halfshaved"
flags = HAIR_TIEABLE
longemo
name = "Emo Long"
@@ -344,12 +413,18 @@
gelled
name = "Gelled Back"
icon_state = "hair_gelled"
flags = HAIR_TIEABLE
gentle
name = "Gentle"
icon_state = "hair_gentle"
flags = HAIR_TIEABLE
gentle
name = "Gentle 2, Long"
icon_state = "hair_gentle2long"
flags = HAIR_TIEABLE
glossy
name = "Glossy"
icon_state = "hair_glossy"
@@ -373,6 +448,11 @@
icon_state = "hair_himecut"
flags = HAIR_TIEABLE
himeup
name = "Hime Updo"
icon_state = "hair_himeup"
flags = HAIR_TIEABLE
shorthime
name = "Hime Cut Short"
icon_state = "hair_shorthime"
@@ -385,11 +465,18 @@
jade
name = "Jade"
icon_state = "hair_jade"
flags = HAIR_TIEABLE
jensen
name = "Jensen"
icon_state = "hair_jensen"
jessica
name = "Jessica"
icon_state = "hair_jessica"
flags = HAIR_TIEABLE
joestar
name = "Joestar"
icon_state = "hair_joestar"
@@ -399,6 +486,10 @@
icon_state = "hair_kagami"
flags = HAIR_TIEABLE
keanu
name = "Keanu Hair"
icon_state = "hair_keanu"
kusangi
name = "Kusanagi Hair"
icon_state = "hair_kusanagi"
@@ -423,19 +514,38 @@
icon_state = "hair_longeralt2"
flags = HAIR_TIEABLE
sidepartlongalt
name = "Long Side Part"
icon_state = "hair_longsidepart"
flags = HAIR_TIEABLE
longest
name = "Very Long Hair"
icon_state = "hair_longest"
flags = HAIR_TIEABLE
lowbraid
name = "Low Braid"
icon_state = "hair_hbraid"
flags = HAIR_TIEABLE
manbun
name = "Manbun"
icon_state = "hair_manbun"
flags = HAIR_TIEABLE
marysue
name = "Mary Sue"
icon_state = "hair_marysue"
miles
name = "Miles Hair"
icon_state = "hair_miles"
modern
name = "Modern"
icon_state = "hair_modern"
flags = HAIR_TIEABLE
mohawk
name = "Mohawk"
@@ -467,6 +577,7 @@
nia
name = "Nia"
icon_state = "hair_nia"
flags = HAIR_TIEABLE
nitori
name = "Nitori"
@@ -495,6 +606,7 @@
shortovereye
name = "Overeye Short"
icon_state = "hair_shortovereye"
flags = HAIR_TIEABLE
veryshortovereyealternate
name = "Overeye Very Short, Alternate"
@@ -512,13 +624,20 @@
name = "Parted Alt"
icon_state = "hair_partedalt"
pixie
name = "Pixie Cut"
icon_state = "hair_pixie"
pompadour
name = "Pompadour"
icon_state = "hair_pompadour"
flags = HAIR_TIEABLE
dandypomp
name = "Pompadour Dandy"
icon_state = "hair_dandypompadour"
flags = HAIR_TIEABLE
ponytail1
name = "Ponytail 1"
@@ -570,6 +689,10 @@
icon_state = "hair_poofy2"
flags = HAIR_TIEABLE
proper
name = "Proper"
icon_state = "hair_proper"
quiff
name = "Quiff"
icon_state = "hair_quiff"
@@ -580,6 +703,11 @@
gender = MALE
flags = HAIR_VERY_SHORT
newyou
name = "New You"
icon_state = "hair_newyou"
flags = HAIR_TIEABLE
ronin
name = "Ronin"
icon_state = "hair_ronin"
@@ -588,6 +716,7 @@
rosa
name = "Rosa"
icon_state = "hair_rosa"
flags = HAIR_TIEABLE
rows
name = "Rows"
@@ -645,6 +774,7 @@
shy
name = "Shy"
icon_state = "hair_shy"
flags = HAIR_TIEABLE
sideponytail
name = "Side Ponytail"
@@ -666,6 +796,11 @@
icon_state = "hair_tressshoulder"
flags = HAIR_TIEABLE
sideundercut
name = "Side Undercut"
icon_state = "hair_sideundercut"
flags = HAIR_VERY_SHORT
skinhead
name = "Skinhead"
icon_state = "hair_skinhead"
@@ -676,11 +811,25 @@
icon_state = "hair_sleeze"
flags = HAIR_VERY_SHORT
protagonist
name = "Slightly Long"
icon_state = "hair_protagonist"
flags = HAIR_TIEABLE
spiky
name = "Spiky"
icon_state = "hair_spikey"
species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)
straightlong
name = "Straight Long"
icon_state = "hair_straightlong"
flags = HAIR_TIEABLE
sweepshave
name = "Sweep Shave"
icon_state = "hair_sweepshave"
thinning
name = "Thinning"
icon_state = "hair_thinning"
@@ -739,6 +888,7 @@
unkept
name = "Unkept"
icon_state = "hair_unkept"
flags = HAIR_TIEABLE
updo
name = "Updo"
@@ -749,6 +899,10 @@
name = "Vegeta"
icon_state = "hair_toriyama2"
vivi
name = "Vivi"
icon_state = "hair_vivi"
volaju
name = "Volaju"
icon_state = "hair_volaju"
@@ -1465,6 +1619,14 @@
body_parts = list(BP_TORSO)
species_allowed = list(SPECIES_UNATHI)
//Tesh stuff.
teshi_fluff
name = "Underfluff (Teshari)"
icon_state = "teshi_fluff"
body_parts = list(BP_HEAD, BP_TORSO, BP_GROIN, BP_R_LEG, BP_L_LEG)
species_allowed = list(SPECIES_TESHARI)
//skin styles - WIP
//going to have to re-integrate this with surgery
//let the icon_state hold an icon preview for now

8
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -378,7 +378,7 @@
gender = NEUTER
vulp_hair_bun
name = "Bun"
name = "Vulp Bun"
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "bun"
@@ -1027,12 +1027,6 @@
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG)
teshi_fluff
name = "Teshari underfluff"
icon_state = "teshi_fluff"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_GROIN,BP_TORSO,BP_HEAD)
teshi_small_feathers
name = "Teshari small wingfeathers"
icon_state = "teshi_sf"