diff --git a/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm b/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm index b162620cf4815..58fe035fe8586 100644 --- a/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm +++ b/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm @@ -27,7 +27,7 @@ . = ..() -/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null) +/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null, silent = FALSE) // DOPPLER EDIT - ORIGINAL - /obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null) if(!isnum(set_coefficient)) set_coefficient = SSsecurity_level.current_security_level.shuttle_call_time_mod alert_coeff = set_coefficient @@ -48,6 +48,8 @@ else SSshuttle.emergency_last_call_loc = null + if(silent) // DOPPLER EDIT ADDITION - SEE modular_doppler/autotransfer/shuttle.dm + return // DOPPLER EDIT ADDITION priority_announce( text = "The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [(timeLeft(60 SECONDS))] minutes.[reason][SSshuttle.emergency_last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ][SSshuttle.admin_emergency_no_recall ? "\n\nWarning: Shuttle recall subroutines disabled; Recall not possible." : ""]", title = "Emergency Shuttle Dispatched", diff --git a/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm b/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm index 67dd334612759..7c0f5285f0da9 100644 --- a/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm +++ b/modular_doppler/modular_medical/surgery/organs/internal/cyberimp.dm @@ -176,7 +176,6 @@ icon = 'modular_doppler/modular_medical/icons/implants.dmi' icon_state = "steel" items_to_create = list(/obj/item/pickaxe/drill/implant) - implant_overlay = null implant_color = null /// The bodypart overlay datum we should apply to whatever mob we are put into's someone's arm var/datum/bodypart_overlay/simple/steel_drill/drill_overlay