cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-30 08:32:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2021-10-28 21:04:37 +02:00
parent 8f080a04f7 096334e0d8
commit a274077bfa
281 changed files with 4928 additions and 2566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/02_language.dm
+1 -1
View File
@@ -30,7 +30,7 @@
// Sanitize illegal languages
for(var/language in pref.alternate_languages)
var/datum/language/L = GLOB.all_languages[language]
if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && !is_lang_whitelisted(pref.client, L)))
if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L)))
testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks")
pref.alternate_languages -= language
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+8 -5
View File
@@ -92,14 +92,17 @@
ringtype["engagement ring"] = /obj/item/clothing/gloves/ring/engagement
ringtype["signet ring"] = /obj/item/clothing/gloves/ring/seal/signet
ringtype["masonic ring"] = /obj/item/clothing/gloves/ring/seal/mason
ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel
ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron
ringtype["ring, silver"] = /obj/item/clothing/gloves/ring/material/silver
ringtype["ring, gold"] = /obj/item/clothing/gloves/ring/material/gold
ringtype["ring, platinum"] = /obj/item/clothing/gloves/ring/material/platinum
ringtype["ring, glass"] = /obj/item/clothing/gloves/ring/material/glass
ringtype["ring, wood"] = /obj/item/clothing/gloves/ring/material/wood
ringtype["ring, plastic"] = /obj/item/clothing/gloves/ring/material/plastic
ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron
ringtype["ring, bronze"] = /obj/item/clothing/gloves/ring/material/bronze
ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel
ringtype["ring, copper"] = /obj/item/clothing/gloves/ring/material/copper
ringtype["ring, silver"] = /obj/item/clothing/gloves/ring/material/silver
ringtype["ring, gold"] = /obj/item/clothing/gloves/ring/material/gold
ringtype["ring, platinum"] = /obj/item/clothing/gloves/ring/material/platinum
gear_tweaks += new/datum/gear_tweak/path(ringtype)
/datum/gear/gloves/circuitry
code/modules/client/preference_setup/loadout/loadout_head.dm
+9 -1
View File
@@ -426,6 +426,14 @@
display_name = "black and gold headdress"
path = /obj/item/clothing/head/blackngoldheaddress
/datum/gear/head/plaguedoctor
display_name = "plague doctor's hat"
path = /obj/item/clothing/head/plaguedoctorhat
/datum/gear/head/plaguedoctor2
display_name = "golden plague doctor's hat"
path = /obj/item/clothing/head/plaguedoctorhat/gold
path = /obj/item/clothing/head/plaguedoctorhat/gold
/datum/gear/head/wheat
display_name = "straw hat"
path = /obj/item/clothing/head/wheat
code/modules/client/preference_setup/loadout/loadout_mask.dm
+30 -4
View File
@@ -22,11 +22,37 @@
path = /obj/item/clothing/mask/surgical
cost = 2
/datum/gear/mask/veil
display_name = "black veil"
path = /obj/item/clothing/mask/veil
/datum/gear/mask/plaguedoctor
display_name = "plague doctor's mask"
path = /obj/item/clothing/mask/gas/plaguedoctor
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/plaguedoctor2
display_name = "golden plague doctor's mask"
path = /obj/item/clothing/mask/gas/plaguedoctor/gold
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
/datum/gear/mask/mouthwheat
display_name = "mouth wheat"
path = /obj/item/clothing/mask/mouthwheat
/datum/gear/mask/papermask
display_name = "paper mask"
path = /obj/item/clothing/mask/paper
/datum/gear/mask/emotionalmask
display_name = "emotional mask"
path = /obj/item/clothing/mask/emotions
/datum/gear/mask/gaiter
display_name = "neck gaiter selection"
path = /obj/item/clothing/mask/gaiter
cost = 1
/datum/gear/mask/gaiter/New()
..()
var/list/gaiters = list()
for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
var/obj/item/clothing/mask/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
code/modules/client/preference_setup/loadout/loadout_utility.dm
+19 -19
View File
@@ -89,37 +89,37 @@
display_name = "flashlight"
path = /obj/item/device/flashlight
/datum/gear/utility/flashlight_blue
display_name = "flashlight, blue"
path = /obj/item/device/flashlight/color
/datum/gear/utility/flashlight_orange
display_name = "flashlight, orange"
path = /obj/item/device/flashlight/color/orange
/datum/gear/utility/flashlight_red
display_name = "flashlight, red"
path = /obj/item/device/flashlight/color/red
/datum/gear/utility/flashlight_yellow
display_name = "flashlight, yellow"
path = /obj/item/device/flashlight/color/yellow
/datum/gear/utility/maglight
display_name = "flashlight, maglight"
path = /obj/item/device/flashlight/maglight
cost = 2
/datum/gear/utility/flashlight/color
display_name = "flashlight, small (selection)"
path = /obj/item/device/flashlight/color
/datum/gear/utility/flashlight/color/New()
..()
var/list/flashlights = list(
"Blue Flashlight" = /obj/item/device/flashlight/color,
"Red Flashlight" = /obj/item/device/flashlight/color/red,
"Green Flashlight" = /obj/item/device/flashlight/color/green,
"Yellow Flashlight" = /obj/item/device/flashlight/color/yellow,
"Purple Flashlight" = /obj/item/device/flashlight/color/purple,
"Orange Flashlight" = /obj/item/device/flashlight/color/orange
)
gear_tweaks += new/datum/gear_tweak/path(flashlights)
/datum/gear/utility/battery
display_name = "cell, device"
path = /obj/item/weapon/cell/device
/datum/gear/utility/pen
display_name = "Fountain Pen"
display_name = "fountain pen"
path = /obj/item/weapon/pen/fountain
/datum/gear/utility/umbrella
display_name = "Umbrella"
display_name = "umbrella"
path = /obj/item/weapon/melee/umbrella
cost = 3
@@ -131,7 +131,7 @@
display_name = "wheelchair selection"
path = /obj/item/wheelchair
cost = 4
/datum/gear/utility/wheelchair/New()
..()
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/occupation/occupation.dm
+5 -2
View File
@@ -148,8 +148,11 @@
. += "<del>[rank]</del></td></a><td><b> \[WHITELIST ONLY]</b></td></tr>"
continue
//VOREStation Add End
if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
. += "<del>[rank]</del></td></a><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
if(job.is_species_banned(user.client.prefs.species, user.client.prefs.organ_data["brain"]) == TRUE)
. += "<del>[rank]</del></td></a><td> \[THIS RACE/BRAIN TYPE CANNOT TAKE THIS ROLE.\]</td></tr>"
continue
if((job.minimum_character_age || job.min_age_by_species) && user.client && (user.client.prefs.age < job.get_min_age(user.client.prefs.species, user.client.prefs.organ_data["brain"])))
. += "<del>[rank]</del></td></a><td> \[MINIMUM CHARACTER AGE FOR SELECTED RACE/BRAIN TYPE: [job.get_min_age(user.client.prefs.species, user.client.prefs.organ_data["brain"])]\]</td></tr>"
continue
if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
. += "<font color=grey>[rank]</font></a></td><td></td></tr>"
code/modules/client/preference_setup/vore/07_traits.dm
+9 -4
View File
@@ -112,12 +112,17 @@
else if(!pref.custom_base || !(pref.custom_base in GLOB.custom_species_bases))
pref.custom_base = SPECIES_HUMAN
pref.custom_say = lowertext(trim(pref.custom_say))
pref.custom_whisper = lowertext(trim(pref.custom_whisper))
pref.custom_ask = lowertext(trim(pref.custom_ask))
pref.custom_exclaim = lowertext(trim(pref.custom_exclaim))
/datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
character.custom_species = pref.custom_species
character.custom_say = pref.custom_say
character.custom_ask = pref.custom_ask
character.custom_whisper = pref.custom_whisper
character.custom_exclaim = pref.custom_exclaim
character.custom_say = lowertext(trim(pref.custom_say))
character.custom_ask = lowertext(trim(pref.custom_ask))
character.custom_whisper = lowertext(trim(pref.custom_whisper))
character.custom_exclaim = lowertext(trim(pref.custom_exclaim))
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1