diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 855059c218..cf6837a57a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -54,7 +54,7 @@ var/datum/subsystem/ticker/ticker /datum/subsystem/ticker/New() NEW_SS_GLOBAL(ticker) - login_music = pickweight(list('sound/ambience/title2.ogg' = 31, 'sound/ambience/title1.ogg' = 31, 'sound/ambience/title3.ogg' =31, 'sound/ambience/clown.ogg' = 7)) // choose title music! + login_music = pickweight(list('sound/ambience/title1.ogg' = 31, 'sound/ambience/title2.ogg' = 31, 'sound/ambience/title3.ogg' = 31, 'sound/ambience/title4.ogg' = 31, 'sound/ambience/title5.ogg' = 31, 'sound/ambience/title6.ogg' = 31, 'sound/ambience/clown.ogg' = 7)) // choose title music! if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) login_music = 'sound/ambience/clown.ogg' diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cd5c8cf123..a3ead25b11 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -231,12 +231,17 @@ var/list/preferences_datums = list() else dat += "Species: Human
" + dat += "Underwear:
[underwear]
" + dat += "Undershirt:
[undershirt]
" + dat += "Socks:
[socks]
" + dat += "Backpack:
[backbag]
" + dat += "Size: [character_size]
" dat += "Vore Preferences: Open
" - dat += "

Wings

" + /*dat += "

Wings

" dat += "[mutant_wing]
" - dat += "    Change
" + dat += "    Change
"*/ dat += "Set Flavor Text
" if(lentext(flavor_text) <= 40) diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index f073ff5b33..8a69f4c2bc 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 275b721e94..078af3b172 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 2520e4ebae..f3ebc1ea70 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 35204a7ea8..10497b1c08 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index 8c508fc181..2ec0465112 100644 Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ diff --git a/icons/mob/legendary.dmi b/icons/mob/legendary.dmi new file mode 100644 index 0000000000..bcc6271b07 Binary files /dev/null and b/icons/mob/legendary.dmi differ diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi index 645ad969dc..f2fce9fe6f 100644 Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ diff --git a/icons/mob/pokemon.dmi b/icons/mob/pokemon.dmi new file mode 100644 index 0000000000..a2316fe640 Binary files /dev/null and b/icons/mob/pokemon.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 5fc5b96ca7..b3a7cb8ee3 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/screen_cyborg.dmi b/icons/mob/screen_cyborg.dmi index fc236ac7e2..0297685e4b 100644 Binary files a/icons/mob/screen_cyborg.dmi and b/icons/mob/screen_cyborg.dmi differ diff --git a/icons/mob/toriel.dmi b/icons/mob/toriel.dmi new file mode 100644 index 0000000000..077f1612bd Binary files /dev/null and b/icons/mob/toriel.dmi differ diff --git a/icons/mob/werenerd.dmi b/icons/mob/werenerd.dmi new file mode 100644 index 0000000000..706d4248f8 Binary files /dev/null and b/icons/mob/werenerd.dmi differ diff --git a/icons/mob/widerobot.dmi b/icons/mob/widerobot.dmi new file mode 100644 index 0000000000..5c4eeab5ed Binary files /dev/null and b/icons/mob/widerobot.dmi differ diff --git a/icons/obj/clothing/cloaks.dmi b/icons/obj/clothing/cloaks.dmi index 3677fa1525..bc80bc17f4 100644 Binary files a/icons/obj/clothing/cloaks.dmi and b/icons/obj/clothing/cloaks.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index bf8b68040a..60f1c76066 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index abf1e0ef5d..9fd11036bc 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 407e0d4054..9450f42528 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index a8fe8c5ec6..f0b5b250da 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 176ec25329..528df2cd9e 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index b3eb878c9a..59b81bb73f 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 8caf8e4227..a604b6e302 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 84fb138564..76cf880212 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/sound/ambience/title4.ogg b/sound/ambience/title4.ogg new file mode 100644 index 0000000000..738a60ebe2 Binary files /dev/null and b/sound/ambience/title4.ogg differ diff --git a/sound/ambience/title5.ogg b/sound/ambience/title5.ogg new file mode 100644 index 0000000000..d8111c52db Binary files /dev/null and b/sound/ambience/title5.ogg differ diff --git a/sound/ambience/title6.ogg b/sound/ambience/title6.ogg new file mode 100644 index 0000000000..64cf41500e Binary files /dev/null and b/sound/ambience/title6.ogg differ