diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 5c15cd4e8ab..b481cc69f6e 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -162,28 +162,6 @@ if(!target) //target can be set to null from above code, or elsewhere active = FALSE -/obj/item/pinpointer/crew/prox //Weaker version of crew monitor primarily for EMT - name = "proximity crew pinpointer" - desc = "A handheld tracking device that displays its proximity to crew suit sensors." - icon_state = "pinpointer_crewprox" - worn_icon_state = "pinpointer_prox" - custom_price = PAYCHECK_CREW * 3 - -/obj/item/pinpointer/crew/prox/get_direction_icon(here, there) - var/size = "" - if(here == there) - size = "small" - else - switch(get_dist(here, there)) - if(1 to 4) - size = "xtrlarge" - if(5 to 16) - size = "large" - //17 through 28 use the normal pinion, "pinondirect" - if(29 to INFINITY) - size = "small" - return "pinondirect[size]" - /obj/item/pinpointer/pair name = "pair pinpointer" desc = "A handheld tracking device that locks onto its other half of the matching pair." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index d00f34aa734..df557d4d590 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -271,22 +271,22 @@ /obj/item/storage/belt/medical/paramedic/PopulateContents() SSwardrobe.provide_type(/obj/item/sensor_device, src) - SSwardrobe.provide_type(/obj/item/pinpointer/crew/prox, src) SSwardrobe.provide_type(/obj/item/stack/medical/gauze/twelve, src) - SSwardrobe.provide_type(/obj/item/reagent_containers/syringe, src) SSwardrobe.provide_type(/obj/item/stack/medical/bone_gel, src) SSwardrobe.provide_type(/obj/item/stack/sticky_tape/surgical, src) + SSwardrobe.provide_type(/obj/item/reagent_containers/syringe, src) + SSwardrobe.provide_type(/obj/item/reagent_containers/glass/bottle/calomel, src) SSwardrobe.provide_type(/obj/item/reagent_containers/glass/bottle/formaldehyde, src) update_appearance() /obj/item/storage/belt/medical/paramedic/get_types_to_preload() var/list/to_preload = list() //Yes this is a pain. Yes this is the point to_preload += /obj/item/sensor_device - to_preload += /obj/item/pinpointer/crew/prox to_preload += /obj/item/stack/medical/gauze/twelve - to_preload += /obj/item/reagent_containers/syringe to_preload += /obj/item/stack/medical/bone_gel to_preload += /obj/item/stack/sticky_tape/surgical + to_preload += /obj/item/reagent_containers/syringe + to_preload += /obj/item/reagent_containers/glass/bottle/calomel to_preload += /obj/item/reagent_containers/glass/bottle/formaldehyde return to_preload diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 74c8a5f8174..d25962e03d0 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -55,7 +55,7 @@ head = /obj/item/clothing/head/soft/paramedic gloves = /obj/item/clothing/gloves/color/latex/nitrile shoes = /obj/item/clothing/shoes/sneakers/blue - l_pocket = /obj/item/modular_computer/tablet/pda/medical + l_pocket = /obj/item/modular_computer/tablet/pda/medical/paramedic backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 90248a1df96..e6a56d7a489 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -224,6 +224,14 @@ /datum/computer_file/program/robocontrol, ) +/obj/item/modular_computer/tablet/pda/medical/paramedic + name = "paramedic PDA" + default_applications = list( + /datum/computer_file/program/phys_scanner/medical, + /datum/computer_file/program/records/medical, + /datum/computer_file/program/radar/lifeline, + ) + /obj/item/modular_computer/tablet/pda/viro name = "virology PDA" greyscale_config = /datum/greyscale_config/tablet/stripe_split @@ -383,4 +391,3 @@ icon_state = "pda-clear" greyscale_config = null greyscale_colors = null - diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 8a1d4a8e018..0d2c576b5e5 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -140,16 +140,6 @@ category = list("Medical Designs") departmental_flags = DEPARTMENT_BITFLAG_MEDICAL -/datum/design/crewpinpointerprox - name = "Proximity Crew Pinpointer" - desc = "Displays your approximate proximity to someone if their suit sensors are turned to tracking beacon." - id = "crewpinpointerprox" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 1200, /datum/material/glass = 300, /datum/material/gold = 200) - build_path = /obj/item/pinpointer/crew/prox - category = list("Medical Designs") - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - /datum/design/defibrillator name = "Defibrillator" desc = "A portable defibrillator, used for resuscitating recently deceased crew." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index a2e1d6ad4ef..190ae417abd 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -340,7 +340,6 @@ //SKYRAT EDIT - END "chem_master", "chem_pack", - "crewpinpointerprox", "defibmount", "defibrillator", "genescanner", diff --git a/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm b/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm index d4157eb2479..9256fac9bc3 100644 --- a/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm +++ b/modular_skyrat/modules/modular_ert/code/marine_override/modified_equipment.dm @@ -10,7 +10,7 @@ ) l_hand = null r_hand = null - + /datum/outfit/centcom/ert/marine/security //generic and/or heavy suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun belt = /obj/item/storage/belt/military/assault/full/m44a @@ -23,7 +23,7 @@ ) l_hand = null r_hand = null - + /datum/outfit/centcom/ert/marine/medic //medic suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/scoped belt = /obj/item/storage/belt/military/assault/full/m44a @@ -34,7 +34,6 @@ /obj/item/storage/medkit/regular = 1, /obj/item/storage/medkit/advanced = 1, /obj/item/sensor_device = 1, - /obj/item/pinpointer/crew/prox = 1, /obj/item/stack/medical/gauze/twelve = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/reagent_containers/glass/bottle/formaldehyde = 1, @@ -42,7 +41,7 @@ ) l_hand = /obj/item/gun/medbeam r_hand = null - + /datum/outfit/centcom/ert/marine/engineer //engineer suit_store = /obj/item/melee/hammer //doesn't need a rifle back = /obj/item/mod/control/pre_equipped/marine/engineer diff --git a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm index 31c03e4ddcc..d465fc09a0a 100644 --- a/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm +++ b/modular_skyrat/modules/modular_ert/code/trauma_team/trauma_team_outfit.dm @@ -90,7 +90,6 @@ new /obj/item/reagent_containers/pill/patch/aiuri(src) new /obj/item/reagent_containers/pill/patch/aiuri(src) new /obj/item/holosign_creator/medical (src) - new /obj/item/pinpointer/crew/prox (src) /obj/item/clothing/gloves/color/latex/nitrile/ntrauma name = "trauma specialist gloves"