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

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

Browse Source
This commit is contained in:
izac112
2024-12-11 20:18:19 +01:00
parent 00831a19a1 cae55a0a73
commit f3e3905b41
271 changed files with 9068 additions and 6597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/antagonism/02_candidacy.dm
+5 -4
View File
@@ -20,10 +20,11 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
//VOREStation Add
"lost drone" = 1, // 16
"maint pred" = 1, // 17
"morph" = 1, // 18
"corgi" = 1, // 19
"cursed sword" = 1, // 20
"Ship Survivor" = 1, // 21
"maint lurker" = 1, // 18
"morph" = 1, // 19
"corgi" = 1, // 20
"cursed sword" = 1, // 21
"Ship Survivor" = 1, // 22
//VOREStation Add End
)
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+13 -13
View File
@@ -33,7 +33,7 @@
..()
var/list/selector_uniforms = list(
"uniform w/ dress"=/obj/item/clothing/under/dress/dress_cap,
"KHI uniform"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -64,7 +64,7 @@
var/list/selector_uniforms = list(
"uniform w/ dress"=/obj/item/clothing/under/dress/dress_hop,
"HR director"=/obj/item/clothing/under/dress/dress_hr,
"KHI uniform"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -130,7 +130,7 @@
/datum/gear/uniform/civvie_uniform_selector/New()
..()
var/list/selector_uniforms = list(
"KHI uniform"=/obj/item/clothing/under/rank/khi/civ,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/civ,
"TG&C plain turtleneck"=/obj/item/clothing/under/rank/neo_suspect_turtleneck,
"TG&C plain turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_suspect_turtleskirt,
"TG&C blue turtleneck"=/obj/item/clothing/under/rank/neo_suspect_turtleneck_blue,
@@ -200,7 +200,7 @@
..()
var/list/selector_uniforms = list(
"undersuit, modernized"=/obj/item/clothing/under/rank/security/modern,
"KHI uniform"=/obj/item/clothing/under/rank/khi/sec,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/sec,
"voidsuit underlayer"=/obj/item/clothing/under/undersuit/sec,
"skirt"=/obj/item/clothing/under/rank/security/skirt,
"turtleneck"=/obj/item/clothing/under/rank/security/turtleneck,
@@ -300,7 +300,7 @@
"TG&C blue turtleneck & skirt"=/obj/item/clothing/under/rank/neo_hos_blackblue_skirt,
"TG&C blue parade uniform"=/obj/item/clothing/under/rank/neo_hos_parade_blue,
"TG&C blue parade uniform, feminine"=/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -327,7 +327,7 @@
"skirt"=/obj/item/clothing/under/rank/cargo/skirt,
"jeans"=/obj/item/clothing/under/rank/cargo/jeans,
"jeans, feminine cut"=/obj/item/clothing/under/rank/cargo/jeans/female,
"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_qm,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_qm_skirt,
"TG&C casualwear"=/obj/item/clothing/under/rank/neo_qm_jacket,
@@ -359,7 +359,7 @@
"skirt"=/obj/item/clothing/under/rank/cargotech/skirt,
"jeans"=/obj/item/clothing/under/rank/cargotech/jeans,
"jeans, feminine cut"=/obj/item/clothing/under/rank/cargotech/jeans/female,
"KHI uniform"=/obj/item/clothing/under/rank/khi/crg,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/crg,
"TG&C shorts"=/obj/item/clothing/under/rank/neo_cargo_shorts,
"TG&C skirt"=/obj/item/clothing/under/rank/neo_cargo_skirt,
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_cargo,
@@ -405,7 +405,7 @@
..()
var/list/selector_uniforms = list(
"skirt"=/obj/item/clothing/under/rank/chief_engineer/skirt,
"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -431,7 +431,7 @@
var/list/selector_uniforms = list(
"skirt"=/obj/item/clothing/under/rank/engineer/skirt,
"turtleneck"=/obj/item/clothing/under/rank/engineer/turtleneck,
"KHI uniform"=/obj/item/clothing/under/rank/khi/eng,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/eng,
"ST: Original Series Ops"=/obj/item/clothing/under/rank/trek/engsec,
"ST: Next Generation Ops"=/obj/item/clothing/under/rank/trek/engsec/next,
"ST: Voyager Ops"=/obj/item/clothing/under/rank/trek/engsec/voy,
@@ -481,7 +481,7 @@
"virologist skirt"=/obj/item/clothing/under/rank/virologist/skirt,
"turtleneck"=/obj/item/clothing/under/rank/medical/turtleneck,
"vey-medical jumpsuit"=/obj/item/clothing/under/corp/veymed,
"KHI uniform"=/obj/item/clothing/under/rank/khi/med,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/med,
"ST: Original Series Med-Sci"=/obj/item/clothing/under/rank/trek/medsci,
"ST: Next Generation Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/next,
"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,
@@ -554,7 +554,7 @@
..()
var/list/selector_uniforms = list(
"skirt"=/obj/item/clothing/under/rank/chief_medical_officer/skirt,
"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -582,7 +582,7 @@
/datum/gear/uniform/research_director_selector/New()
..()
var/list/selector_uniforms = list(
"KHI uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"neocorporate uniform, command"=/obj/item/clothing/under/rank/khi/cmd,
"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -611,7 +611,7 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_science,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_science_skirt,
"TG&C utility"=/obj/item/clothing/under/rank/neo_util_sci,
"KHI uniform"=/obj/item/clothing/under/rank/khi/sci,
"neocorporate uniform"=/obj/item/clothing/under/rank/khi/sci,
"ST: Original Series Med-Sci"=/obj/item/clothing/under/rank/trek/medsci,
"ST: Next Generation Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/next,
"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,
code/modules/client/preference_setup/vore/02_size.dm
+1 -29
View File
@@ -68,35 +68,7 @@
if(!pref.voice_sound)
character.voice_sounds_list = talk_sound
else
switch(pref.voice_sound)
if("beep-boop")
character.voice_sounds_list = talk_sound
if("goon speak 1")
character.voice_sounds_list = goon_speak_one_sound
if("goon speak 2")
character.voice_sounds_list = goon_speak_two_sound
if("goon speak 3")
character.voice_sounds_list = goon_speak_three_sound
if("goon speak 4")
character.voice_sounds_list = goon_speak_four_sound
if("goon speak blub")
character.voice_sounds_list = goon_speak_blub_sound
if("goon speak bottalk")
character.voice_sounds_list = goon_speak_bottalk_sound
if("goon speak buwoo")
character.voice_sounds_list = goon_speak_buwoo_sound
if("goon speak cow")
character.voice_sounds_list = goon_speak_cow_sound
if("goon speak lizard")
character.voice_sounds_list = goon_speak_lizard_sound
if("goon speak pug")
character.voice_sounds_list = goon_speak_pug_sound
if("goon speak pugg")
character.voice_sounds_list = goon_speak_pugg_sound
if("goon speak roach")
character.voice_sounds_list = goon_speak_roach_sound
if("goon speak skelly")
character.voice_sounds_list = goon_speak_skelly_sound
character.voice_sounds_list = get_talk_sound(pref.voice_sound)
character.custom_speech_bubble = pref.custom_speech_bubble
/datum/category_item/player_setup_item/vore/size/content(var/mob/user)