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

Modular vending machine item code & more #101

Merged
merged 4 commits into from
Sep 27, 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions modular_doppler/loadout_categories/categories/heads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,19 @@
/datum/loadout_item/head/hair_tie_plastic
name = "Hairtie (Plastic)"
item_path = /obj/item/clothing/head/hair_tie/plastic_beads

/datum/loadout_item/head/bow_large
name = "Bow (Large)"
item_path = /obj/item/clothing/head/bow

/datum/loadout_item/head/bow_small
name = "Bow (Small)"
item_path = /obj/item/clothing/head/bow/small

/datum/loadout_item/head/bow_back
name = "Bow (Back)"
item_path = /obj/item/clothing/head/bow/back

/datum/loadout_item/head/bow_sweet
name = "Bow (Sweet)"
item_path = /obj/item/clothing/head/bow/sweet
16 changes: 16 additions & 0 deletions modular_doppler/loadout_categories/categories/undersuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,19 @@
/datum/loadout_item/undersuit/dress/sailor
name = "Heretical Dress"
item_path = /obj/item/clothing/under/dress/sailor

/datum/loadout_item/undersuit/dress/tutu
name = "Pink Tutu"
item_path = /obj/item/clothing/under/dress/doppler/pinktutu

/datum/loadout_item/undersuit/dress/flower
name = "Flower Dress"
item_path = /obj/item/clothing/under/dress/doppler/flower

/datum/loadout_item/undersuit/dress/penta
name = "Pentagram Dress"
item_path = /obj/item/clothing/under/dress/doppler/pentagram

/datum/loadout_item/undersuit/dress/strapless
name = "Strapless Dress"
item_path = /obj/item/clothing/under/dress/doppler/strapless
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,41 @@
name = "Hood (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood_worn.json'


//BOWS
/datum/greyscale_config/large_bow
name = "Large Bow"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/large_bow.json'

/datum/greyscale_config/large_bow/worn
name = "Large Bow (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'

/datum/greyscale_config/back_bow
name = "Back Bow"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/back_bow.json'

/datum/greyscale_config/back_bow/worn
name = "Back Bow (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'

/datum/greyscale_config/sweet_bow
name = "Sweet Bow"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/sweet_bow.json'

/datum/greyscale_config/sweet_bow/worn
name = "Sweet Bow (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'

/datum/greyscale_config/small_bow
name = "Small Bow"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/small_bow.json'

/datum/greyscale_config/small_bow/worn
name = "Small Bow (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,25 @@
name = "'JUNCO' megacargo pants (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json'

///////////
//DRESSES//
///////////

/datum/greyscale_config/strapless_dress
name = "Strapless Dress"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/strapless_dress.json'

/datum/greyscale_config/strapless_dress/worn
name = "Strapless Dress (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'

/datum/greyscale_config/pentagram_dress
name = "Pentagram Strapped Dress"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/pentagram_dress.json'

/datum/greyscale_config/pentagram_dress/worn
name = "Pentagram Strapped Dress (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"back_bow": [
{
"type": "icon_state",
"icon_state": "back_bow",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"large_bow": [
{
"type": "icon_state",
"icon_state": "large_bow",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"small_bow": [
{
"type": "icon_state",
"icon_state": "small_bow",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"small_bow_t": [
{
"type": "icon_state",
"icon_state": "small_bow_t",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"sweet_bow": [
{
"type": "icon_state",
"icon_state": "sweet_bow",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"dress_pentagram": [
{
"type": "icon_state",
"icon_state": "penta_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"dress_strapless": [
{
"type": "icon_state",
"icon_state": "strapless_belt",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "strapless_base",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
25 changes: 25 additions & 0 deletions modular_doppler/modular_cosmetics/code/belt/med_bandolier.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/obj/item/storage/belt/med_bandolier
icon = 'modular_doppler/modular_cosmetics/icons/obj/belt/medical_extra.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/belt/medical_extra.dmi'
name = "medical bandolier"
desc = "A pocketed, pine green belt slung like a sash over the shoulder. Features numerous pockets for medicines and poisons alike. Now is coward healing time."
icon_state = "med_bandolier"
worn_icon_state = "med_bandolier"

/obj/item/storage/belt/med_bandolier/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
atom_storage.max_slots = 14
atom_storage.max_total_storage = 35
atom_storage.set_holdable(list(
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/cup/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medigel,
/obj/item/storage/pill_bottle,
/obj/item/implanter,
/obj/item/hypospray/mkii,
/obj/item/reagent_containers/cup/hypovial,
))
52 changes: 52 additions & 0 deletions modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/obj/item/storage/bag/garment/captain/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/command(src)
new /obj/item/clothing/neck/doppler_mantle/command(src)
new /obj/item/clothing/head/beret/doppler_command/command(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/command(src)

/obj/item/storage/bag/garment/hop/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/service(src)
new /obj/item/clothing/neck/doppler_mantle/service(src)
new /obj/item/clothing/head/beret/doppler_command/service(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/service(src)

/obj/item/storage/bag/garment/hos/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/security(src)
new /obj/item/clothing/neck/doppler_mantle/security(src)
new /obj/item/clothing/head/beret/doppler_command/security(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/security(src)

/obj/item/storage/bag/garment/warden/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/security(src)

/obj/item/storage/bag/garment/research_director/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/science(src)
new /obj/item/clothing/neck/doppler_mantle/science(src)
new /obj/item/clothing/head/beret/doppler_command/science(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/science(src)

/obj/item/storage/bag/garment/chief_medical/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/medical(src)
new /obj/item/clothing/neck/doppler_mantle/medical(src)
new /obj/item/clothing/head/beret/doppler_command/medical(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/medical(src)

/obj/item/storage/bag/garment/engineering_chief/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/engineering(src)
new /obj/item/clothing/neck/doppler_mantle/engineering(src)
new /obj/item/clothing/head/beret/doppler_command/engineering(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/engineering(src)

/obj/item/storage/bag/garment/quartermaster/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/cargo(src)
new /obj/item/clothing/neck/doppler_mantle/cargo(src)
new /obj/item/clothing/head/beret/doppler_command/cargo(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/cargo(src)
38 changes: 38 additions & 0 deletions modular_doppler/modular_cosmetics/code/head/bows.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/clothing/head/bow
name = "large bow"
desc = "A large bow that you can place on top of your head."
icon_state = "large_bow"
icon_preview = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
icon_state_preview = "large_bow"
greyscale_config = /datum/greyscale_config/large_bow
greyscale_config_worn = /datum/greyscale_config/large_bow/worn
greyscale_colors = "#7b9ab5"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/head/bow/small
name = "small bow"
desc = "A small compact bow that you can place on the side of your hair."
icon_state = "small_bow"
icon_state_preview = "small_bow"
greyscale_config = /datum/greyscale_config/small_bow
greyscale_config_worn = /datum/greyscale_config/small_bow/worn

/obj/item/clothing/head/bow/small/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_clothes, "small_bow_t")

/obj/item/clothing/head/bow/back
name = "back bow"
desc = "A large bow that you can place on the back of your head."
icon_state = "back_bow"
icon_state_preview = "back_bow"
greyscale_config = /datum/greyscale_config/back_bow
greyscale_config_worn = /datum/greyscale_config/back_bow/worn

/obj/item/clothing/head/bow/sweet
name = "sweet bow"
desc = "A sweet bow that you can place on the back of your head."
icon_state = "sweet_bow"
icon_state_preview = "sweet_bow"
greyscale_config = /datum/greyscale_config/sweet_bow
greyscale_config_worn = /datum/greyscale_config/sweet_bow/worn
38 changes: 38 additions & 0 deletions modular_doppler/modular_cosmetics/code/under/dresses.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/clothing/under/dress/doppler
icon = 'modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi'

/obj/item/clothing/under/dress/doppler/pentagram
name = "pentagram strapped dress"
desc = "A soft dress with straps designed to rest as a pentragram. Isn't this against NT's whole \"Authorized Religion\" stuff?"
icon_state = "dress_pentagram"
icon_preview = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
icon_state_preview = "penta_base"
body_parts_covered = CHEST|GROIN|LEGS
greyscale_config = /datum/greyscale_config/pentagram_dress
greyscale_config_worn = /datum/greyscale_config/pentagram_dress/worn
greyscale_colors = "#403c46"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/under/dress/doppler/strapless
name = "strapless dress"
desc = "Typical formal wear with no straps, instead opting to be tied at the waist. Most likely will need constant adjustments."
icon_state = "dress_strapless"
icon_preview = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
icon_state_preview = "strapless_base"
body_parts_covered = CHEST|GROIN|LEGS
greyscale_config = /datum/greyscale_config/strapless_dress
greyscale_config_worn = /datum/greyscale_config/strapless_dress/worn
greyscale_colors = "#cc0000#5f5f5f"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/under/dress/doppler/flower
name = "flower dress"
desc = "Lovely dress. Colored like the autumn leaves."
icon_state = "flower_dress"
body_parts_covered = CHEST|GROIN|LEGS

/obj/item/clothing/under/dress/doppler/pinktutu
name = "pink tutu"
desc = "A fluffy pink tutu."
icon_state = "pinktutu"
18 changes: 18 additions & 0 deletions modular_doppler/modular_cosmetics/code/under/medical_extra.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* CHEMIST
*/

/obj/item/clothing/under/rank/medical/chemist/pharmacologist
name = "pharmacologist jumpsuit"
desc = "A white shirt with left-aligned buttons and an orange stripe, lined with protection against chemical spills."
icon = 'modular_doppler/modular_cosmetics/icons/obj/under/medical_extra.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/medical_extra.dmi'
icon_state = "pharmacologist"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt
name = "pharmacologist jumpskirt"
icon_state = "pharmacologist_skirt"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
Loading
Loading