Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] iskapass, october 2024 #5192

Merged
merged 2 commits into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
icon_state = "labcoat_regular"
gets_cropped_on_taurs = FALSE

/obj/item/clothing/suit/toggle/labcoat/nova/lalunevest
name = "sleeveless buttoned coat"
desc = "A fashionable jacket bearing the La Lune insignia on the inside. It appears similar to a labcoat in design and materials, though the tag warns against it being a replacement for such."
icon_state = "labcoat_lalunevest"
gets_cropped_on_taurs = FALSE

/obj/item/clothing/suit/toggle/labcoat/nova/pharmacist
name = "pharmacist's labcoat"
desc = "A standard labcoat for chemistry which protects the wearer from acid spills."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,17 @@
greyscale_config = /datum/greyscale_config/wedding_dress_ribbon
greyscale_config_worn = /datum/greyscale_config/wedding_dress_ribbon/worn

/obj/item/clothing/under/dress/nova/giant_scarf
name = "giant scarf"
desc = "An absurdly massive scarf, worn as the main article of clothing over the body. Ironically, not very suitable for the cold."
icon_state = "giant_scarf"
body_parts_covered = CHEST|GROIN|LEGS
greyscale_config = /datum/greyscale_config/giant_scarf
greyscale_config_worn = /datum/greyscale_config/giant_scarf/worn
greyscale_colors = "#EEEEEE"
female_sprite_flags = NO_FEMALE_UNIFORM
flags_1 = IS_PLAYER_COLORABLE_1

/*
* Others
*/
Expand Down
Binary file modified modular_nova/master_files/icons/mob/clothing/hands.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions modular_nova/modules/GAGS/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,15 @@
name = "Wedding Dress With Ribbon (Worn)"
icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi'

/datum/greyscale_config/giant_scarf
name = "Giant Scarf"
icon_file = 'modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi'
json_config = 'modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json'

/datum/greyscale_config/giant_scarf/worn
name = "Giant Scarf (Worn)"
icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi'


// KILT
// COSTUMES
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"giant_scarf": [
{
"type": "icon_state",
"icon_state": "giant_scarf",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT

/obj/item/clothing/gloves/lalune_long
icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
name = "designer long gloves"
desc = "A fancy set of bicep-length black gloves. The La Lune insignia is sewn into the rims."
icon_state = "lalune_long"
strip_delay = 4 SECONDS
equip_delay_other = 2 SECONDS

/obj/item/clothing/gloves/kim
icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@
icon_state = "fish"
color_src = USE_ONE_COLOR

/datum/sprite_accessory/ears/mutant/floppy
name = "Floppy"
icon_state = "floppy"

/datum/sprite_accessory/ears/mutant/vulpkanin/fox
name = "Fox"
icon_state = "fox"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,26 @@
name = "Broad Curls"
icon_state = "broadcurls"

/datum/sprite_accessory/horns/antenna_fuzzball_v2
name = "Fuzzball Antenna"
icon_state = "antenna_fuzzballv2"
color_src = USE_MATRIXED_COLORS

/datum/sprite_accessory/horns/setaceous
name = "Setaceous Antenna"
icon_state = "setaceous"
color_src = USE_ONE_COLOR

/datum/sprite_accessory/horns/setaceousm
name = "Medium Setaceous Antenna"
icon_state = "setaceousm"
color_src = USE_ONE_COLOR

/datum/sprite_accessory/horns/geniculate
name = "Geniculate Antenna"
icon_state = "geniculate"
color_src = USE_ONE_COLOR

/datum/sprite_accessory/horns/moogle_pom
icon = 'modular_nova/master_files/icons/mob/sprite_accessory/moogle_pom.dmi'
color_src = USE_MATRIXED_COLORS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,14 @@
name = "Scolipede"
icon_state = "pede"

/datum/sprite_accessory/snouts/mammal/pig
name = "Porcine"
icon_state = "pig"

/datum/sprite_accessory/snouts/mammal/pig/boar
name = "Porcine + Tusks"
icon_state = "boar"

/datum/sprite_accessory/snouts/mammal/sergal
name = "Sergal"
icon_state = "sergal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,11 @@
/datum/sprite_accessory/taur/biglegs/stanced/bird
name = "Big Legs, Stanced Bird"
icon_state = "biglegs_bird_stanced"

/datum/sprite_accessory/taur/biglegs/peg
name = "Big Legs, Pegs"
icon_state = "biglegs_peg"

/datum/sprite_accessory/taur/biglegs/stanced/peg
name = "Big Legs, Stanced Pegs"
icon_state = "biglegs_peg_stanced"
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
name = "Fingerless Gloves"
item_path = /obj/item/clothing/gloves/fingerless

/datum/loadout_item/gloves/lalune_long
name = "Designer Black Gloves"
item_path = /obj/item/clothing/gloves/lalune_long

/datum/loadout_item/gloves/black
name = "Black Gloves"
item_path = /obj/item/clothing/gloves/color/black
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,10 @@
item_path = /obj/item/clothing/neck/security_cape/tarkon
blacklisted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/neck/security_cape
name = "Security Cape"
item_path = /obj/item/clothing/neck/security_cape

/*
* DONATOR
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@
name = "Researcher's Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/nova/regular

/datum/loadout_item/suit/labcoat_lalunevest
name = "Designer Buttoned Coat"
item_path = /obj/item/clothing/suit/toggle/labcoat/nova/lalunevest

/datum/loadout_item/suit/labcoat_pharmacist
name = "Pharmacist's Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@
name = "Wedding Dress With Ribbon"
item_path = /obj/item/clothing/under/dress/wedding_dress/ribbon

/datum/loadout_item/under/miscellaneous/giant_scarf
name = "Giant Scarf"
item_path = /obj/item/clothing/under/dress/nova/giant_scarf

/datum/loadout_item/under/miscellaneous/red_skirt
name = "Red Bra and Skirt"
item_path = /obj/item/clothing/under/dress/skirt/nova/red_skirt
Expand Down
3 changes: 3 additions & 0 deletions modular_nova/modules/modular_vending/code/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
/obj/item/clothing/under/suit/nova/helltaker/skirt = 3,
/obj/item/clothing/under/dress/skirt/nova/medium = 5,
/obj/item/clothing/under/dress/skirt/nova/long = 5,
/obj/item/clothing/under/dress/nova/giant_scarf = 5,
),
),

Expand Down Expand Up @@ -182,6 +183,8 @@
/obj/item/clothing/suit/brownbattlecoat = 1,
/obj/item/clothing/suit/blackfurrich = 1,
/obj/item/clothing/suit/frenchtrench = 1,
/obj/item/clothing/suit/toggle/labcoat/nova/lalunevest = 2,
/obj/item/clothing/gloves/lalune_long = 2,
)

contraband_nova = list(
Expand Down
Loading