cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

MMIs in an odysseus get the medhud, medical beamgun works properly (#88891)

Browse Source
This commit is contained in:
jimmyl
2025-01-08 22:44:49 +01:00
committed by GitHub
parent 7e2ad0ee7f
commit edc0a30893
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/special/medbeam.dm
+1 -1
View File
@@ -83,7 +83,7 @@
last_check = world.time
if(!los_check(loc, current_target, mid_check = CALLBACK(src, PROC_REF(mid_los_check))))
if(!los_check(get_atom_on_turf(src), current_target, mid_check = CALLBACK(src, PROC_REF(mid_los_check))))
QDEL_NULL(current_beam)//this will give the target lost message
return
code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+1 -1
View File
@@ -395,7 +395,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/process(deltatime)
. = ..()
if(.)
if(. || !length(chassis.occupants))
return
if(chassis.weapons_safety)
medigun.LoseTarget()
code/modules/vehicles/mecha/medical/odysseus.dm
+9 -9
View File
@@ -12,17 +12,17 @@
accesses = list(ACCESS_MECH_SCIENCE, ACCESS_MECH_MEDICAL)
pivot_step = TRUE
/obj/vehicle/sealed/mecha/odysseus/moved_inside(mob/living/carbon/human/H)
/obj/vehicle/sealed/mecha/odysseus/moved_inside(mob/living/carbon/human/human)
. = ..()
if(. && !HAS_TRAIT(H, TRAIT_MEDICAL_HUD))
ADD_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
if(. && !HAS_TRAIT(human, TRAIT_MEDICAL_HUD))
ADD_TRAIT(human, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
/obj/vehicle/sealed/mecha/odysseus/remove_occupant(mob/living/carbon/human/H)
if(isliving(H) && HAS_TRAIT_FROM(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT))
REMOVE_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
/obj/vehicle/sealed/mecha/odysseus/remove_occupant(mob/living/carbon/human/human)
if(isliving(human) && HAS_TRAIT_FROM(human, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT))
REMOVE_TRAIT(human, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
return ..()
/obj/vehicle/sealed/mecha/odysseus/mmi_moved_inside(obj/item/mmi/M, mob/user)
/obj/vehicle/sealed/mecha/odysseus/mmi_moved_inside(obj/item/mmi/MMI, mob/user)
. = ..()
if(. && !HAS_TRAIT(M, TRAIT_MEDICAL_HUD))
ADD_TRAIT(M, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
if(. && !isnull(MMI.brainmob) && !HAS_TRAIT(MMI.brainmob, TRAIT_MEDICAL_HUD))
ADD_TRAIT(MMI.brainmob, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)