diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 5c50cb40933..08c47776b5a 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -1665,6 +1665,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/suit_storage_unit/medical, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, /turf/open/floor/iron/dark/textured_large, /area/station/medical/storage) "axr" = ( @@ -41248,11 +41252,11 @@ /turf/open/openspace, /area/station/science/research) "loB" = ( -/obj/machinery/suit_storage_unit/medical, +/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/bot_white{ color = "#52B4E9" }, -/obj/machinery/status_display/evac/directional/south, +/obj/structure/closet/secure_closet/medical3, /turf/open/floor/iron/dark/textured_large, /area/station/medical/storage) "loI" = ( @@ -46563,12 +46567,6 @@ network = list("ss13","medbay") }, /obj/structure/closet/secure_closet/medical3, -/obj/item/defibrillator/loaded, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 13 - }, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/bot_white{ color = "#52B4E9" }, @@ -75983,16 +75981,9 @@ "uUK" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/defibrillator/loaded, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 13 - }, -/obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/bot_white{ color = "#52B4E9" }, -/obj/item/clothing/gloves/latex/nitrile, /turf/open/floor/iron/dark/textured_large, /area/station/medical/storage) "uUL" = ( @@ -87627,17 +87618,10 @@ /area/station/ai/satellite/maintenance/storage) "yee" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/defibrillator/loaded, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 13 - }, -/obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/bot_white{ color = "#52B4E9" }, /obj/machinery/newscaster/directional/south, -/obj/item/clothing/gloves/latex/nitrile, /turf/open/floor/iron/dark/textured_large, /area/station/medical/storage) "yeg" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index dd6c93604e5..251c26812b2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -7303,6 +7303,9 @@ pixel_y = 3 }, /obj/item/defibrillator/loaded, +/obj/item/defibrillator/loaded{ + pixel_y = -4 + }, /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/medical/storage) diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index ba4062eddb1..7fa07011581 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -12303,19 +12303,8 @@ /area/space/nearstation) "bQa" = ( /obj/structure/table/glass, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 8 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 3 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = -2 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 13 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/defibrillator/loaded, /turf/open/floor/iron/dark, /area/station/medical/storage) "bQd" = ( @@ -93123,7 +93112,6 @@ "nQT" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/box, -/obj/item/defibrillator/loaded, /obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/siding/dark{ @@ -93134,6 +93122,9 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 3 + }, /turf/open/floor/iron/dark/small, /area/station/medical/storage) "nRd" = ( @@ -130185,13 +130176,15 @@ "tnz" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/box, -/obj/item/defibrillator/loaded, /obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/gloves/latex/nitrile, /obj/machinery/requests_console/auto_name/directional/north{ name = "Medbay Requests Console" }, /obj/effect/mapping_helpers/requests_console/assistance, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 3 + }, /turf/open/floor/iron/dark/small, /area/station/medical/storage) "tnR" = ( @@ -134962,7 +134955,6 @@ "tVO" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/box, -/obj/item/defibrillator/loaded, /obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/gloves/latex/nitrile, /obj/effect/turf_decal/siding/dark{ @@ -134976,6 +134968,9 @@ network = list("ss13","medbay"); dir = 9 }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 3 + }, /turf/open/floor/iron/dark/small, /area/station/medical/storage) "tVT" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 399aff633d8..b246ff62fba 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -31988,6 +31988,9 @@ name = "Secure Medical Storage"; req_access = list("medical") }, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/ears/earmuffs, diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 36df2c14123..9459ca0204d 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -11932,6 +11932,9 @@ pixel_y = 3 }, /obj/item/defibrillator/loaded, +/obj/item/defibrillator/loaded{ + pixel_y = -4 + }, /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/white, /area/station/medical/storage) diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index bb0c93c3022..33256f6d390 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -911,6 +911,17 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) /obj/item/mod/control/pre_equipped/rescue/add_stealing_item_objective() return add_item_to_steal(src, /obj/item/mod/control/pre_equipped/rescue) +/datum/objective_item/steal/spy/cmo_defib + name = "Chief Medical Officer's Compact Defibrillator" + targetitem = /obj/item/defibrillator/compact/loaded/cmo + excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER) + exists_on_map = TRUE + difficulty = 2 + steal_hint = "The Compact Defibrillator, found on their person, or in their closet." + +/obj/item/defibrillator/compact/loaded/cmo/add_stealing_item_objective() + return add_item_to_steal(src, /obj/item/defibrillator/compact/loaded/cmo) + /datum/objective_item/steal/spy/hos_modsuit name = "the head of security's safeguard MOD control unit" targetitem = /obj/item/mod/control/pre_equipped/safeguard diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 485056b85f0..dc43127e2a3 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -280,6 +280,11 @@ cell = new(src) update_power() +/obj/item/defibrillator/compact/loaded/cmo // subtype for the spy steal objective + name = "chief medical officer's compact defibrillator" + icon_state = "defibcmo" + resistance_flags = INDESTRUCTIBLE // So no cheesy getting rid of like other steal/head items + /obj/item/defibrillator/compact/combat name = "combat defibrillator" desc = "A belt-equipped blood-red defibrillator. Can revive through thick clothing, has an experimental self-recharging battery, and can be utilized as a weapon via applying the paddles while in a combat stance." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 5bce0702b5a..038d6368389 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -83,7 +83,6 @@ new /obj/item/computer_disk/command/cmo(src) new /obj/item/radio/headset/heads/cmo(src) new /obj/item/megaphone/command(src) - new /obj/item/defibrillator/compact/loaded(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/autosurgeon/medical_hud(src) new /obj/item/door_remote/chief_medical_officer(src) @@ -98,6 +97,7 @@ // Traitor steal objective new /obj/item/reagent_containers/hypospray/cmo(src) + new /obj/item/defibrillator/compact/loaded/cmo(src) /obj/structure/closet/secure_closet/animal name = "animal control locker" diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 4260a6f4685..d2bca7ccce5 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -188,18 +188,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL -/datum/design/defibrillator - name = "Defibrillator" - desc = "A portable defibrillator, used for resuscitating recently deceased crew." - id = "defibrillator" - build_type = PROTOLATHE | AWAY_LATHE - build_path = /obj/item/defibrillator - materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*4, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) - category = list( - RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL - ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - /datum/design/defibrillator_mount name = "Defibrillator Wall Mount" desc = "A mounted frame for holding defibrillators, providing easy security." @@ -224,18 +212,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL -/datum/design/defibrillator_compact - name = "Compact Defibrillator" - desc = "A compact defibrillator that can be worn on a belt." - id = "defibrillator_compact" - build_type = PROTOLATHE | AWAY_LATHE - build_path = /obj/item/defibrillator/compact - materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4, /datum/material/silver = SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5) - category = list( - RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL - ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - /datum/design/genescanner name = "Genetic Sequence Analyzer" desc = "A handy hand-held analyzers for quickly determining mutations and collecting the full sequence." diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm index 09f404e97ec..c79bad013ef 100644 --- a/code/modules/research/techweb/nodes/medbay_nodes.dm +++ b/code/modules/research/techweb/nodes/medbay_nodes.dm @@ -7,7 +7,6 @@ "operating", "medicalbed", "defibmountdefault", - "defibrillator", "surgical_drapes", "scalpel", "retractor", @@ -80,7 +79,6 @@ "healthanalyzer_advanced", "mod_health_analyzer", "crewpinpointer", - "defibrillator_compact", "defibmount", "medicalbed_emergency", "piercesyringe", diff --git a/icons/obj/medical/defib.dmi b/icons/obj/medical/defib.dmi index 1e707f529ce..74ad889d4e1 100644 Binary files a/icons/obj/medical/defib.dmi and b/icons/obj/medical/defib.dmi differ