cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5687 from CHOMPStation2/upstream-merge-14446

Browse Source 
[MIRROR] skyrat outfit port continuation (adds to loadout)
This commit is contained in:
Nadyr
2023-02-08 00:39:57 -05:00
committed by GitHub
parent f50b706d90 9299320605
commit f81a4f1bd1
17 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -139,3 +139,11 @@ Talon pin
/datum/gear/accessory/altevian_badge
display_name = "altevian badge"
path = /obj/item/clothing/accessory/altevian_badge
/datum/gear/accessory/maid_neck
display_name = "maid neck cover"
path = /obj/item/clothing/accessory/maid_neck
/datum/gear/accessory/maid_corset
display_name = "maid corset"
path = /obj/item/clothing/accessory/maidcorset

6
code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
View File

@@ -25,4 +25,8 @@
/datum/gear/gloves/siren
display_name = "gloves, Siren"
path = /obj/item/clothing/gloves/fluff/siren
path = /obj/item/clothing/gloves/fluff/siren
/datum/gear/gloves/maid_arms
display_name = "maid arm covers"
path = /obj/item/clothing/accessory/maid_arms

15
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
View File

@@ -11,14 +11,21 @@
display_name = "basic headband"
path = /obj/item/clothing/head/fluff/headbando
/datum/gear/head/maid
display_name = "maid headband"
path = /obj/item/clothing/head/headband/maid
/datum/gear/head/headbando/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/maid
display_name = "maid headband selection"
path = /obj/item/clothing/head/headband/maid
/datum/gear/head/maid/New()
..()
var/list/headbands_list = list()
for(var/obj/item/clothing/head/bands as anything in typesof(/obj/item/clothing/head/headband/maid))
headbands_list[initial(bands.name)] = bands
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(headbands_list))
//Detective alternative
/datum/gear/head/detective_alt
display_name = "cyberscope headgear, detective"

8
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
View File

@@ -20,3 +20,11 @@
/datum/gear/shoes/toeless
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/boots/jackboots/toeless
/datum/gear/shoes/singer_blue
display_name = "blue performer's boots"
path = /obj/item/clothing/shoes/boots/singer
/datum/gear/shoes/singer_yellow
display_name = "yellow performer's boots"
path = /obj/item/clothing/shoes/boots/singer/yellow

4
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -152,3 +152,7 @@ Talon winter coat
/datum/gear/suit/cyberpunk_recolorable/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/shrine_maiden
display_name = "shrine maiden costume"
path = /obj/item/clothing/suit/shrine_maiden

8
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -322,3 +322,11 @@ Talon jumpsuit
display_name = "undersuit, security, modernized (Security)"
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
path = /obj/item/clothing/under/rank/security/modern
/datum/gear/uniform/singer_blue
display_name = "blue singer dress"
path = /obj/item/clothing/under/dress/singer
/datum/gear/uniform/singer_yellow
display_name = "yellow singer dress"
path = /obj/item/clothing/under/dress/singer/yellow

5
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -142,11 +142,6 @@
drop_sound = 'sound/items/drop/metalboots.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
/obj/item/clothing/gloves/maid_arms
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arm, weird."
icon_state = "maid_arms"
/obj/item/clothing/gloves/ranger
var/glovecolor = "white"
name = "ranger gloves"

4
code/modules/clothing/head/misc.dm
View File

@@ -15,8 +15,8 @@
desc = "a small metal ring, floating above it's wearer."
icon_state = "halo"
/obj/item/clothing/head/maid_headband
name = "maid headband"
/obj/item/clothing/head/headband/maid/modern
name = "modern maid headband"
desc = "Just like from my Japanese cartoons!"
icon_state = "maid_headband"

6
code/modules/clothing/shoes/boots.dm
View File

@@ -242,12 +242,12 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
siemens_coefficient = 0.6
/obj/item/clothing/shoes/boots/bsing
/obj/item/clothing/shoes/boots/singer
name = "blue performer's boots"
desc = "These boots were made for dancing."
icon_state = "bsing"
/obj/item/clothing/shoes/boots/ysing
/obj/item/clothing/shoes/boots/singer/yellow
name = "yellow performer's boots"
desc = "These boots were made for dancing."
icon_state = "ysing"
icon_state = "ysing"

2
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -278,7 +278,7 @@
item_state_slots = list(slot_r_hand_str = "red_labcoat", slot_l_hand_str = "red_labcoat")
/obj/item/clothing/suit/shrine_maiden
name = "Shrine maiden costume."
name = "shrine maiden costume"
desc = "Makes you want to exterminate some troublesome youkai."
icon_state = "shrine_maiden"
body_parts_covered = LOWER_TORSO|UPPER_TORSO|LEGS|ARMS

10
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -181,6 +181,14 @@
desc = "The final touch that holds it all together."
icon_state = "maidcorset"
/obj/item/clothing/accessory/maid_arms
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arms, weird."
slot_flags = SLOT_OCLOTHING | SLOT_GLOVES | SLOT_TIE
body_parts_covered = ARMS
description_info = "Wearable as gloves, or attachable to uniforms. May visually conflict with actual gloves when attached to uniforms. Caveat emptor."
icon_state = "maid_arms"
/obj/item/clothing/accessory/stethoscope
name = "stethoscope"
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
@@ -613,4 +621,4 @@
/obj/item/clothing/accessory/pride/vore
name = "vore pride pin"
icon_state = "pride_vore"
icon_state = "pride_vore"

8
code/modules/clothing/under/miscellaneous.dm
View File

@@ -361,8 +361,8 @@
icon_state = "sexymaid"
/obj/item/clothing/under/dress/maid/under_maid
name = "cute maid uniform"
desc = "You're going to use this for housekeeping, right?."
name = "modern maid costume"
desc = "You're going to use this for housekeeping, right?"
icon_state = "under_maid"
/obj/item/clothing/under/dress/dress_fire
@@ -592,12 +592,12 @@
desc = "A waistline this high is just made for ripping bodices, swashing buckles, or - just occasionally - sucking blood."
icon_state = "gayvampire"
/obj/item/clothing/under/dress/bsing
/obj/item/clothing/under/dress/singer
name = "blue singer dress"
desc = "Just looking at this makes you want to sing."
icon_state = "bsing"
/obj/item/clothing/under/dress/ysing
/obj/item/clothing/under/dress/singer/yellow
name = "yellow singer dress"
desc = "Just looking at this makes you want to sing."
icon_state = "ysing"

48
code/modules/economy/vending_machines_vr.dm
View File

@@ -1528,14 +1528,14 @@
/obj/item/clothing/shoes/knight_costume/black = 3,
/obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 3,
/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 3,
/obj/item/clothing/under/dress/bsing = 3,
/obj/item/clothing/shoes/boots/bsing = 3,
/obj/item/clothing/under/dress/ysing = 3,
/obj/item/clothing/shoes/boots/ysing = 3,
/obj/item/clothing/under/dress/singer = 3,
/obj/item/clothing/shoes/boots/singer = 3,
/obj/item/clothing/under/dress/singer/yellow = 3,
/obj/item/clothing/shoes/boots/singer/yellow = 3,
/obj/item/clothing/under/dress/maid/under_maid = 3,
/obj/item/clothing/accessory/maid_neck = 3,
/obj/item/clothing/gloves/maid_arms = 3,
/obj/item/clothing/head/maid_headband = 3,
/obj/item/clothing/accessory/maid_arms = 3,
/obj/item/clothing/head/headband/maid/modern = 3,
/obj/item/clothing/accessory/maidcorset = 3,
/obj/item/clothing/suit/shrine_maiden = 3)
prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
@@ -1605,14 +1605,14 @@
/obj/item/clothing/shoes/knight_costume/black = 200,
/obj/item/clothing/suit/storage/hooded/foodcostume/hotdog = 200,
/obj/item/clothing/suit/storage/hooded/foodcostume/turnip = 200,
/obj/item/clothing/under/dress/bsing = 200,
/obj/item/clothing/shoes/boots/bsing = 50,
/obj/item/clothing/under/dress/ysing = 200,
/obj/item/clothing/shoes/boots/ysing = 50,
/obj/item/clothing/under/dress/singer = 200,
/obj/item/clothing/shoes/boots/singer = 50,
/obj/item/clothing/under/dress/singer/yellow = 200,
/obj/item/clothing/shoes/boots/singer/yellow = 50,
/obj/item/clothing/under/dress/maid/under_maid = 200,
/obj/item/clothing/accessory/maid_neck = 25,
/obj/item/clothing/gloves/maid_arms = 25,
/obj/item/clothing/head/maid_headband = 25,
/obj/item/clothing/accessory/maid_arms = 25,
/obj/item/clothing/head/headband/maid/modern = 25,
/obj/item/clothing/accessory/maidcorset = 25,
/obj/item/clothing/suit/shrine_maiden = 200)
premium = list(/obj/item/clothing/suit/imperium_monk = 3,
@@ -1774,14 +1774,14 @@
/obj/item/clothing/gloves/combat/knight_costume/brown = 3,
/obj/item/clothing/shoes/knight_costume = 3,
/obj/item/clothing/shoes/knight_costume/black = 3,
/obj/item/clothing/under/dress/bsing = 3,
/obj/item/clothing/shoes/boots/bsing = 3,
/obj/item/clothing/under/dress/ysing = 3,
/obj/item/clothing/shoes/boots/ysing = 3,
/obj/item/clothing/under/dress/singer = 3,
/obj/item/clothing/shoes/boots/singer = 3,
/obj/item/clothing/under/dress/singer/yellow = 3,
/obj/item/clothing/shoes/boots/singer/yellow = 3,
/obj/item/clothing/under/dress/maid/under_maid = 3,
/obj/item/clothing/accessory/maid_neck = 3,
/obj/item/clothing/gloves/maid_arms = 3,
/obj/item/clothing/head/maid_headband = 3,
/obj/item/clothing/accessory/maid_arms = 3,
/obj/item/clothing/head/headband/maid/modern = 3,
/obj/item/clothing/accessory/maidcorset = 3,
/obj/item/clothing/suit/shrine_maiden = 3)
@@ -2572,14 +2572,14 @@
/obj/item/clothing/suit/drake_cloak = 2,
/obj/item/clothing/head/syndicatefake = 1,
/obj/item/clothing/suit/syndicatefake = 1,
/obj/item/clothing/under/dress/bsing = 3,
/obj/item/clothing/shoes/boots/bsing = 3,
/obj/item/clothing/under/dress/ysing = 3,
/obj/item/clothing/shoes/boots/ysing = 3,
/obj/item/clothing/under/dress/singer = 3,
/obj/item/clothing/shoes/boots/singer = 3,
/obj/item/clothing/under/dress/singer/yellow = 3,
/obj/item/clothing/shoes/boots/singer/yellow = 3,
/obj/item/clothing/under/dress/maid/under_maid = 3,
/obj/item/clothing/accessory/maid_neck = 3,
/obj/item/clothing/gloves/maid_arms = 3,
/obj/item/clothing/head/maid_headband = 3,
/obj/item/clothing/accessory/maid_arms = 3,
/obj/item/clothing/head/headband/maid/modern = 3,
/obj/item/clothing/accessory/maidcorset = 3,
/obj/item/clothing/suit/shrine_maiden = 3
)

BIN
icons/inventory/accessory/item.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 80 KiB

BIN
icons/inventory/accessory/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB

BIN
icons/inventory/suit/item.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 216 KiB

BIN
icons/inventory/suit/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 629 KiB

After

Width:  |  Height:  |  Size: 629 KiB