From 031bea85531494e3e54e0c3deba8c73a66955f4b Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Tue, 10 Dec 2024 21:29:21 -0600 Subject: [PATCH] everything --- .../code/cargo_packs.dm | 27 +--- .../code/illegal_injectors.dm | 17 +-- .../deforest_medical_items/code/injectors.dm | 16 +-- .../deforest_medical_items/code/medstation.dm | 55 -------- .../code/medstation_designs/blood.dm | 131 ------------------ .../code/medstation_designs/medical.dm | 98 ------------- .../code/storage_items.dm | 101 -------------- .../code/treatment_zone_projector.dm | 2 +- .../icons/inhands/cases_lefthand.dmi | Bin 979 -> 1371 bytes .../icons/inhands/cases_righthand.dmi | Bin 973 -> 1417 bytes .../icons/injectors.dmi | Bin 3031 -> 2930 bytes .../icons/medstation.dmi | Bin 1400 -> 0 bytes .../deforest_medical_items/icons/storage.dmi | Bin 1602 -> 2746 bytes .../icons/telegraph_96x96.dmi | Bin 791 -> 869 bytes .../icons/worn/worn.dmi | Bin 757 -> 1346 bytes .../icons/worn/worn_teshari.dmi | Bin 736 -> 1227 bytes .../code/organic_printer_designs/equipment.dm | 11 -- .../loadout_categories/categories/belts.dm | 4 - .../chemicals => the-business/code}/twitch.dm | 73 +++++----- modular_doppler/the-business/icons/items.dmi | Bin 0 -> 769 bytes tgstation.dme | 5 +- 21 files changed, 57 insertions(+), 483 deletions(-) delete mode 100644 modular_doppler/deforest_medical_items/code/medstation.dm delete mode 100644 modular_doppler/deforest_medical_items/code/medstation_designs/blood.dm delete mode 100644 modular_doppler/deforest_medical_items/code/medstation_designs/medical.dm delete mode 100644 modular_doppler/deforest_medical_items/icons/medstation.dmi rename modular_doppler/{deforest_medical_items/code/chemicals => the-business/code}/twitch.dm (80%) create mode 100644 modular_doppler/the-business/icons/items.dmi 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 61e9fb5f7501c03a8a9f13e23de0ab232945f8dd..c53eab3ba9d7618be41204437f515e7e4dc611b7 100644 GIT binary patch literal 1371 zcmZuwdo*_^aj^htV|TU zNEtGGUpI#i%R1uFIB@k@bco#h6z8d7rznEkY=bn+3aRK+V+GII9p>QM80T+8aa4m{ zSxN(vBx*-91gJxNsGV0$&9UGa?2#H8nTQ7D1kJYg=s>?KToW@+LrjPr7c{xxpJflbs;-#cwT373OU)#}( zX`aoCENE3#!SFjX_2JfVpI$ha5(ggFdpQh7jy0g8zwTJuk=`_Pc0>&ttxh>xRx&^= zh3R_9d2C4J6GY~((QV~qtzvSLCv&osAYeqr%HLkwTz8RygDuGg-LeTn;QS!RvQ%H0 zal4rXY;EO+H;LBjjwpJ_($uyN-bMA$s3#^*^%bSRNC_t|;K{~?=xySCE{{EHKjFGx zDF?DT4XfD#R`v`1{xB#=d}={nJGHO--VASlF|$nmiA~pc?sE;k-KoTHC%Dt)*ZnU` z=R#=C5|WooLE1GdW_$81sv2aDvRIyblN7Lz7fG}eQSEIS02!@q_a>(qiW$EnF^xJO z3CWR;n1VoUE#Y(WmF2+-cVT@X2`ccwaRG&rQ4&^K~yBe zr>55OV+bsf4C#1~0f?U?YL@!_hNYS6T%)Dgu}T6@OxbN6tZmKwyv(WNx0p={gLf-tI4cA@Q_QpBHv%6lk-&3m#MR|c_WV)%JvvXxQBqxmloi7D#B5e&+2PUvxejM^|8QF=p& z-zIu|F|z*2xa-hVL0FC`HbuSXhlI9(DL6ZKRD1R<8~M7cOBmRYs7VaN(?~|PLyAP{ zX=_2q=FSMUknrRt%dWoFiwofV6KelE3;;-&+;&>|#z&v*N2*g_m0>ehsSMoF#)>oj zm5vyR$d)Fj$MKZujFYARGB@>GD<-4BT5Ko@eSmwe6w7A3Wjx19SNV>;EA%r1l(&0| z<!nkO?XvB8&)ILx)E51l_J#}&0^?~?%(A>ib{{Z4H Br~Lo` delta 970 zcmV;*12z2H3eyLW7k{7#0{{R3yb+fl0001KP)t-s0001tDi6_H8;lQ3=964BG(yoE zTIO7aG(JL9RAE$IVe9Mbii)1X!O3AG6JZlN9v(6tEHcp>SBwuy5)v0WH$LWEgI-%; zBO)k@n4ZDL$zc;Xw|Oy$BrV>yJ*6)x>f3`^8Y({%DM{?d4u1du00DGTPE!Ct=GbNc z005(UR9JLGWpiV4X>fFDZ*Bkpc$|%p%?iRW5QNXkQ-t;|{$0IDi}YY$p@ejsENW7A zw~B9Xss~R}Z!_=>GfZiY^{Hu1b#C+>h%rTTF#FY7s|WTHve|953V=Sy$FNv|EDN^c z0$dBNdL*7>T7L~>Z!qi4mlJRyqC*=OQJzMijwkX!&qaDn$SGp<-34Wl9w0=CH5<1Z$93NS zAs0-fw7?8@@G2|q|0(UoK!#t?-b|7J000000Kh!y__yH6h@Z4|vFmgIy{zyTk<~_8#sx7-)4A<&h7Vo}7TEbZWpa3uFlUDxkK7a>HF2*I~%WRl1xRI-S2%}=}@eknE4Wo_`S80@I*a&^w|lt^D!KHxbz;PuNn!&7>K zc{eGC-Qa&>ypkD#p5ZBx5xU#F-t*nuGdv|S!ocmE(THi{p5ZAi)*Ao-000000ANXx z^S^FS&3^{96dG?$5jX$q`-+;Nb!thA9Ye6i&i^X<2CGhsy}{V|-;NHrTO?rI{7)w! s_TD-pcEA=l{~HE!?`<$J0R&jiADEpuxE-VV8~^|S07*qoM6N<$f-1STHUIzs 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 b09d02d258a6c0716c16863aad2369223e4cead2..c5a2099e96b20641ad115ca750f6dd235578789e 100644 GIT binary patch literal 1417 zcmZWodo&XY7^hs14(>gNvWrXimgsoajEhhn6S66Ws7MjOg?mhRP`knKAzw`Uf_s949o%8+S4slXCq<%wFYvm?9^q0wVF?bw@qstOViUq*qNSu#$}j~CR@ ze%%21nWMzB>M%BjT{Pu5%YlD>-!~m~LVN;PI$1VY7kweFcJ1JuQ?l`=X$+EpOGo@^45*n%*44|#FtM3+o!|z7@ zTGaOHcGLkK@WCTbv+Y!Gr

0E3=1h<*pB-3hht^{&^KCKEw7u7Rk8y6sT8)m4u#` zHwX&E$v4BWmP0_CInt{10&rsP$y69sJEbcoq@5{bEaH+!wX_2F()ku=2XiFW=SChon`Z{*U7tP$74e1iwEOC-eQbd^c@fSfxtk!t;2wqcb(Zqg!wRy)lP)LWg$##S#&W@DU0g1D9$48TmXoR5nVS=sJ}l$11iIiXx@ z2n6`+W4r~@DkU5ukX3cMuc^G7R-ul~-R#s4Uu)#T8e?8Om`g`qNh++4J}Z8WU?UhW z;|~+fVa4e!At5e&LHG4~@?nPY+qQ&;i|{kjYmg#}!vcPL%yntVwWkzbJjzcM*H|P9 zs%r5!$6O&mLnA|*)sBt6?udA|T8+>Aowm=%OF=cB(!CH71_e5ru%)B)Dgpzs)VDWc*Mx zYD5*Mm1X+x>g2pH+PzWeF|4Cuaz=Ur_-)?*={BYllc7$mvSZuVuh+sgqIVjn^lOMc z61}T5j&o=b4LIUYjM}8BWGSw_)C#`bB9NUt86=u3^sxLpz%rGGLDTOZUBG&6rS&_x zZ>tvIZ)8At+$6{)H`WZfhdw=TOvkvY(IZ)|N^?5FG~g@J>N~U|vfFzd@{~RD#s^B~ zcpRQJ8;FY-%4KDcx2sPvb6JFhEr82?MO^dOn8#L$v{$(GYg?YS*-=mnaW@oA2XPJH zgUWE*`A$B+z&9F=Q~0G$!(_fS;)@J@a|48W2Lhr9?!vlHmHAEiSjYbTNB$mpf9e?y zG$oc=9W(7h_~9D{&}gng5x;@Hfh8@(JO^e^$vj;72o?dG8+z{j%+w)z!%y>+zc}(1 zCSv_%sH}QFTam&$IzDkqm@l*(Mj5rQBg(C}j>d5Z(ukM4Zt_*!&CdDjy0^GZqCyu9 z>zMFzAt-`Hun*4@?EJq)O--)Xb-M_$DG`FyR`B0n`R^nt`&p}AuZm#!DeC|StN-Jd zIrv5ZA|sYM2Qys+mF8m}RYt5*yvIW(%v@WNYPcrIcD+hlUT4-i!Hu>2FqC>zzWy;) z5)D-IivjX#t91|@gE!ix9n~Wzj7Mc#8^|9B({$|~lyFo{=$QOEx#Gaph$POlKE}={ zpA=AlGrWvF?Nyv~<=|4Cxb_osBgLn2d)m4e;muzvn*+z1rxk9B#4u5a?e=bZ;zjF- zmPlOn$x&I&?n)84+;QI>5o9j%S6xZpx09(Pk!x)Zb@9d64DV}aM~FkC-L>q002$!B Aes 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 literal 3031 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 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 2de94bc420a8abaf1ecaf54ddc971b2928fac8eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1400 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 ASpWb4 diff --git a/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi b/modular_doppler/deforest_medical_items/icons/telegraph_96x96.dmi index 8596bce378d80b534e875d3c185fd5e5c39016f8..5c99df6db6e342a6244d74af3d63b9b4a1a22189 100644 GIT binary patch delta 719 zcmbQv_LObHqWX27E{-7;bKcH%%)4zM;HrFmwO)0r$O+A+MXT3U_svm%eqz^Zr4yP= zOTu4l+O5PY+G9L#!ltB-f5~6>w(9n4&Xl`!MOe1|uo?XbC5X2&It z==g>s-;aKJEuAD?U9Wh|EBom2R-xIqw$O!^;M4xt&8_6H}`)3mt0uTXYFjRi&&l?$9^F5KvPSCBZG3p1U4NH4zVdL zIvySy7i{+WbEo*KWvND+f?+aqf}_+11;vN}As~6Q$;^i%bA#V`0TniGp(a+&`h!iA z8dy0Gf{gJ58|JiOfl7j-6GThd{^+-cJZq1xtKz*FF+o5_gA+u8ZF&aM0#&^0f9aP? zhi_N^TY6^F7ZX>YwXx5erlsZX=LZ`JGT1;|rDf*=6(Gd|vRIW7Z2iG{Y}WU@W}kD~ zJjuKM`f8vnlf*(|9hJ4SZQ>Ihovz(j$k5lYQ-K%gj%QH43~n0~cvas^Pg>8&?d4Qz z)Mxti_j=8InLjKkakFcAzoz;A6uxe~DZ8P<=-fWD-gTe~DWM4f(NtIY delta 640 zcmaFLHl1z4qWT0+7srr_IdA8_p44Q(bw3iHQ~a-EX^VhZ z)t=nvCqG*I+V6XN&c^rp3jVi`%lhAbuh_S5;xC1B_v9}AJ{Oo?Kkb37OKDsU^HKZ0 z75k>Y3EH{+zV+?naw%KxecQOPs`~x>qaR+s`F8Q&=BKMFfB*2lrdaQFZhP*|(wi-t z-fl9JzkN(nH~ie~_xY9gRQwgV@}_U+c@la5;=Zc?YdY$77Tufog{7iO!MG}ZyIjr` zhY*(fm%onNhMced_TA$L&)#>l*E3kOl`;Kzecj2xc)A7H%yjF_kAD6VF!us6WrH?*9Cf-VWBzO!WpN=_R$seUGwVls*?zVdEBR zV&y#8)YSkYTM`^y4}eG~h_M?K6e9uz|JALiJu>x!F7uzja!wr&4zUmx5DB*HJ(9K$ zZ(lGKa0@lVgzAAteTbVNa1ZPz7LZM%j5zJ{G7!iH+YNF-KzRcj^F}tfWu@#HaOoW> z+JCk@sD56${cml~?RWnZJxu2RzV+|igzf2Hxi%OFy0aV3T5YT4)Kb}hb^iWEndv93 zZ5eGZXmn=Oeck(cbG~iF?%HiJmigzCtbg%dZ*p&3eA?`lxadK>-+%l0?&t&K==h9W z=JjXnn%90;jb7;S=CL;5)>XaAxb1ZCThyOs1VP9(x||? zIM1{!LA};fT?&;zfQZeW4ob%oxfg;D>w}b?A$3%2z z2uC^Y;E3_rlJ#&MM~F8N(td_{I4aOVBO} zaZ%4>PrjeLIKB5=wejy;?>0X8nAs*JmHtzy4%%15FTb1p^|f1K zi!^la>26g$T>tOa?q&`qw)?M_O*&p}^JMBnan>tVn=bKRw~hF|vsH*8;fGRF!~46Z z&ezKFNmZ2`|CBY4sUd3e)vOi&in|M4q$e;>S@>YH|Ar-MDwB@#R$Z*l`F^VFMU3j< z&)nNNj~q;VA;GopSb9zW`r1Irs)$Kb)yo2uvs}+c&Wm5+t8hRqee?08`wNbG{PD_f zaK5&*U^>GhZdL<6qLH5-l>GxbeDs;u)p|JKcBj?QZm*zBtF|l~b*viUZ%1 z?ycgLCv*-xdGh$u_SVYn>yz_KgcitMY5f(j{Ctc=-S2tdo@77K`L$~DYas)>Li33a zj(jXK5n8}^rFmDt{PQtJHBSy6|Lrdy^CC1bddHpF4l+NwryB=)C>(aT-Pg{a^5fIq zHC>9;jZ!A6885aoOk6P4Tj7&Z{fdXpQI$^L7j23toK-!yt)6#^YQXIiIwyj9{w!?U zFZwd>2ixktm@1QB_pa13h%hTVdjSoMyDz=Z#zWuf=_RY5A#svZBe7Z`KRha^CwmM zl~;sCcp|@Lb2j{Y{Bccf(BEi=a{)Pi25X{@nle2)u}uAlTDJD9*nH=_wp8Jozqfj~ z&UraIBr>qJP~**H@5VVB&nnH9U0ZQBVExX8EK{$Fsk^2>cQiLFv!CeTx6fwvl3(%6 zfh_B8MxAw#IpTaLteN+E+VzND-blG8Y9j9(Pq-^@KXmoJyh82n5N)+tr_aup=laej z=pz2lxuZ~{fto0U^~L-BQL?goUp_Vc)Y1LJE=gRpcisxl2B)^||I1>F6r>deodu2X^P8HAk$wEW|ou1`I8-6wDB_KwQW zpU+3__#5RIT=VndwrR`XDAsLmS*LyXeOl4#wG74HiD3rc+yJB_F?o9iFWg*9%n`n`Yis@OWFI>vgr=MLXpAK)z4*}Q$iB}SZ-E& delta 746 zcmVC0000vP)t-sz`(%KTN{ij59X6xVIvdK8(NGH zOy*pMVG}wM5*Io*J|iM1URz)u9x^mELWm?SSsE&(FDXA0DHV1SQ2+n{0d!JMQvg8b z*k%9#0FruCSad{Xb7OL8aCB*JZU6vyoQ03O4uU`sMeE(Kn14WTe6=4_lH-J?vr_yy>Cse20w$wr6A; z?Z*cpgb+f=-@$ZfWM`BTSE8uX;|6-Aes4|$q25@ukTp67)^vT}cY=_yxB;u1f$eN+ zK>C$#8wx26bSbqHvQ5hpDm!4V4oI_Z>3~ZAoZW>on|}~O2qAERrqqD+E8R8}QW_Xi>L6shmL*hn zz+D}XX5G>OmHs)q3uQJTgb+f=FTmd%*Q_5R6c>Z&z(=fvSQ$w#L?wOM9OPiGJ1E5X zSZQP3Tz}m`DI!(_00)&80((+g5nw>R=(2qK9VB19=>XC%jvA?uVzQ4ZMo_;9^3Hq= znMI0oxI;f6E_`m)(r&%4pDKTS%3(<>yc~x51MpAZOhh~@S4Zh{5$UYff%x>zl@9Yf zSD%6xcAz?fSkpgOIRgI|*_V973KBvHA%qY@2xB2A%OiXISZ=6|6j|0Sd%msjJ9r>P zmVM8j?>lCo6ty5lR?)x;87M`qNRe&L$E?C=Uh>Pe>qQRHzyTR3MIA_yV-uEeyTJfj cg#05u0pT_dNosqMVE_OC07*qoM6N<$f?vNsa{vGU 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 276804f908b304baae81b93b2e5325f39ac2d1d9..ea7249f36dc4da8887fc7e46b6c46c8cdf1e0ffd 100644 GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdskW++h!U67;^d;tf|AVqJO+k} zIl*BCMWx@r1Q&e#`b5iHSL@uF^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4P zGATqMc%{Wg6-#AP_s(u()y*p;mh^TTuhlR#7d>L;5)>XaAxb1ZCThyOs1VP9(x||? zIM1{!LA};fTwoW$;1Mu77v&IJur7SIn@AR`gZgj1xgPe(2AkN|J+#(#;kZ@Zw=7-c=f49h z6AC{y#Y_<1ATxVu$ddnDZtm^X+tg;Xsx=uFe)hC7SUh$9$(tYD-)%0wKYRDpou@W$ z`P&>l?NWBW_-V(ar;Mg2pEdt-XyT7;_I(<eoMg>=`X=_V&_V z3=`!Ehc%&?S;zF{+q`vrb9T>=oA;I}TikHZ?Q@fz*W6fGAi5yeJ$lpX+Vr9)1^w9@ zFNoc8x!obi{G{Q>*LCh5$9b=(Gd~x9c3GL_^5yxH%H{8~XI7i$TwSTo@T>d1y1KmB zr;R4xMISgk|5vi$m1y?b1-e^0wt&7H0ed8r+18LGGGsvf_6xSta!sJ(eJ z_d3%8K?bvJvm^|!GvBPMzH;E{#}C)->#onb_4Z-{vt7OZ^`vhseN(63u64f3Eu8E) zKknSMTZ`HBv=5v~dcFOzgrRhx3E%~g7k_{V0{{R3^x%>C0000vP)t-sz`($aDi6_H8|IT-VIvca4@}V; zTIO7aVG}wM5*H&PC^|PjURz)u9x^mELWm?SSsE&(FDXA0DNjW|_y7O^0d!JMQvg8b z*k%9#0FruCSad{Xb7OL8aCB*JZU6vyoQ03O4uU`sMeE(Kn14WTe6=ourp16tQy9QWUVHhPf;Sp_VK~y zb^`za0002s7bu(@bAKinI=`&jAWfkx2*l8e_5?q_n zd22-nImdN6@Kj28ri=5QLc$g(fzmp6kj)K$Ub%0&pJ zRxyR@1gPrxoHszN($BxCXzQDSn5%-crxrp{g?`qxLz<>3UC=)(mG6Lb2{RY;&xbAQ zUvW4900000008(G%y%wwpHE6R3CzpNh1TVqgHC&sz`Si-Xxq*in41Kant|n%fu%`c zUD%|B-_DCdMY=&?uNl}I`twP9lfb_6Cs-TmD@l8k0C+QBiM|Xnjva+=00000NkvXX Hu0mjf3Iaje 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 0000000000000000000000000000000000000000..805f33631ea880843ffdf60fd083fa734bcc16e0 GIT binary patch literal 769 zcmV+c1OEJpP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5siZu!BsoKgi!&v&s2C_<$igNJ>4glcyDUGAl=yU)80zOGZK~#90?V2x713?hQw*-YH6(ra?G^Q8~ z!4zMC!hpbF_zVb0aCi)oP(v_OP*X{8Rai(rL+QIRm*eEy=}w2+UvhN0WcSU@?auzW z2_cioWExD1t+;=9Jlj3!7Ul8FD7-%3(`{Mmuf>W3lyQ$~%UYju00fVEd&LFtTQz9e zXzH&smC)rx7}wL_t-O~4P5tN?Ai`ELAXc9m0wO3~FZIJ~>eCLmytyla4&Fe@0JswR zqshlij1cjZMp)|?!eT_-5O4a_EP%1s?d-I~2$W&Od@M4}nd;Lq;C6C0+iE`qTqv{c z#DE9K71IXQ13<66`KNr6a2){Pbg^OZJq?fNoIce9u<(GWfO5)}AoS}mAn8gFTz_uN z|4z$tpKXW)POtWW5VomyXa`uM^#Y%BhdSR!u*X$@nMv{9R`_ z9GdFqY0%mLYqA5Z4X}pZ4O-_1XyGzHKoghw0h+kX572~i!0&i3zs^?fxx;OKfEI4^ z1GJzVfUmMRg~iwh=mB1xK*az&IGi9~X3-lO6$GvG12l>HG#2}9eicyJ3wRy^bbde; z1VpbZ!N%_fvjbu(WA67l{|iy)0kQ=4>;yVLpne{ZGCx2QdI(_JlMGF-Qy_4gAE1T% z{D4^UG#FFa^HG=(wHfjn`K#n1U~Pakjd#EgBd~4KhAM8G00000NkvXXu0mjf9=TvK literal 0 HcmV?d00001 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"