diff --git a/modular_doppler/deforest_medical_items/code/cargo_packs.dm b/modular_doppler/deforest_medical_items/code/cargo_packs.dm index 5dced06ad9d9e..5904f201097f5 100644 --- a/modular_doppler/deforest_medical_items/code/cargo_packs.dm +++ b/modular_doppler/deforest_medical_items/code/cargo_packs.dm @@ -29,34 +29,15 @@ /obj/item/storage/medkit/combat_surgeon/stocked = 3, ) -/datum/supply_pack/medical/kit_technician - name = "Heavy Duty Medical Kit Crate - Technician" - crate_name = "technician kit crate" - desc = "Contains a pink medical technician kit." - access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 5.5 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, - ) - -/datum/supply_pack/medical/kit_surgical - name = "Heavy Duty Medical Kit Crate - Surgical" - crate_name = "surgical kit crate" - desc = "Contains a grey first responder surgical kit." - access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 5 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, - ) - /datum/supply_pack/medical/kit_medical - name = "Heavy Duty Medical Kit Crate - Medical" + name = "Heavy Duty Medical Kit Crate" crate_name = "medical kit crate" - desc = "Contains an orange satchel medical kit." + desc = "Contains two heavy-duty medical kits for emergencies." access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 4.5 + cost = CARGO_CRATE_VALUE * 11 contains = list( /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, + /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, ) /datum/supply_pack/medical/deforest_vendor_refill diff --git a/modular_doppler/deforest_medical_items/code/illegal_injectors.dm b/modular_doppler/deforest_medical_items/code/illegal_injectors.dm index 7c3059f5d976e..981e9dc2532bf 100644 --- a/modular_doppler/deforest_medical_items/code/illegal_injectors.dm +++ b/modular_doppler/deforest_medical_items/code/illegal_injectors.dm @@ -1,18 +1,3 @@ -// Twitch, because having sandevistans be implants is for losers, just inject it! -/obj/item/reagent_containers/hypospray/medipen/deforest/twitch - name = "TWitch sensory stimulant injector" - desc = "A Deforest branded autoinjector, loaded with 'TWitch' among other reagents. This drug is known to make \ - those who take it 'see faster', whatever that means." - base_icon_state = "twitch" - icon_state = "twitch" - list_reagents = list( - /datum/reagent/drug/twitch = 10, - /datum/reagent/drug/maint/tar = 5, - /datum/reagent/medicine/silibinin = 5, - /datum/reagent/toxin/leadacetate = 5, - ) - custom_price = PAYCHECK_COMMAND * 3.5 - // Demoneye, for when you feel the need to become "fucking invincible" /obj/item/reagent_containers/hypospray/medipen/deforest/demoneye name = "DemonEye steroid injector" @@ -54,7 +39,7 @@ /datum/reagent/medicine/c2/penthrite = 5, /datum/reagent/medicine/polypyr = 5, /datum/reagent/medicine/silibinin = 5, - /datum/reagent/medicine/omnizine = 5, + /datum/reagent/medicine/omnizine = 10, /datum/reagent/inverse/healing/tirimol = 5, ) custom_price = PAYCHECK_COMMAND * 2.5 diff --git a/modular_doppler/deforest_medical_items/code/injectors.dm b/modular_doppler/deforest_medical_items/code/injectors.dm index 02558b52bb102..27ab2969f9d45 100644 --- a/modular_doppler/deforest_medical_items/code/injectors.dm +++ b/modular_doppler/deforest_medical_items/code/injectors.dm @@ -77,7 +77,7 @@ /datum/reagent/medicine/synaptizine = 5, /datum/reagent/medicine/inaprovaline = 5, /datum/reagent/determination = 10, - /datum/reagent/toxin/histamine = 5, + /datum/reagent/toxin/lipolicide = 5, ) // Morpital, heals a small amount of damage and kills pain for a bit @@ -87,9 +87,9 @@ base_icon_state = "morpital" icon_state = "morpital" list_reagents = list( - /datum/reagent/medicine/morphine = 5, - /datum/reagent/medicine/omnizine/protozine = 15, - /datum/reagent/toxin/staminatoxin = 5, + /datum/reagent/medicine/mine_salve = 5, + /datum/reagent/medicine/omnizine = 15, + /datum/reagent/toxin/lipolicide = 5, ) // Lipital, heals more damage than morpital but doesnt work much at higher damages @@ -102,7 +102,7 @@ list_reagents = list( /datum/reagent/medicine/lidocaine = 5, /datum/reagent/medicine/omnizine = 5, - /datum/reagent/medicine/c2/probital = 10, + /datum/reagent/medicine/c2/libital = 10, ) // Anti-poisoning injector, with a little bit of radiation healing as a treat @@ -115,7 +115,7 @@ list_reagents = list( /datum/reagent/medicine/c2/multiver = 10, /datum/reagent/medicine/potass_iodide = 10, - /datum/reagent/nitrous_oxide = 5, + /datum/reagent/toxin/lipolicide = 5, ) // Epinephrine and helps a little bit against stuns and stamina damage @@ -141,7 +141,7 @@ /datum/reagent/medicine/atropine = 10, /datum/reagent/medicine/coagulant/fabricated = 5, /datum/reagent/medicine/salbutamol = 5, - /datum/reagent/toxin/staminatoxin = 5, + /datum/reagent/toxin/lipolicide = 5, ) // Coagulant, really not a whole lot more @@ -180,7 +180,7 @@ /datum/reagent/medicine/mine_salve = 5, /datum/reagent/medicine/leporazine = 5, /datum/reagent/medicine/c2/lenturi = 10, - /datum/reagent/toxin/staminatoxin = 5, + /datum/reagent/toxin/lipolicide = 5, ) // Stabilizes a lot of stats like drowsiness, sanity, dizziness, so on diff --git a/modular_doppler/deforest_medical_items/code/medstation.dm b/modular_doppler/deforest_medical_items/code/medstation.dm deleted file mode 100644 index 019cc57320d9e..0000000000000 --- a/modular_doppler/deforest_medical_items/code/medstation.dm +++ /dev/null @@ -1,55 +0,0 @@ -/obj/machinery/biogenerator/medstation - name = "wall med-station" - desc = "An advanced machine seen in frontier outposts and colonies capable of turning organic plant matter into \ - various emergency medical supplies and injectors. You can find one of these in the medical sections of just about \ - any frontier installation." - icon = 'modular_doppler/deforest_medical_items/icons/medstation.dmi' - circuit = null - anchored = TRUE - density = FALSE - efficiency = 1 - productivity = 1 - show_categories = list( - RND_CATEGORY_DEFOREST_MEDICAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - /// The item we turn into when repacked - var/repacked_type = /obj/item/wallframe/frontier_medstation - -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/biogenerator/medstation, 29) - -/obj/machinery/biogenerator/medstation/RefreshParts() - . = ..() - efficiency = 1 - productivity = 1 - -/obj/machinery/biogenerator/medstation/default_unfasten_wrench(mob/user, obj/item/wrench/tool, time) - user.balloon_alert(user, "deconstructing...") - tool.play_tool_sound(src) - if(tool.use_tool(src, user, 1 SECONDS)) - playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) - deconstruct(TRUE) - return - -/obj/machinery/biogenerator/medstation/on_deconstruction(disassembled) - if(disassembled) - new repacked_type(drop_location()) - -/obj/machinery/biogenerator/medstation/default_deconstruction_crowbar() - return - -// Deployable item for cargo for the medstation - -/obj/item/wallframe/frontier_medstation - name = "unmounted wall med-station" - desc = "The innovative technology of a biogenerator to print medical supplies, but able to be mounted neatly on a wall out of the way." - icon = 'modular_doppler/deforest_medical_items/icons/medstation.dmi' - icon_state = "biogenerator_parts" - w_class = WEIGHT_CLASS_NORMAL - result_path = /obj/machinery/biogenerator/medstation - pixel_shift = 29 - custom_materials = list( - /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, - /datum/material/silver = SHEET_MATERIAL_AMOUNT * 3, - /datum/material/gold = SHEET_MATERIAL_AMOUNT, - ) diff --git a/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm b/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm deleted file mode 100644 index 0d523d14f4fa7..0000000000000 --- a/modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm +++ /dev/null @@ -1,131 +0,0 @@ -/datum/design/organic_bloodbag_aplus - name = "A+ Blood Pack" - id = "organic_bloodbag_aplus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/a_plus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_aminus - name = "A- Blood Pack" - id = "organic_bloodbag_aminus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/a_minus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_bplus - name = "B+ Blood Pack" - id = "organic_bloodbag_bplus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/b_plus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_bminus - name = "B- Blood Pack" - id = "organic_bloodbag_bminus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/b_minus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_oplus - name = "O+ Blood Pack" - id = "organic_bloodbag_oplus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/o_plus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_ominus - name = "O- Blood Pack" - id = "organic_bloodbag_ominus" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 150) - build_path = /obj/item/reagent_containers/blood/o_minus - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_lizard - name = "L Blood Pack" - id = "organic_bloodbag_lizard" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/lizard - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_ethereal - name = "LE Blood Pack" - id = "organic_bloodbag_ethereal" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/ethereal - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_plant - name = "H2O Blood Pack" - id = "organic_bloodbag_plant" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 50) - build_path = /obj/item/reagent_containers/blood/podperson - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_slimeperson - name = "TOX Blood Pack" - id = "organic_bloodbag_slimeperson" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/toxin - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_robot - name = "R Blood Pack" - id = "organic_bloodbag_robot" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/robot - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) - -/datum/design/organic_bloodbag_bug - name = "I Blood Pack" - id = "organic_bloodbag_bug" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/reagent_containers/blood/bug - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_BLOOD, - ) diff --git a/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm b/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm deleted file mode 100644 index 7eb8106e3a4e4..0000000000000 --- a/modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm +++ /dev/null @@ -1,98 +0,0 @@ -/datum/design/organic_printer_balm - name = "Red Sun Balm" - id = "organic_sun_balm" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 50) - build_path = /obj/item/stack/medical/ointment/red_sun - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_gauze - name = "Sealed Aseptic Guaze" - id = "organic_gauze" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 50) - build_path = /obj/item/stack/medical/gauze/sterilized - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_coagulant_f - name = "Coagulant-F Packet" - id = "organic_coagulant_pack" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 50) - build_path = /obj/item/stack/medical/suture/coagulant - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_ointment - name = "Ointment" - id = "organic_ointment" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 25) - build_path = /obj/item/stack/medical/ointment - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_bruise_pack - name = "Bruise Packs" - id = "organic_bruise_packs" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 25) - build_path = /obj/item/stack/medical/bruise_pack - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_amollin_pill - name = "Amollin Painkiller" - id = "organic_printer_amollin_pill" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 25) - build_path = /obj/item/reagent_containers/pill/amollin - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_bandaid - name = "First Aid Bandage" - id = "organic_bandaid" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/stack/medical/bandage - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_bone_gel - name = "Bone Gel" - id = "organic_bone_gel" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/stack/medical/bone_gel - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) - -/datum/design/organic_printer_surgical_tape - name = "Surgical Tape" - id = "organic_surgical_tape" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 100) - build_path = /obj/item/stack/sticky_tape/surgical - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_DEFOREST_MEDICAL, - ) diff --git a/modular_doppler/deforest_medical_items/code/storage_items.dm b/modular_doppler/deforest_medical_items/code/storage_items.dm index 4380b66587921..bff050345dea5 100644 --- a/modular_doppler/deforest_medical_items/code/storage_items.dm +++ b/modular_doppler/deforest_medical_items/code/storage_items.dm @@ -393,104 +393,3 @@ /obj/item/bodybag, /obj/item/storage/hypospraykit, )) - -// Midrange bag for paramedics, hypospray and more flexible item wise than surgical, but restricted to small items only -/obj/item/storage/backpack/duffelbag/deforest_paramedic - name = "medical technician kit" - desc = "Compared to its sibling the first responder surgical kit, this variant is equipped with a hypospray hit for roving paramedics. Featuring rapid access pockets that are lightweight, it can however only hold smaller items." - icon = 'modular_doppler/deforest_medical_items/icons/storage.dmi' - icon_state = "technician" - lefthand_file = 'modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi' - righthand_file = 'modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi' - inhand_icon_state = "technician" - worn_icon = 'modular_doppler/deforest_medical_items/icons/worn/worn.dmi' -// worn_icon_teshari = 'modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi' - equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' - drop_sound = 'sound/items/handling/cloth_drop.ogg' - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT - storage_type = /datum/storage/duffel/deforest_paramedic - zip_slowdown = 0.3 // Midrange between the other two bags - unzip_duration = 1.2 SECONDS - -/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked - -/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked/PopulateContents() - var/static/items_inside = list( - /obj/item/scalpel = 1, - /obj/item/hemostat = 1, - /obj/item/retractor = 1, - /obj/item/circular_saw = 1, - /obj/item/bonesetter = 1, - /obj/item/cautery = 1, - /obj/item/surgical_drapes = 1, - /obj/item/stack/medical/bone_gel = 1, - /obj/item/stack/medical/wound_recovery = 1, - /obj/item/stack/medical/wound_recovery/rapid_coagulant = 1, - /obj/item/stack/medical/mesh/advanced = 2, - /obj/item/stack/medical/suture/medicated = 2, - /obj/item/stack/medical/gauze/sterilized = 1, - /obj/item/storage/pill_bottle/painkiller = 1, - /obj/item/hypospray/mkii/piercing/atropine = 1, - /obj/item/reagent_containers/cup/hypovial/small/libital = 1, - /obj/item/reagent_containers/cup/hypovial/small/lenturi = 1, - /obj/item/reagent_containers/cup/hypovial/small/seiver = 1, - /obj/item/healthanalyzer = 1, - ) - generate_items_inside(items_inside,src) - -/datum/storage/duffel/deforest_paramedic - max_specific_storage = WEIGHT_CLASS_SMALL - max_total_storage = 21 * WEIGHT_CLASS_SMALL - max_slots = 21 - -/datum/storage/duffel/deforest_paramedic/New() - . = ..() - - can_hold = typecacheof(list( - /obj/item/bonesetter, - /obj/item/cautery, - /obj/item/circular_saw, - /obj/item/clothing/neck/stethoscope, - /obj/item/clothing/mask/breath, - /obj/item/clothing/mask/muzzle, - /obj/item/clothing/mask/surgical, - /obj/item/clothing/suit/toggle/labcoat/hospitalgown, - /obj/item/dnainjector, - /obj/item/extinguisher/mini, - /obj/item/flashlight/pen, - /obj/item/geiger_counter, - /obj/item/healthanalyzer, - /obj/item/hemostat, - /obj/item/holosign_creator/medical, - /obj/item/hypospray, - /obj/item/implant, - /obj/item/implantcase, - /obj/item/implanter, - /obj/item/lazarus_injector, - /obj/item/lighter, - /obj/item/pinpointer/crew, - /obj/item/reagent_containers/blood, - /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/cup/beaker, - /obj/item/reagent_containers/cup/bottle, - /obj/item/reagent_containers/cup/hypovial, - /obj/item/reagent_containers/cup/tube, - /obj/item/reagent_containers/hypospray, - /obj/item/reagent_containers/medigel, - /obj/item/reagent_containers/pill, - /obj/item/reagent_containers/spray, - /obj/item/reagent_containers/syringe, - /obj/item/retractor, - /obj/item/scalpel, - /obj/item/surgical_drapes, - /obj/item/stack/medical, - /obj/item/stack/sticky_tape, - /obj/item/sensor_device, - /obj/item/storage/fancy/cigarettes, - /obj/item/storage/pill_bottle, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/storage/box/bandages, - /obj/item/bodybag, - /obj/item/storage/hypospraykit, - )) diff --git a/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm b/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm index 78a9a0dd7dc7b..0ecdefeb3f81e 100644 --- a/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm +++ b/modular_doppler/deforest_medical_items/code/treatment_zone_projector.dm @@ -5,7 +5,7 @@ desc = "A massive glowing holosign warning you to keep out of it, there's probably some important stuff happening in there!" icon = 'modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi' icon_state = "treatment_zone" - layer = BELOW_OBJ_LAYER + layer = BOT_PATH_LAYER pixel_x = -32 pixel_y = -32 use_vis_overlay = FALSE diff --git a/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi b/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi index 61e9fb5f7501c..c53eab3ba9d76 100644 Binary files a/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi and b/modular_doppler/deforest_medical_items/icons/inhands/cases_lefthand.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi b/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi index b09d02d258a6c..c5a2099e96b20 100644 Binary files a/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi and b/modular_doppler/deforest_medical_items/icons/inhands/cases_righthand.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/injectors.dmi b/modular_doppler/deforest_medical_items/icons/injectors.dmi index 62db86d583b21..50f4f2c4db8a4 100644 Binary files a/modular_doppler/deforest_medical_items/icons/injectors.dmi and b/modular_doppler/deforest_medical_items/icons/injectors.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/medstation.dmi b/modular_doppler/deforest_medical_items/icons/medstation.dmi deleted file mode 100644 index 2de94bc420a8a..0000000000000 Binary files a/modular_doppler/deforest_medical_items/icons/medstation.dmi and /dev/null differ diff --git a/modular_doppler/deforest_medical_items/icons/storage.dmi b/modular_doppler/deforest_medical_items/icons/storage.dmi index 513aed6e2a1bd..bd4c2f7b0dd0a 100644 Binary files a/modular_doppler/deforest_medical_items/icons/storage.dmi and b/modular_doppler/deforest_medical_items/icons/storage.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi b/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi index 8596bce378d80..5c99df6db6e34 100644 Binary files a/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi and b/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/worn/worn.dmi b/modular_doppler/deforest_medical_items/icons/worn/worn.dmi index 942715fe56a7c..bf394833ef356 100644 Binary files a/modular_doppler/deforest_medical_items/icons/worn/worn.dmi and b/modular_doppler/deforest_medical_items/icons/worn/worn.dmi differ diff --git a/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi b/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi index 276804f908b30..ea7249f36dc4d 100644 Binary files a/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi and b/modular_doppler/deforest_medical_items/icons/worn/worn_teshari.dmi differ diff --git a/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm b/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm index 0ead8a75f6416..cc019598dc927 100644 --- a/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm +++ b/modular_doppler/kahraman_equipment/code/organic_printer_designs/equipment.dm @@ -22,17 +22,6 @@ RND_CATEGORY_AKHTER_EQUIPMENT, ) -/datum/design/frontier_medtech_belt - name = "Medical Technician Kit" - id = "frontier_medtech_belt" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass = 200) - build_path = /obj/item/storage/backpack/duffelbag/deforest_paramedic - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_AKHTER_EQUIPMENT, - ) - /datum/design/frontier_medkit name = "Frontier Medical Kit" id = "frontier_medkit" diff --git a/modular_doppler/loadout_categories/categories/belts.dm b/modular_doppler/loadout_categories/categories/belts.dm index 3f67ccafa4c24..38694c991b551 100644 --- a/modular_doppler/loadout_categories/categories/belts.dm +++ b/modular_doppler/loadout_categories/categories/belts.dm @@ -129,10 +129,6 @@ name = "Frontier Med-kit" item_path = /obj/item/storage/medkit/frontier/stocked -/datum/loadout_item/belts/deforest_paramed - name = "Satchel Tech-kit" - item_path = /obj/item/storage/backpack/duffelbag/deforest_paramedic - /datum/loadout_item/belts/deforest_surgical name = "Firest Responder Med-kit" item_path = /obj/item/storage/backpack/duffelbag/deforest_surgical diff --git a/modular_doppler/deforest_medical_items/code/chemicals/twitch.dm b/modular_doppler/the-business/code/twitch.dm similarity index 80% rename from modular_doppler/deforest_medical_items/code/chemicals/twitch.dm rename to modular_doppler/the-business/code/twitch.dm index 8d6b2ca392c6c..6951f8f07628d 100644 --- a/modular_doppler/deforest_medical_items/code/chemicals/twitch.dm +++ b/modular_doppler/the-business/code/twitch.dm @@ -8,9 +8,6 @@ // Reaction to make twitch, makes 10u from 17u input reagents /datum/chemical_reaction/twitch - results = list( - /datum/reagent/drug/twitch = 10, - ) required_reagents = list( /datum/reagent/impedrezene = 5, /datum/reagent/bluespace = 10, @@ -19,14 +16,36 @@ mob_react = FALSE reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING -// Twitch drug, makes the takers of it faster and able to dodge bullets while in their system, to potentially bad side effects +/datum/chemical_reaction/twitch/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) + var/location = get_turf(holder.my_atom) + for(var/iteration in 1 to created_volume) + var/obj/item/reagent_containers/hypospray/medipen/deforest/twitch/new_injector = new(location) + new_injector.pixel_x = rand(-6, 6) + new_injector.pixel_y = rand(-6, 6) + +// Injector, because it needs to look kickass +/obj/item/reagent_containers/hypospray/medipen/deforest/twitch + name = "T-WITCH vial" + desc = "An almost cartoonish looking glass injector filled with a horribly corrosive green liquid that slowly swirls around. \ + A heavily regulated substance called T-WITCH that is claimed to make the users of it 'see faster'." + icon = 'modular_doppler/the-business/icons/items.dmi' + base_icon_state = "twitch" + icon_state = "twitch" + list_reagents = list( + /datum/reagent/drug/twitch = 10, + /datum/reagent/drug/maint/tar = 5, + /datum/reagent/medicine/silibinin = 5, + /datum/reagent/toxin/leadacetate = 5, + ) + +// T-WITCH, makes the user faster in movement and attacks, they can even dodge projectiles when overdosing on it /datum/reagent/drug/twitch - name = "TWitch" - description = "A drug originally developed by and for plutonians to assist them during raids. \ - Does not see wide use due to the whole reality-disassociation and heart disease thing afterwards. \ - Can be intentionally overdosed to increase the drug's effects" + name = "T-WITCH" + description = "An invention by the drug ~artists~ of Europa, a wicked stimulant that both slow's the user's \ + perception of time and speeds of their actions. This is a recipe for some extreme performance, at heavy \ + cost to the user's health in most cases." reagent_state = LIQUID - color = "#c22a44" + color = "#91db69" taste_description = "television static" metabolization_rate = 0.65 * REAGENTS_METABOLISM ph = 3 @@ -41,7 +60,6 @@ /// How much the mob heating is multiplied by, if the target is a robot or has muscled veins var/mob_heating_muliplier = 5 - /datum/reagent/drug/twitch/on_mob_metabolize(mob/living/our_guy) . = ..() @@ -71,7 +89,6 @@ game_plane_master_controller.add_filter(TWITCH_SCREEN_BLUR, 1, list("type" = "radial_blur", "size" = 0.02)) - /datum/reagent/drug/twitch/on_mob_end_metabolize(mob/living/carbon/our_guy) . = ..() @@ -80,8 +97,6 @@ our_guy.sound_environment_override = NONE - speech_effect_span = "hierophant" - UnregisterSignal(our_guy, COMSIG_MOVABLE_MOVED) UnregisterSignal(our_guy, COMSIG_MOVABLE_HEAR) if(overdosed) @@ -90,13 +105,13 @@ if(constant_dose_time < CONSTANT_DOSE_SAFE_LIMIT) // Anything less than this and you'll come out fiiiine, aside from a big hit of stamina damage if(!(our_guy.mob_biotypes & MOB_ROBOTIC)) our_guy.visible_message( - span_danger("[our_guy] suddenly slows from [our_guy.p_their()] inhuman speeds, coming back with a wicked nosebleed!"), - span_danger("You suddenly slow back to normal, a stream of blood gushing from your nose!") + span_danger("[our_guy] stops dead, [our_guy.p_their()] afterimages quickly catching up to them!"), + span_danger("You suddenly stop dead in your tracks, a stream of blood gushing from your nose!") ) else our_guy.visible_message( - span_danger("[our_guy] suddenly slows from [our_guy.p_their()] inhuman speeds!"), - span_danger("You suddenly slow back to normal speed!") + span_danger("[our_guy] stops dead, [our_guy.p_their()] afterimages quickly catching up to them!"), + span_danger("You suddenly stop dead in your tracks!") ) our_guy.adjustStaminaLoss(constant_dose_time) @@ -105,13 +120,13 @@ our_guy.spray_blood(our_guy.dir, 2) // The before mentioned coughing up blood our_guy.emote("cough") our_guy.visible_message( - span_danger("[our_guy] suddenly snaps back from [our_guy.p_their()] inhuman speeds, coughing up a spray of blood!"), - span_danger("As you snap back to normal speed you cough up a worrying amount of blood. You feel like you've just been run over by a power loader.") + span_danger("[our_guy] stops dead, coughing up a spray of blood!"), + span_danger("As you stop dead in your tracks, you cough up a worrying amount of blood.") ) else our_guy.visible_message( - span_danger("[our_guy] suddenly snaps back from [our_guy.p_their()] inhuman speeds!"), - span_danger("You suddenly snap back to normal speeds. You feel like you've just been run over by a power loader.") + span_danger("[our_guy] stops dead, heat venting from [our_guy.p_their()] body!"), + span_danger("You suddenly stop dead in your tracks, superheated air venting from your body!") ) our_guy.adjustStaminaLoss(constant_dose_time) if(!HAS_TRAIT(our_guy, TRAIT_TWITCH_ADAPTED)) @@ -120,18 +135,18 @@ if(!our_guy.hud_used) return + our_guy.Stun(1 SECONDS) + var/atom/movable/plane_master_controller/game_plane_master_controller = our_guy.hud_used.plane_master_controllers[PLANE_MASTERS_GAME] game_plane_master_controller.remove_filter(TWITCH_SCREEN_FILTER) game_plane_master_controller.remove_filter(TWITCH_SCREEN_BLUR) - /// Leaves an afterimage behind the mob when they move /datum/reagent/drug/twitch/proc/on_movement(mob/living/carbon/our_guy, atom/old_loc) SIGNAL_HANDLER new /obj/effect/temp_visual/decoy/twitch_afterimage(old_loc, our_guy) - /// Tries to dodge incoming bullets if we aren't disabled for any reasons /datum/reagent/drug/twitch/proc/dodge_bullets(mob/living/carbon/human/source, obj/projectile/hitting_projectile, def_zone) SIGNAL_HANDLER @@ -147,7 +162,6 @@ addtimer(CALLBACK(source, TYPE_PROC_REF(/datum, remove_filter), TWITCH_BLUR_EFFECT), 0.5 SECONDS) return COMPONENT_BULLET_PIERCED - /datum/reagent/drug/twitch/on_mob_life(mob/living/carbon/our_guy, seconds_per_tick, times_fired) . = ..() @@ -168,10 +182,11 @@ if(locate(/datum/reagent/drug/kronkaine) in our_guy.reagents.reagent_list) // Kronkaine, another heart-straining drug, could cause problems if mixed with this our_guy.ForceContractDisease(new /datum/disease/adrenal_crisis(), FALSE, TRUE) - /datum/reagent/drug/twitch/overdose_start(mob/living/our_guy) . = ..() + speech_effect_span = "hierophant" + RegisterSignal(our_guy, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(dodge_bullets)) our_guy.next_move_modifier -= 0.2 // Overdosing makes you a liiitle faster but you know has some really bad consequences @@ -186,7 +201,6 @@ for(var/filter in game_plane_master_controller.get_filters(TWITCH_SCREEN_FILTER)) animate(filter, loop = -1, color = col_filter_ourple, time = 4 SECONDS, easing = BOUNCE_EASING) - /datum/reagent/drug/twitch/overdose_process(mob/living/carbon/our_guy, seconds_per_tick, times_fired) . = ..() our_guy.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) @@ -205,9 +219,8 @@ our_guy.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) if(SPT_PROB(5, seconds_per_tick) && !(our_guy.mob_biotypes & MOB_ROBOTIC)) - to_chat(our_guy, span_danger("You cough up a splatter of blood!")) - our_guy.spray_blood(our_guy.dir, 1) - our_guy.emote("cough") + our_guy.playsound_local(our_guy, 'sound/effects/singlebeat.ogg', 100, TRUE) + flash_color(our_guy, flash_color = "#ff0000", flash_time = 3 SECONDS) if(SPT_PROB(10, seconds_per_tick)) our_guy.add_filter(TWITCH_OVERDOSE_BLUR_EFFECT, 2, phase_filter(8)) @@ -218,7 +231,6 @@ SIGNAL_HANDLER hearing_args[HEARING_RAW_MESSAGE] = "[hearing_args[HEARING_RAW_MESSAGE]]" - /// Cool filter that I'm using for some of this :))) /proc/phase_filter(size) . = list("type" = "wave") @@ -226,7 +238,6 @@ if(!isnull(size)) .["size"] = size - // Temp visual that changes color for that bootleg sandevistan effect /obj/effect/temp_visual/decoy/twitch_afterimage duration = 0.75 SECONDS diff --git a/modular_doppler/the-business/icons/items.dmi b/modular_doppler/the-business/icons/items.dmi new file mode 100644 index 0000000000000..805f33631ea88 Binary files /dev/null and b/modular_doppler/the-business/icons/items.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 33508dd702319..3ed800490a5b7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6632,16 +6632,12 @@ #include "modular_doppler\deforest_medical_items\code\healing_stack_items.dm" #include "modular_doppler\deforest_medical_items\code\illegal_injectors.dm" #include "modular_doppler\deforest_medical_items\code\injectors.dm" -#include "modular_doppler\deforest_medical_items\code\medstation.dm" #include "modular_doppler\deforest_medical_items\code\storage_items.dm" #include "modular_doppler\deforest_medical_items\code\storage_items_robotics.dm" #include "modular_doppler\deforest_medical_items\code\synth_healing.dm" #include "modular_doppler\deforest_medical_items\code\treatment_zone_projector.dm" #include "modular_doppler\deforest_medical_items\code\vulnerable_status_effect.dm" #include "modular_doppler\deforest_medical_items\code\chemicals\demoneye.dm" -#include "modular_doppler\deforest_medical_items\code\chemicals\twitch.dm" -#include "modular_doppler\deforest_medical_items\code\medstation_designs\blood.dm" -#include "modular_doppler\deforest_medical_items\code\medstation_designs\medical.dm" #include "modular_doppler\disable_suicide\config_entries.dm" #include "modular_doppler\doppler_command_uniforms\hop\overrides.dm" #include "modular_doppler\dopplerboop\dopplerboops.dm" @@ -7193,6 +7189,7 @@ #include "modular_doppler\stone\code\ore_veins.dm" #include "modular_doppler\stone\code\stone.dm" #include "modular_doppler\tableflip\tableflip.dm" +#include "modular_doppler\the-business\code\twitch.dm" #include "modular_doppler\time_clock\code\console.dm" #include "modular_doppler\time_clock\code\console_tgui.dm" #include "modular_doppler\time_clock\code\mind.dm"