cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-5838

Browse Source
This commit is contained in:
Novacat
2019-03-27 14:26:19 -04:00
committed by GitHub
parent b3ee0e766f 5806e2d712
commit f4aad05ea1
1267 changed files with 38930 additions and 39915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/setting_datums.dm
+15 -2
View File
@@ -76,7 +76,7 @@ var/list/_client_preferences_by_type
if(!enabled)
preference_mob << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
preference_mob << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
//VOREStation Add - Need to put it here because it should be ordered riiiight here.
/datum/client_preference/play_jukebox
description ="Play jukebox music"
key = "SOUND_JUKEBOX"
@@ -86,18 +86,31 @@ var/list/_client_preferences_by_type
preference_mob.stop_all_music()
else
preference_mob.update_music()
//VOREStation Add - Need to put it here because it should be ordered riiiight here.
/datum/client_preference/eating_noises
description = "Eating Noises"
key = "EATING_NOISES"
enabled_description = "Noisy"
disabled_description = "Silent"
/datum/client_preference/digestion_noises
description = "Digestion Noises"
key = "DIGEST_NOISES"
enabled_description = "Noisy"
disabled_description = "Silent"
//VOREStation Add End
/datum/client_preference/weather_sounds
description ="Weather sounds"
key = "SOUND_WEATHER"
enabled_description = "Audible"
disabled_description = "Silent"
/datum/client_preference/supermatter_hum
description ="Supermatter hum"
key = "SOUND_SUPERMATTER"
enabled_description = "Audible"
disabled_description = "Silent"
/datum/client_preference/ghost_ears
description ="Ghost ears"
key = "CHAT_GHOSTEARS"
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+18 -1
View File
@@ -243,4 +243,21 @@
/datum/gear/accessory/locket
display_name = "locket"
path = /obj/item/clothing/accessory/locket
path = /obj/item/clothing/accessory/locket
/datum/gear/accessory/asym
display_name = "asymmetric jacket selection"
path = /obj/item/clothing/accessory/asymmetric
cost = 1
/datum/gear/accessory/asym/New()
..()
var/list/asyms = list()
for(var/asym in typesof(/obj/item/clothing/accessory/asymmetric))
var/obj/item/clothing/accessory/asymmetric_type = asym
asyms[initial(asymmetric_type.name)] = asymmetric_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(asyms))
/datum/gear/accessory/cowledvest
display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest
code/modules/client/preference_setup/loadout/loadout_head.dm
+9 -1
View File
@@ -370,4 +370,12 @@
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
path = /obj/item/clothing/head/circuitry
path = /obj/item/clothing/head/circuitry
/datum/gear/head/maangtikka
display_name = "maang tikka"
path = /obj/item/clothing/head/maangtikka
/datum/gear/head/jingasa
display_name = "jingasa"
path = /obj/item/clothing/head/jingasa
code/modules/client/preference_setup/loadout/loadout_suit.dm
+5 -9
View File
@@ -244,42 +244,34 @@ datum/gear/suit/duster
/datum/gear/suit/roles/poncho/cloak/cargo
display_name = "cloak, cargo"
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
allowed_roles = list("Cargo Technician","Quartermaster")
/datum/gear/suit/roles/poncho/cloak/mining
display_name = "cloak, mining"
path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
allowed_roles = list("Quartermaster","Shaft Miner")
/datum/gear/suit/roles/poncho/cloak/security
display_name = "cloak, security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/security
allowed_roles = list("Head of Security","Detective","Warden","Security Officer")
/datum/gear/suit/roles/poncho/cloak/service
display_name = "cloak, service"
path = /obj/item/clothing/accessory/poncho/roles/cloak/service
allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian")
/datum/gear/suit/roles/poncho/cloak/engineer
display_name = "cloak, engineer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/engineer
allowed_roles = list("Chief Engineer","Station Engineer")
/datum/gear/suit/roles/poncho/cloak/atmos
display_name = "cloak, atmos"
path = /obj/item/clothing/accessory/poncho/roles/cloak/atmos
allowed_roles = list("Chief Engineer","Atmospheric Technician")
/datum/gear/suit/roles/poncho/cloak/research
display_name = "cloak, science"
path = /obj/item/clothing/accessory/poncho/roles/cloak/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
/datum/gear/suit/roles/poncho/cloak/medical
display_name = "cloak, medical"
path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
@@ -463,6 +455,10 @@ datum/gear/suit/duster
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/miscellaneous/kamishimo
display_name = "kamishimo"
path = /obj/item/clothing/suit/kamishimo
/datum/gear/suit/snowsuit
display_name = "snowsuit"
path = /obj/item/clothing/suit/storage/snowsuit
@@ -495,4 +491,4 @@ datum/gear/suit/duster
/datum/gear/suit/snowsuit/cargo
display_name = "snowsuit, supply"
path = /obj/item/clothing/suit/storage/snowsuit/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+22 -1
View File
@@ -462,4 +462,25 @@
/datum/gear/uniform/circuitry
display_name = "jumpsuit, circuitry (empty)"
path = /obj/item/clothing/under/circuitry
path = /obj/item/clothing/under/circuitry
/datum/gear/uniform/sleekoverall
display_name = "sleek overalls"
path = /obj/item/clothing/under/overalls/sleek
/datum/gear/uniform/sarired
display_name = "sari, red"
path = /obj/item/clothing/under/dress/sari
/datum/gear/uniform/sarigreen
display_name = "sari, green"
path = /obj/item/clothing/under/dress/sari/green
/datum/gear/uniform/wrappedcoat
display_name = "modern wrapped coat"
path = /obj/item/clothing/under/moderncoat
/datum/gear/uniform/ascetic
display_name = "plain ascetic garb"
path = /obj/item/clothing/under/ascetic
code/modules/client/preference_setup/vore/02_size.dm
+1 -1
View File
@@ -60,7 +60,7 @@
/datum/category_item/player_setup_item/vore/size/OnTopic(var/href, var/list/href_list, var/mob/user)
if(href_list["size_multiplier"])
var/new_size = input(user, "Choose your character's size, ranging from 25% to 200%", "Set Size") as num|null
if (!IsInRange(new_size,25,200))
if (!ISINRANGE(new_size,25,200))
pref.size_multiplier = 1
user << "<span class='notice'>Invalid size.</span>"
return TOPIC_REFRESH_UPDATE_PREVIEW
code/modules/client/preference_setup/vore/03_egg.dm
+12 -12
View File
@@ -12,7 +12,7 @@ var/XENOMORPH_EGG = "Xenomorph"
// Define a place to save appearance in character setup
/datum/preferences
var/egg_type = "Egg" //The egg type they have.
var/vore_egg_type = "Egg" //The egg type they have.
// Definition of the stuff for the egg type.
/datum/category_item/player_setup_item/vore/egg
@@ -20,31 +20,31 @@ var/XENOMORPH_EGG = "Xenomorph"
sort_order = 3
/datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S)
S["egg_type"] >> pref.egg_type
S["vore_egg_type"] >> pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S)
S["egg_type"] << pref.egg_type
S["vore_egg_type"] << pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/sanitize_character()
var/valid_egg_types = global_egg_types
pref.egg_type = sanitize_inlist(pref.egg_type, valid_egg_types, initial(pref.egg_type))
var/valid_vore_egg_types = global_vore_egg_types
pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, valid_vore_egg_types, initial(pref.vore_egg_type))
/datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character)
character.egg_type = pref.egg_type
character.vore_egg_type = pref.vore_egg_type
/datum/category_item/player_setup_item/vore/egg/content(var/mob/user)
. += "<br>"
. += " Egg Type: <a href='?src=\ref[src];egg_type=1'>[pref.egg_type]</a><br>"
. += " Egg Type: <a href='?src=\ref[src];vore_egg_type=1'>[pref.vore_egg_type]</a><br>"
/datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user)
if(!CanUseTopic(user))
return TOPIC_NOACTION
else if(href_list["egg_type"])
var/list/egg_types = global_egg_types
var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.egg_type) as null|anything in egg_types
else if(href_list["vore_egg_type"])
var/list/vore_egg_types = global_vore_egg_types
var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.vore_egg_type) as null|anything in vore_egg_types
if(selection)
pref.egg_type = egg_types[selection]
pref.vore_egg_type = vore_egg_types[selection]
return TOPIC_REFRESH
else
return
return