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

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

Browse Source
This commit is contained in:
izac112
2024-05-10 21:16:15 +02:00
parent e0f1ef4740 737c2aba19
commit b100ef57d6
48 changed files with 3288 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+38
View File
@@ -180,3 +180,41 @@ Talon pin
"security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star
)
gear_tweaks += new/datum/gear_tweak/path(replika_vests)
/datum/gear/accessory/insignia
display_name = "Insignia Selection"
path = /obj/item/clothing/accessory/solgov/department
/datum/gear/accessory/insignia/New()
..()
var/insignia = list(
"Command - Crew" = /obj/item/clothing/accessory/solgov/department/command,
"Command - Crew Short" = /obj/item/clothing/accessory/solgov/department/command/service,
"Command - Bands" = /obj/item/clothing/accessory/solgov/department/command/fleet,
"Command - Echelons" = /obj/item/clothing/accessory/solgov/department/command/army,
"Security - Crew" = /obj/item/clothing/accessory/solgov/department/security,
"Security - Crew Short" = /obj/item/clothing/accessory/solgov/department/security/service,
"Security - Bands" = /obj/item/clothing/accessory/solgov/department/security/fleet,
"Security - Echelons" = /obj/item/clothing/accessory/solgov/department/security/army,
"Medical - Crew" = /obj/item/clothing/accessory/solgov/department/medical,
"Medical - Crew Short" = /obj/item/clothing/accessory/solgov/department/medical/service,
"Medical - Bands" = /obj/item/clothing/accessory/solgov/department/medical/fleet,
"Medical - Echelons" = /obj/item/clothing/accessory/solgov/department/medical/army,
"Science - Crew" = /obj/item/clothing/accessory/solgov/department/research,
"Science - Crew Short" = /obj/item/clothing/accessory/solgov/department/research/service,
"Science - Bands" = /obj/item/clothing/accessory/solgov/department/research/fleet,
"Science - Echelons" = /obj/item/clothing/accessory/solgov/department/research/army,
"Engineering - Crew" = /obj/item/clothing/accessory/solgov/department/engineering,
"Engineering - Crew Short" = /obj/item/clothing/accessory/solgov/department/engineering/service,
"Engineering - Bands" = /obj/item/clothing/accessory/solgov/department/engineering/fleet,
"Engineering - Echelons" = /obj/item/clothing/accessory/solgov/department/engineering/army,
"Supply - Crew" = /obj/item/clothing/accessory/solgov/department/supply,
"Supply - Crew Short" = /obj/item/clothing/accessory/solgov/department/supply/service,
"Supply - Bands" = /obj/item/clothing/accessory/solgov/department/supply/fleet,
"Supply - Echelons" = /obj/item/clothing/accessory/solgov/department/supply/army,
"Service - Crew" = /obj/item/clothing/accessory/solgov/department/service,
"Service - Crew Short" = /obj/item/clothing/accessory/solgov/department/service/service,
"Service - Bands" = /obj/item/clothing/accessory/solgov/department/service/fleet,
"Service - Echelons" = /obj/item/clothing/accessory/solgov/department/service/army
)
gear_tweaks += new/datum/gear_tweak/path(insignia)
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+21
View File
@@ -157,6 +157,27 @@
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/undersuit
display_name = "Civilian - Void Undersuits"
description = "Select from a range of void undersuits. Each is breathable, sleek, and has standard induction ports. Security, Engineering, and Command variants can be found under the standard uniform selectors for those departments."
path = /obj/item/clothing/under/undersuit/
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/undersuit/New()
..()
var/list/suits = list()
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec,
/obj/item/clothing/under/undersuit/sec/hos,
/obj/item/clothing/under/undersuit/hazard,
/obj/item/clothing/under/undersuit/command,
/obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit))
if(undersuit_type in blacklisted_types)
continue
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
//Security
/datum/gear/uniform/security_selector
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
-19
View File
@@ -122,25 +122,6 @@ Talon jumpsuit
)
gear_tweaks += new/datum/gear_tweak/path(dresses)
// undersuits
/datum/gear/uniform/undersuit
display_name = "undersuit selection"
path = /obj/item/clothing/under/undersuit/
/datum/gear/uniform/undersuit/New()
..()
var/list/suits = list()
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec,
/obj/item/clothing/under/undersuit/sec/hos,
/obj/item/clothing/under/undersuit/hazard,
/obj/item/clothing/under/undersuit/command,
/obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit))
if(undersuit_type in blacklisted_types)
continue
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
//Altevian Uniforms
/datum/gear/uniform/altevian
description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."
code/modules/client/preference_setup/vore/07_traits.dm
+2
View File
@@ -607,6 +607,8 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
break varconflict
for(var/V in instance.var_changes)
if(V == "flags")
continue
if(V in instance_test.var_changes)
conflict = instance_test.name
break varconflict