cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 15:47:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PDAthing

Browse Source
This commit is contained in:
Runa Dacino
2024-02-08 16:14:43 +01:00
committed by GitHub
parent e3f3e416b8 93f076a120
commit 5780dc85f2
464 changed files with 8819 additions and 10923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+25 -1
View File
@@ -155,4 +155,28 @@ Talon pin
/datum/gear/accessory/antediluvian/loin
display_name = "antediluvian loincloth"
path = /obj/item/clothing/accessory/antediluvian/loincloth
path = /obj/item/clothing/accessory/antediluvian/loincloth
//Replikant accessories
/datum/gear/accessory/sleekpatch
display_name = "sleek uniform patch"
path = /obj/item/clothing/accessory/sleekpatch
/datum/gear/accessory/poncho/roles/cloak/custom/gestaltjacket
display_name = "sleek uniform jacket"
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom/gestaltjacket
/datum/gear/accessory/replika
display_name = "replikant vest selection"
path = /obj/item/clothing/accessory/replika
/datum/gear/accessory/replika/New()
..()
var/list/replika_vests = list(
"controller replikant chestplate" = /obj/item/clothing/accessory/replika/klbr,
"combat-engineer replikant chestplate" = /obj/item/clothing/accessory/replika/lstr,
"security-controller replikant chestplate" = /obj/item/clothing/accessory/replika/stcr,
"security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star
)
gear_tweaks += new/datum/gear_tweak/path(replika_vests)
code/modules/client/preference_setup/loadout/loadout_head.dm
+2 -1
View File
@@ -297,7 +297,8 @@
"engineering"=/obj/item/clothing/head/welding/engie,
"fancy"=/obj/item/clothing/head/welding/fancy,
"demonic"=/obj/item/clothing/head/welding/demon,
"knightly"=/obj/item/clothing/head/welding/knight
"knightly"=/obj/item/clothing/head/welding/knight,
"replikant"=/obj/item/clothing/head/welding/arar
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+6
View File
@@ -92,3 +92,9 @@ Talon hats
/datum/gear/head/tiny_tophat
display_name = "tiny tophat"
path = /obj/item/clothing/head/tinytophat
//Replikant hat
/datum/gear/head/eulrhat
display_name = "Sleek side cap"
path = /obj/item/clothing/head/eulrhat
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+41 -1
View File
@@ -592,4 +592,44 @@
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_robo,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_robo_skirt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
//Replikant & Signalis-themed human-wear
/datum/gear/uniform/replikant_selector
display_name = "Replikant Uniform Selection"
description = "Several variants of bodysuit designed for Second Generation Biosynthetics."
path = /obj/item/clothing/under/replika/arar
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/replikant_selector/New()
..()
var/list/selector_uniforms = list(
"Macaw"=/obj/item/clothing/under/replika/arar,
"Magpie"=/obj/item/clothing/under/replika/lstr,
"Falcon"=/obj/item/clothing/under/replika/fklr,
"Owl"=/obj/item/clothing/under/replika/eulr,
"Hummingbird"=/obj/item/clothing/under/replika/klbr,
"Stork/Starling"=/obj/item/clothing/under/replika/stcr,
"Eagle"=/obj/item/clothing/under/replika/adlr,
"Magpie, Alternate"=/obj/item/clothing/under/replika/lstr_alt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/gestalt_selector
display_name = "Sleek Uniform Selection"
description = "Multiple variants of single-stripe pattern uniforms. Best worn under their accompanying jacket."
path = /obj/item/clothing/under/gestalt
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/gestalt_selector/New()
..()
var/list/selector_uniforms = list(
"Sleek, standard"=/obj/item/clothing/under/gestalt/sleek,
"Sleek, skirt"=/obj/item/clothing/under/gestalt/sleek_skirt,
"Sleek, feminine"=/obj/item/clothing/under/gestalt/sleek_fem,
"Sleek, sleeveless"=/obj/item/clothing/under/gestalt/sleeveless
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+4
View File
@@ -516,6 +516,10 @@
display_name = "high-waisted trousers"
path = /obj/item/clothing/under/dress/hightrousers
/datum/gear/uniform/vampirehunter
display_name = "18th century outfit"
path = /obj/item/clothing/under/vampirehunter
/*
* 80s
*/