diff --git a/modular_zubbers/code/game/Items/storage/backpack.dm b/modular_zubbers/code/game/Items/storage/backpack.dm new file mode 100644 index 00000000000..c67f9c4ec71 --- /dev/null +++ b/modular_zubbers/code/game/Items/storage/backpack.dm @@ -0,0 +1,13 @@ +/obj/item/storage/backpack/duffelbag/med + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/storage/backpack.dmi', + RESKIN_ICON_STATE = "duffel-med", + RESKIN_INHAND_L = 'modular_zubbers/icons/mob/inhands/equipment/backpack_lefthand.dmi', + RESKIN_INHAND_R = 'modular_zubbers/icons/mob/inhands/equipment/backpack_righthand.dmi', + RESKIN_INHAND_STATE = "duffel-med", + RESKIN_WORN_ICON = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi', + RESKIN_WORN_ICON_STATE = "duffel-med", + ), + ) diff --git a/modular_zubbers/code/game/objects/items/cards_ids.dm b/modular_zubbers/code/game/objects/items/cards_ids.dm new file mode 100644 index 00000000000..b09bf85a1c1 --- /dev/null +++ b/modular_zubbers/code/game/objects/items/cards_ids.dm @@ -0,0 +1,19 @@ +//Cosmetic ID cards that use cardboard to make them useless as actual IDs, while still looking vaguely like one. +/obj/item/card/cardboard/unioncard + name = "union membership card" + desc = "Considered contraband on Nanotrasen-aligned stations, this card proclaims the wearer's membership to the Worker's Union." + icon = 'modular_zubbers/icons/obj/card.dmi' + icon_state = "union" + inhand_icon_state = "union" + lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/idcards_righthand.dmi' + + +/obj/item/card/cardboard/korvenbank + name = "korven bank card" + desc = "An old, blank bank card with an inactive account, belonging to the Korve Central Bank." + icon = 'modular_zubbers/icons/obj/card.dmi' + icon_state = "korven_bank" + inhand_icon_state = "korven" + lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/idcards_righthand.dmi' diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index 15dee7c414c..cadbf31bd35 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -19,26 +19,60 @@ icon_state = "plushie_mal0" /obj/item/toy/plush/nobl - name = "Fluffy Skog plushie" + name = "fluffy skog plushie" desc = "It seems to be a small canine, not necessarily latex like you would suspect for some reason, but extremely squishy." icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' - icon_state = "nobl_plush" + icon_state = "nobl" squeak_override = list('modular_zubbers/sound/misc/dog_toy.ogg' = 1) /obj/item/toy/plush/chirp_plush - name = "Chirping Synth Plushie" + name = "chirping synth Plushie" desc = "It's warm to the touch." icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' - icon_state = "chirp_plush"//Sprited by Kan3/kaylexi + icon_state = "chirp"//Sprited by Kan3/kaylexi attack_verb_continuous = list("chirps", "chimes") attack_verb_simple = list("chirps") squeak_override = list('sound/machines/beep.ogg' = 1) gender = FEMALE /obj/item/toy/plush/bigdeer_plush - name = "Big deer plushie" + name = "big deer plushie" desc = "An incredibly round deer plush. It appears to have had too many berries for snack time." icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' - icon_state = "bigdeer_plush" //sprited by Gavla + icon_state = "bigdeer" //sprited by Gavla attack_verb_simple = list("puff", "smother") squeak_override = list('modular_zubbers/sound/misc/squeakle.ogg' = 1) + +/obj/item/toy/plush/bubbledragon + name = "bubbledragon plushie" + desc = "This plush of a regal dragon seems to clean every surface it touches. When hugged, it squeaks and blows bubbles! An excellent companion for when TamaGoSlep" + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "bubbledragon" + squeak_override = list('modular_zubbers/sound/misc/squeakle.ogg' = 1) + +/obj/item/toy/plush/bubbledragon/Initialize(mapload) + . = ..() + AddComponent(/datum/component/cleaner, 3 SECONDS, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean))) + +/obj/item/toy/plush/bubbledragon/proc/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner) + return (src in cleaner) + +/obj/item/toy/plush/headcrab + name = "headcrab plushie" + desc = "A small, parasitic alien from the borderworld of Xen, this one is fake." + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "headcrab" + +/obj/item/toy/plush/bellybird + name = "bellybird plushie" + desc = "It has a tag on the back. 'You seen the opera, now get ready for the theatrical release with the new Bellybird plushie. House Feather's patented design allows this plushie to feel almost lifelike with its synthetic feathers and smoothed scales, glow in the dark eyes and a round tummy to rest your head on, not to mention it comes complete with Autumn the snake tail! Witness Autumn in action as this flexible tail is able to snap her jaws and hiss at any opponent with such realism. Order now for only two low payments of 19.95!'" + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "bellybird" + squeak_override = list('modular_skyrat/modules/emotes/sound/emotes/hiss.ogg' = 1) + +/obj/item/toy/plush/tiredtesh + name = "tired tesh plushie" + desc = "He looks very eepy. A tag on the back of the plushie reads, 'Happy birthday, big guy.'" + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "tiredtesh" + squeak_override = list('modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg' = 1) diff --git a/modular_zubbers/code/game/objects/items/stacks/medical.dm b/modular_zubbers/code/game/objects/items/stacks/medical.dm new file mode 100644 index 00000000000..5cb281e3c89 --- /dev/null +++ b/modular_zubbers/code/game/objects/items/stacks/medical.dm @@ -0,0 +1,8 @@ +/obj/item/stack/medical/bone_gel + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "bone-gel", + ), + ) diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index 90afd7a4c05..d1f353929ae 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -1,25 +1,38 @@ /obj/item/clothing/suit/jacket/runner //Sprite by kay#7181 (Donater item: Kan3) - name = "Runner Jacket" - worn_icon = 'modular_zubbers/icons/mob/clothing/suits/runnerjacketdono.dmi' - inhand_icon_state = null - body_parts_covered = CHEST|ARMS|GROIN - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + name = "runner jacket" + icon = 'modular_zubbers/icons/obj/clothing/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + inhand_icon_state = null + body_parts_covered = CHEST|ARMS|GROIN + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/suit/jacket/runner/engi //Sprite by kay#7181 (Donater item: Kan3) - name = "Engineer Runner Jacket" - icon_state = "runner_engi" - desc = "" - icon = 'modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi' + name = "engineer runner jacket" + icon_state = "runner_engi" + desc = "" /obj/item/clothing/suit/jacket/runner/syndicate //Sprite by kay#7181 (Donater item: Kan3) - name = "Sydnicate Runner Jacket" - icon_state = "runner_syndi" - desc = "" - icon = 'modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi' + name = "syndicate runner jacket" + icon_state = "runner_syndi" + desc = "" /obj/item/clothing/suit/jacket/runner/winter //Sprite by kay#7181 (Donater item: Kan3) - name = "Winter Runner Jacket" - icon_state = "runner_winter" - desc = "" - icon = 'modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi' + name = "winter runner jacket" + icon_state = "runner_winter" + desc = "" +/obj/item/clothing/suit/jacket/trucker + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + icon = 'modular_zubbers/icons/obj/clothing/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + desc = "Contact a coder if you see this." + +/obj/item/clothing/suit/jacket/trucker/highvis //Sprites by Scuhf_ + name = "high vis trucker jacket" + desc = "A trucker's jacket with high visibility orange and yellow stripes for warehouse work." + icon_state = "highvis" + +/obj/item/clothing/suit/jacket/trucker/ronin //ported from Citadel + name = "ronin jacket" + desc = "A dark leather jacket with the logo of an old Sol Chromerock band on it." + icon_state = "ronin" diff --git a/modular_zubbers/code/modules/clothing/under/jobs/command.dm b/modular_zubbers/code/modules/clothing/under/jobs/command.dm new file mode 100644 index 00000000000..c6b8709214d --- /dev/null +++ b/modular_zubbers/code/modules/clothing/under/jobs/command.dm @@ -0,0 +1,18 @@ +/obj/item/clothing/under/rank/civilian/head_of_personnel/stripper + desc = "It's a revealing blue stripper outfit with some gold markings befitting either the Head of Personnel or Captain. Technically unsactioned by Nanotrasen." + name = "command stripper uniform" + icon_state = "stripper_cap" + sensor_mode = SENSOR_COORDS + random_sensor = FALSE + icon = 'modular_zubbers/icons/obj/clothing/under/captain.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/captain.dmi' + +/obj/item/clothing/under/rank/nanotrasen_consultant/stripper + desc = "It's a green stripper outfit with some gold markings denoting the rank of \"Nanotrasen Consultant\". Technically unsactioned by Nanotrasen, but due to P.L.O.T. technology, it is as protective as the normal Consultant's jumpsuit." + name = "consultant's stripper uniform" + icon = 'modular_zubbers/icons/obj/clothing/under/captain.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/captain.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/captain.dmi' + icon_state = "stripper_rep" + sensor_mode = SENSOR_COORDS + random_sensor = FALSE diff --git a/modular_zubbers/code/modules/command_vendor/vending.dm b/modular_zubbers/code/modules/command_vendor/vending.dm new file mode 100644 index 00000000000..3efa641dd63 --- /dev/null +++ b/modular_zubbers/code/modules/command_vendor/vending.dm @@ -0,0 +1,8 @@ +/obj/machinery/vending/access/command/build_access_list(list/access_lists) + .=..() + access_lists["[ACCESS_CENT_GENERAL]"] += list( + /obj/item/clothing/under/rank/nanotrasen_consultant/stripper + ) + access_lists["[ACCESS_COMMAND]"] += list( + /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper + ) diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/wings.dm b/modular_zubbers/code/modules/customization/sprite_accessories/wings.dm new file mode 100644 index 00000000000..57b66cfa5fa --- /dev/null +++ b/modular_zubbers/code/modules/customization/sprite_accessories/wings.dm @@ -0,0 +1,7 @@ +/datum/sprite_accessory/wings/mammal/owl + name = "owl" + icon = 'modular_zubbers/icons/mob/sprite_accesory/wings.dmi' + icon_state = "owl" + dimension_x = 32 + dimension_y = 32 + color_src = USE_MATRIXED_COLORS diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm index b54a1ce6bf9..2e98d7f59ea 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -6,6 +6,14 @@ name = "Pinwheel hat" item_path = /obj/item/clothing/head/helmet/toggleable/pinwheel +/datum/loadout_item/head/pinwheel_hat/gold //sprites by Keila. + name = "magnificent pinwheel hat" + item_path = /obj/item/clothing/head/helmet/toggleable/pinwheel/gold + ckeywhitelist = list("malice69", "miniusAreas", "gavla", "hydrosatan", "nevimer", "naruga", "OmegaTracing", "KeRSe", "CprlEvergreen", "RiskyBusiness", "Slouista", "SapphoQueer", "LordGingy", "ARandomHyena", "LiuJr", "jamiemundy", "snajper202", "snaffle15", "sonicgotnuked", "fellis", "laetex") +//11/08/23: Added as a reward to people who have recommended friends to Bubberstation. Add to this list as you please, you can offer this as a reward for basically anything. +//Please mark the date and what this was awarded for in code comments here. For example: +//XX/XX/XX: Added as a reward for EXAMPLE EVENT's winners. + /datum/loadout_item/head/alien_fake name = "Kabrus Utility Helmet" item_path = /obj/item/clothing/head/helmet/abductor/fake diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_inhands.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_inhands.dm new file mode 100644 index 00000000000..9b0a1dc5dcf --- /dev/null +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_inhands.dm @@ -0,0 +1,9 @@ +/datum/loadout_item/inhand/unioncard //sprites by Scuhf_ + name = "worker's union card" + item_path = /obj/item/card/cardboard/unioncard + donator_only = TRUE //donator item for arandomhyena + +/datum/loadout_item/inhand/korvenbank //sprites by Keila + name = "korven bank card" + item_path = /obj/item/card/cardboard/korvenbank + ckeywhitelist = list("catmanpop") //donator item for catmanpop diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm new file mode 100644 index 00000000000..67c6c90988b --- /dev/null +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm @@ -0,0 +1,8 @@ +/datum/loadout_item/pocket_items/wine //Beer is already available, so why not wine? Stay classy while drinking on the job. + name = "wine bottle" + item_path = /obj/item/reagent_containers/cup/glass/bottle/wine + +/datum/loadout_item/pocket_items/starwine //sprites by Keila + name = "swtarwire wine bottle" + item_path = /obj/item/reagent_containers/cup/glass/bottle/beer/starwine + ckeywhitelist = list("catmanpop") //donator item for Catmanpop diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm index fce38bd56c8..db6ad3947a2 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm @@ -2,3 +2,8 @@ name = "Elegant Heels" item_path = /obj/item/clothing/shoes/heels/drag/lace ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/shoes/glow + name = "glow shoes" + item_path = /obj/item/clothing/shoes/glow + diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm index cc61c861b10..2d6a5d4be87 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -30,3 +30,13 @@ item_path = /obj/item/clothing/suit/armor/vest/collared_vest restricted_roles = list(JOB_NT_REP, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_BLUESHIELD) donator_only = TRUE //Dono item for offwrldr + +/datum/loadout_item/suit/highvisjacket //sprites by Keila + name = "high vis trucker jacket" + item_path = /obj/item/clothing/suit/jacket/trucker/highvis + donator_only = TRUE //Donator item for arandomhyena + +/datum/loadout_item/suit/roninjacket //sprites by Keila + name = "ronin jacket" + item_path = /obj/item/clothing/suit/jacket/trucker/ronin + donator_only = TRUE //Donator item for arandomhyena diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm index a7a547ca6e1..8256898d3a8 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm @@ -4,15 +4,34 @@ donator_only = TRUE //Donor item for Basicguy20 /datum/loadout_item/toys/chirp_plush - name = "Chirpy Synth Plushie" + name = "chirpy synth plushie" item_path = /obj/item/toy/plush/chirp_plush donator_only = TRUE //Donor item for potatomedic. /datum/loadout_item/toys/bigdeer_plush - name = "Big Deer Plushie" - item_path = /obj/item/toy/plush/bigdeer_plush //Donor item for Gavla + name = "big deer plushie" + item_path = /obj/item/toy/plush/bigdeer_plush //Donor item for Gavla /datum/loadout_item/toys/nobl_plush - name = "Fluffy Skog plushie" + name = "fluffy skog plushie" item_path = /obj/item/toy/plush/nobl ckeywhitelist = list("nobledreameater") + +/datum/loadout_item/toys/bubbledragon + name = "bubbledragon plushie" + item_path = /obj/item/toy/plush/bubbledragon + donator_only = TRUE + +/datum/loadout_item/toys/headcrab + name = "headcrab plushie" + item_path = /obj/item/toy/plush/headcrab + donator_only = TRUE + +/datum/loadout_item/toys/Bellybird + name = "belly bird plushie" + item_path = /obj/item/toy/plush/bellybird + donator_only = TRUE + +/datum/loadout_item/toys/tiredtesh + name = "tired teshari plushie" + item_path = /obj/item/toy/plush/tiredtesh diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm index 0a3807ddfa1..b757559234e 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm @@ -1,19 +1,19 @@ -/datum/loadout_item/under/syndicate/skyrat/tactical - name = "tactical turtleneck" - item_path = /obj/item/clothing/under/syndicate/skyrat/tactical - donator_only = TRUE - -/datum/loadout_item/under/syndicate/skyrat/tactical/skirt - name = "tactical skirtleneck" - item_path = /obj/item/clothing/under/syndicate/skyrat/tactical/skirt - donator_only = TRUE - -/datum/loadout_item/under/rank/security/officer/hecu - name = "Urban camouflage BDU" +/datum/loadout_item/under/jumpsuit/security/hecu + name = "urban camouflage BDU" item_path = /obj/item/clothing/under/rank/security/officer/hecu donator_only = TRUE restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) +/datum/loadout_item/under/miscellaneous/command/stripper //Sprites by SierraGenevese + name = "command stripper uniform" + item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper + restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL) + +/datum/loadout_item/under/miscellaneous/nanotrasen_consultant/stripper //Sprites by SierraGenevese + name = "consultant stripper uniform" + item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/stripper + restricted_roles = list(JOB_NT_REP) + /datum/loadout_item/under/formal/lace_dress name = "Lilac Dress" item_path = /obj/item/clothing/under/rank/lace @@ -29,3 +29,6 @@ item_path = /obj/item/clothing/under/misc/maid/tactical donator_only = TRUE +/datum/loadout_item/under/miscellaneous/mech_suit + name = "mech pilot's suit" + item_path = /obj/item/clothing/under/costume/mech_suit diff --git a/modular_zubbers/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/modular_zubbers/code/modules/reagents/reagent_containers/cups/glassbottle.dm new file mode 100644 index 00000000000..95614938943 --- /dev/null +++ b/modular_zubbers/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -0,0 +1,7 @@ +/obj/item/reagent_containers/cup/glass/bottle/beer/starwine + name = "starwire wine bottle" + desc = "A fusion of cheap wine, liquefied candy and stimulants that will give you a kickstart." + icon = 'modular_zubbers/icons/obj/drinks/bottles.dmi' + icon_state = "wine" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/wine = 30) diff --git a/modular_zubbers/code/modules/surgery/tools.dm b/modular_zubbers/code/modules/surgery/tools.dm new file mode 100644 index 00000000000..903ba9fc121 --- /dev/null +++ b/modular_zubbers/code/modules/surgery/tools.dm @@ -0,0 +1,80 @@ +/obj/item/scalpel + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "scalpel", + ), + ) + +/obj/item/circular_saw + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "saw", + ), + ) + +/obj/item/surgical_drapes + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "drapes", + ), + ) + +/obj/item/retractor + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "retractor", + ), + ) + +/obj/item/hemostat + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "hemostat", + ), + ) + +/obj/item/cautery + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "cautery", + ), + ) + +/obj/item/blood_filter + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "bloodfilter", + ), + ) + +/obj/item/surgicaldrill + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "drill", + ), + ) + +/obj/item/bonesetter + uses_advanced_reskins = TRUE + unique_reskin = list( + "korve" = list( + RESKIN_ICON = 'modular_zubbers/icons/obj/medical/surgery_tools.dmi', + RESKIN_ICON_STATE = "bonesetter", + ), + ) diff --git a/modular_zubbers/icons/mob/clothing/back/backpack.dmi b/modular_zubbers/icons/mob/clothing/back/backpack.dmi new file mode 100644 index 00000000000..ab0c7905c63 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/back/backpack.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/backpack.dmi b/modular_zubbers/icons/mob/clothing/backpack.dmi new file mode 100644 index 00000000000..ab0c7905c63 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/backpack.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/hats.dmi b/modular_zubbers/icons/mob/clothing/head/hats.dmi index 46dd54c0cf2..8062a67fc71 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/hats.dmi and b/modular_zubbers/icons/mob/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi new file mode 100644 index 00000000000..766f4555290 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/runnerjacketdono.dmi b/modular_zubbers/icons/mob/clothing/suits/runnerjacketdono.dmi deleted file mode 100644 index d634dc1247a..00000000000 Binary files a/modular_zubbers/icons/mob/clothing/suits/runnerjacketdono.dmi and /dev/null differ diff --git a/modular_zubbers/icons/mob/clothing/under/captain.dmi b/modular_zubbers/icons/mob/clothing/under/captain.dmi new file mode 100644 index 00000000000..941c3433e77 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/captain.dmi differ diff --git a/modular_zubbers/icons/mob/inhands/equipment/backpack_lefthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/backpack_lefthand.dmi new file mode 100644 index 00000000000..fbf870c3da5 Binary files /dev/null and b/modular_zubbers/icons/mob/inhands/equipment/backpack_lefthand.dmi differ diff --git a/modular_zubbers/icons/mob/inhands/equipment/backpack_righthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/backpack_righthand.dmi new file mode 100644 index 00000000000..62fb831fc6e Binary files /dev/null and b/modular_zubbers/icons/mob/inhands/equipment/backpack_righthand.dmi differ diff --git a/modular_zubbers/icons/mob/inhands/equipment/idcards_lefthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/idcards_lefthand.dmi new file mode 100644 index 00000000000..63ca162220a Binary files /dev/null and b/modular_zubbers/icons/mob/inhands/equipment/idcards_lefthand.dmi differ diff --git a/modular_zubbers/icons/mob/inhands/equipment/idcards_righthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/idcards_righthand.dmi new file mode 100644 index 00000000000..c7d9965e921 Binary files /dev/null and b/modular_zubbers/icons/mob/inhands/equipment/idcards_righthand.dmi differ diff --git a/modular_zubbers/icons/mob/sprite_accesory/wings.dmi b/modular_zubbers/icons/mob/sprite_accesory/wings.dmi index 9e9eaf63bb8..61d3e4e6222 100644 Binary files a/modular_zubbers/icons/mob/sprite_accesory/wings.dmi and b/modular_zubbers/icons/mob/sprite_accesory/wings.dmi differ diff --git a/modular_zubbers/icons/obj/card.dmi b/modular_zubbers/icons/obj/card.dmi new file mode 100644 index 00000000000..623b71e7301 Binary files /dev/null and b/modular_zubbers/icons/obj/card.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/head/hats.dmi b/modular_zubbers/icons/obj/clothing/head/hats.dmi index 51c8e358397..411a9eac3ab 100644 Binary files a/modular_zubbers/icons/obj/clothing/head/hats.dmi and b/modular_zubbers/icons/obj/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/jacket.dmi b/modular_zubbers/icons/obj/clothing/jacket.dmi new file mode 100644 index 00000000000..a46312bb49e Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/jacket.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi b/modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi deleted file mode 100644 index af2b6015c37..00000000000 Binary files a/modular_zubbers/icons/obj/clothing/runnerjacketdono.dmi and /dev/null differ diff --git a/modular_zubbers/icons/obj/clothing/under/captain.dmi b/modular_zubbers/icons/obj/clothing/under/captain.dmi new file mode 100644 index 00000000000..941c3433e77 Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/under/captain.dmi differ diff --git a/modular_zubbers/icons/obj/drinks/bottles.dmi b/modular_zubbers/icons/obj/drinks/bottles.dmi new file mode 100644 index 00000000000..15fb2fb37aa Binary files /dev/null and b/modular_zubbers/icons/obj/drinks/bottles.dmi differ diff --git a/modular_zubbers/icons/obj/medical/surgery_tools.dmi b/modular_zubbers/icons/obj/medical/surgery_tools.dmi new file mode 100644 index 00000000000..293485daa19 Binary files /dev/null and b/modular_zubbers/icons/obj/medical/surgery_tools.dmi differ diff --git a/modular_zubbers/icons/obj/storage/backpack.dmi b/modular_zubbers/icons/obj/storage/backpack.dmi new file mode 100644 index 00000000000..8dfef124b17 Binary files /dev/null and b/modular_zubbers/icons/obj/storage/backpack.dmi differ diff --git a/modular_zubbers/icons/obj/toys/plushes.dmi b/modular_zubbers/icons/obj/toys/plushes.dmi index c6cd5b1d166..b917b2d9567 100644 Binary files a/modular_zubbers/icons/obj/toys/plushes.dmi and b/modular_zubbers/icons/obj/toys/plushes.dmi differ diff --git a/modular_zubbers/modules/clothing/head/helmet.dm b/modular_zubbers/modules/clothing/head/helmet.dm index 7bc27fee785..3c732df08b6 100644 --- a/modular_zubbers/modules/clothing/head/helmet.dm +++ b/modular_zubbers/modules/clothing/head/helmet.dm @@ -22,3 +22,8 @@ return FALSE COOLDOWN_START(src, pinwheel_toggle_cooldown, 1 SECONDS) return TRUE + +/obj/item/clothing/head/helmet/toggleable/pinwheel/gold + name = "magnificent pinwheel hat" + desc = "The strongest possible pinwheel pinwheel hat. Such is fate that the silliest things in the world are also the most beautiful; others may not see the shine in you, but the magnificent pinwheel hat does. It appreciates you for who you are and what you've done. It feels alive, and makes you feel alive too. You see the totality of existence reflected in the golden shimmer of the pin." //Does literally nothing more than the regular pinwheel hat. Just for emphasis. + icon_state = "pinwheel_gold" diff --git a/tgstation.dme b/tgstation.dme index db86ceaf1bc..94f818043c8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7872,6 +7872,7 @@ #include "modular_zubbers\code\game\gamemodes\objectives\gimmick.dm" #include "modular_zubbers\code\game\gamemodes\objectives\overrides.dm" #include "modular_zubbers\code\game\Items\plushes.dm" +#include "modular_zubbers\code\game\Items\storage\backpack.dm" #include "modular_zubbers\code\game\machinery\crew_monitor.dm" #include "modular_zubbers\code\game\machinery\morgue.dm" #include "modular_zubbers\code\game\machinery\burger_reactor\reactor.dm" @@ -7906,6 +7907,7 @@ #include "modular_zubbers\code\game\objects\effects\spawners\random\armory.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\burgerstation_random.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\vending.dm" +#include "modular_zubbers\code\game\objects\items\cards_ids.dm" #include "modular_zubbers\code\game\objects\items\holy_weapons.dm" #include "modular_zubbers\code\game\objects\items\plushes.dm" #include "modular_zubbers\code\game\objects\items\reshirevolver.dm" @@ -7919,6 +7921,7 @@ #include "modular_zubbers\code\game\objects\items\robot\items\hypo.dm" #include "modular_zubbers\code\game\objects\items\robot\items\storage.dm" #include "modular_zubbers\code\game\objects\items\robot\robot_upgrades\adv_plasmacutter_upgrade.dm" +#include "modular_zubbers\code\game\objects\items\stacks\medical.dm" #include "modular_zubbers\code\game\objects\items\storage\boxes.dm" #include "modular_zubbers\code\game\objects\items\storage\guncases.dm" #include "modular_zubbers\code\game\objects\structures\trash_pile.dm" @@ -7955,6 +7958,8 @@ #include "modular_zubbers\code\modules\clothing\suits\armor.dm" #include "modular_zubbers\code\modules\clothing\suits\jacket.dm" #include "modular_zubbers\code\modules\clothing\under\syndicate.dm" +#include "modular_zubbers\code\modules\clothing\under\jobs\command.dm" +#include "modular_zubbers\code\modules\command_vendor\vending.dm" #include "modular_zubbers\code\modules\contractor\code\items\boxes.dm" #include "modular_zubbers\code\modules\customization\modules\clothing\under\security.dm" #include "modular_zubbers\code\modules\customization\modules\jobs\_job.dm" @@ -7965,6 +7970,7 @@ #include "modular_zubbers\code\modules\customization\sprite_accessories\snouts.dm" #include "modular_zubbers\code\modules\customization\sprite_accessories\tails.dm" #include "modular_zubbers\code\modules\customization\sprite_accessories\taurs.dm" +#include "modular_zubbers\code\modules\customization\sprite_accessories\wings.dm" #include "modular_zubbers\code\modules\debug_tools\debug_items.dm" #include "modular_zubbers\code\modules\debug_tools\debug_machinery.dm" #include "modular_zubbers\code\modules\debug_tools\physgun.dm" @@ -7996,7 +8002,9 @@ #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_glasses.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_gloves.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_heads.dm" +#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_inhands.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_neck.dm" +#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_pocket.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_shoes.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_suit.dm" #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_toys.dm" @@ -8035,6 +8043,7 @@ #include "modular_zubbers\code\modules\protected_roles\code\antag_restricted_jobs.dm" #include "modular_zubbers\code\modules\reagents\drink_reagents.dm" #include "modular_zubbers\code\modules\reagents\reagent_containers\condiment.dm" +#include "modular_zubbers\code\modules\reagents\reagent_containers\cups\glassbottle.dm" #include "modular_zubbers\code\modules\research\designs\comp_board_designs.dm" #include "modular_zubbers\code\modules\research\designs\machine_board_designs.dm" #include "modular_zubbers\code\modules\research\designs\mechfab_designs.dm" @@ -8045,6 +8054,7 @@ #include "modular_zubbers\code\modules\security_levels\security_level_datums.dm" #include "modular_zubbers\code\modules\status_indicators\status_indicator.dm" #include "modular_zubbers\code\modules\status_indicators\status_indicator_pref.dm" +#include "modular_zubbers\code\modules\surgery\tools.dm" #include "modular_zubbers\code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm" #include "modular_zubbers\code\modules\surgery\organs\internal\lungs\_lungs.dm" #include "modular_zubbers\code\modules\synths\code\bodyparts\brain.dm"