Ports Midnight Gown and Camo from Nova (#4931)
## About The Pull Request Title. More Nova ports. ## Why It's Good For The Game This shit is drippy. <img width="352" height="315" alt="image" src="https://github.com/user-attachments/assets/ba50f545-8546-490d-9fcb-8006b5b8b016" /> ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 RealWinterSun, Jureiia add: Ported Midnight Gown and Camo from Nova /🆑
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.6 KiB |
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"midnight_right": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "midnight_right",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [1]
|
||||
}
|
||||
],
|
||||
"midnight_left": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "midnight_left",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [1]
|
||||
}
|
||||
],
|
||||
"midnight_mid": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "midnight_mid",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [1]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"solfed_camo": [
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "camo_clr1",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 1 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "camo_clr2",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 2 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "camo_clr3",
|
||||
"blend_mode": "overlay",
|
||||
"color_ids": [ 3 ]
|
||||
},
|
||||
{
|
||||
"type": "icon_state",
|
||||
"icon_state": "belt",
|
||||
"blend_mode": "overlay"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
// Ringing Bell
|
||||
// All json_config files are located on modular_skyrat/modules/GAGS/json_configs/
|
||||
// All Zubber json_config files are located on modular_zubbers/code/datums/greyscale/json_configs
|
||||
// Reason: See code/datums/greyscale/_greyscale_config.dm lines 63-69.
|
||||
|
||||
/datum/greyscale_config/collar/ringbell
|
||||
@@ -273,3 +273,32 @@
|
||||
/datum/greyscale_config/galfedribbons/worn
|
||||
name = "GalFed Ribbons (Worn)"
|
||||
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
|
||||
|
||||
//Midnight Gown (created on Nova by Jureiia)
|
||||
|
||||
/datum/greyscale_config/midnight_gown
|
||||
name = "Midnight Gown"
|
||||
icon_file = 'modular_zubbers/icons/obj/clothing/under/skirts_dresses.dmi'
|
||||
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/under/dresses/midnight_gown.json'
|
||||
|
||||
/datum/greyscale_config/midnight_gown/worn
|
||||
name = "Midnight Gown (Worn)"
|
||||
icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses.dmi'
|
||||
|
||||
/datum/greyscale_config/midnight_gown/worn/digi
|
||||
name = "Midnight Gown (Worn, Digi)"
|
||||
icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses_digi.dmi'
|
||||
|
||||
//Camo from Nova
|
||||
/datum/greyscale_config/camo
|
||||
name = "Camouflage"
|
||||
icon_file = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
|
||||
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/under/uniform/maincamo.json'
|
||||
|
||||
/datum/greyscale_config/camo/worn
|
||||
name = "Camouflage (Worn)"
|
||||
icon_file = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
|
||||
|
||||
/datum/greyscale_config/camo/worn/digi
|
||||
name = "Camouflage (Worn, Digi)"
|
||||
icon_file = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
|
||||
|
||||
@@ -636,3 +636,18 @@
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi'
|
||||
icon_state = "snake"
|
||||
|
||||
/obj/item/clothing/under/rank/civilian/bubber/camo
|
||||
name = "camouflage uniform"
|
||||
desc = "Well my wife left me, so now I make stolen valor videos at the mall."
|
||||
icon = 'icons/map_icons/clothing/under/_under.dmi'
|
||||
icon_state = "/obj/item/clothing/under/rank/civilian/bubber/camo"
|
||||
post_init_icon_state = "solfed_camo"
|
||||
worn_icon_state = "solfed_camo"
|
||||
worn_icon_digi = "solfed_camo"
|
||||
greyscale_config = /datum/greyscale_config/camo
|
||||
greyscale_config_worn = /datum/greyscale_config/camo/worn
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/camo/worn/digi
|
||||
greyscale_colors = "#4d4d4d#333333#292929"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
|
||||
can_adjust = FALSE
|
||||
|
||||
@@ -64,3 +64,19 @@
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/under/syndicate.dmi'
|
||||
icon_state = "snake"
|
||||
uses_advanced_reskins = FALSE
|
||||
|
||||
/obj/item/clothing/under/rank/security/camo
|
||||
name = "armored camouflage uniform"
|
||||
desc = "DO YOU FIND THAT FUNNY BUTTHEAD?!"
|
||||
icon = 'icons/map_icons/clothing/under/_under.dmi'
|
||||
icon_state = "/obj/item/clothing/under/rank/security/camo"
|
||||
post_init_icon_state = "solfed_camo"
|
||||
worn_icon_state = "solfed_camo"
|
||||
worn_icon_digi = "solfed_camo"
|
||||
greyscale_config = /datum/greyscale_config/camo
|
||||
greyscale_config_worn = /datum/greyscale_config/camo/worn
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/camo/worn/digi
|
||||
greyscale_colors = "#A53228#333333#292929"
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
|
||||
can_adjust = FALSE
|
||||
uses_advanced_reskins = FALSE
|
||||
|
||||
@@ -23,3 +23,27 @@
|
||||
gets_cropped_on_taurs = FALSE
|
||||
can_adjust = TRUE
|
||||
body_parts_covered = GROIN | LEGS
|
||||
|
||||
/obj/item/clothing/under/dress/bubber/midnight_gown
|
||||
name = "midnight gown"
|
||||
desc = "A seductive gown purpose tailored to show off one's legs."
|
||||
icon = 'icons/map_icons/clothing/under/dress.dmi'
|
||||
icon_state = "/obj/item/clothing/under/dress/bubber/midnight_gown"
|
||||
post_init_icon_state = "midnight_right"
|
||||
greyscale_config = /datum/greyscale_config/midnight_gown
|
||||
greyscale_config_worn = /datum/greyscale_config/midnight_gown/worn
|
||||
greyscale_config_worn_digi = /datum/greyscale_config/midnight_gown/worn/digi
|
||||
greyscale_colors = "#1D253B"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
|
||||
body_parts_covered = CHEST|GROIN|LEGS
|
||||
can_adjust = FALSE
|
||||
alternate_worn_layer = ABOVE_SHOES_LAYER
|
||||
gets_cropped_on_taurs = FALSE
|
||||
unique_reskin = list(
|
||||
"Right" = "midnight_right",
|
||||
"Left" = "midnight_left",
|
||||
"Middle" = "midnight_mid"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,6 +6,15 @@
|
||||
donator_only = TRUE
|
||||
restricted_roles = list(ALL_JOBS_SEC, JOB_BLUESHIELD)
|
||||
|
||||
/datum/loadout_item/uniform/security/camo
|
||||
name = "Armored Camouflage Uniform"
|
||||
item_path = /obj/item/clothing/under/rank/security/camo
|
||||
restricted_roles = list(ALL_JOBS_SEC, JOB_BLUESHIELD)
|
||||
|
||||
/datum/loadout_item/uniform/camo
|
||||
name = "Camouflage Uniform"
|
||||
item_path = /obj/item/clothing/under/rank/civilian/bubber/camo
|
||||
|
||||
/datum/loadout_item/uniform/command/stripper //Sprites by SierraGenevese
|
||||
name = "Command Bikini"
|
||||
item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper
|
||||
@@ -162,3 +171,7 @@
|
||||
/datum/loadout_item/uniform/miscellaneous/red_and_white_collared_outfit
|
||||
name = "Red and White Collared Suit"
|
||||
item_path = /obj/item/clothing/under/red_and_white_collared_outfit
|
||||
|
||||
/datum/loadout_item/uniform/miscellaneous/midnightdress
|
||||
name = "Midnight Gown"
|
||||
item_path = /obj/item/clothing/under/dress/bubber/midnight_gown
|
||||
|
||||
@@ -188,6 +188,7 @@
|
||||
/obj/item/clothing/under/dress/skyrat/pinktutu = 5,
|
||||
/obj/item/clothing/under/dress/skyrat/short_dress = 5,
|
||||
/obj/item/clothing/under/dress/skyrat/strapless = 5,
|
||||
/obj/item/clothing/under/dress/bubber/midnight_gown = 5,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -223,6 +224,7 @@
|
||||
/obj/item/clothing/mask/surgical/greyscale = 5,
|
||||
/obj/item/clothing/under/costume/deckers/alt = 5,
|
||||
/obj/item/clothing/under/costume/skyrat/bathrobe = 5,
|
||||
/obj/item/clothing/under/rank/civilian/bubber/camo = 5,
|
||||
/obj/item/riding_saddle/leather = 5,
|
||||
/obj/item/storage/backpack/saddlebags = 5,
|
||||
/obj/item/umbrella = 20,
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
/obj/item/storage/backpack/duffelbag/sec/redsec = 6,
|
||||
/obj/item/clothing/under/rank/security/officer/redsec = 6,
|
||||
/obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6,
|
||||
/obj/item/clothing/under/rank/security/camo = 6,
|
||||
/obj/item/clothing/shoes/jackboots = 6,
|
||||
/obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6,
|
||||
/obj/item/clothing/shoes/jackboots/gogo_boots = 6,
|
||||
|
||||
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 764 B After Width: | Height: | Size: 1.4 KiB |
BIN
modular_zubbers/icons/mob/clothing/under/skirts_dresses_digi.dmi
Normal file
|
After Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 903 B |