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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+2 -2
View File
@@ -195,10 +195,10 @@
/obj/item/mecha_parts/mecha_equipment/armor/antiemp_armor_booster/attach(obj/vehicle/sealed/mecha/new_mecha, attach_right)
. = ..()
chassis.AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES)
chassis.AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES|EMP_NO_EXAMINE)
/obj/item/mecha_parts/mecha_equipment/armor/antiemp_armor_booster/detach(atom/moveto)
chassis.RemoveElement(/datum/element/empprotection, EMP_PROTECT_WIRES)
chassis.RemoveElement(/datum/element/empprotection, EMP_PROTECT_WIRES|EMP_NO_EXAMINE)
return ..()
/obj/item/mecha_parts/mecha_equipment/armor/antiemp_armor_booster/clandestine
code/modules/vehicles/mecha/medical/odysseus.dm
+7 -6
View File
@@ -14,15 +14,16 @@
/obj/vehicle/sealed/mecha/odysseus/moved_inside(mob/living/carbon/human/human)
. = ..()
if(. && !HAS_TRAIT(human, TRAIT_MEDICAL_HUD))
ADD_TRAIT(human, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
if(!.)
return
ADD_TRAIT(human, 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)
REMOVE_TRAIT(human, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
return ..()
/obj/vehicle/sealed/mecha/odysseus/mmi_moved_inside(obj/item/mmi/MMI, mob/user)
. = ..()
if(. && !isnull(MMI.brainmob) && !HAS_TRAIT(MMI.brainmob, TRAIT_MEDICAL_HUD))
ADD_TRAIT(MMI.brainmob, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
if(!. || isnull(MMI.brainmob))
return
ADD_TRAIT(MMI.brainmob, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)